mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,997 Commits 320 Branches 50 Tags 119 MiB
Commit Graph

664 Commits

Author SHA1 Message Date
saxon bea0000340 stream/mts: creating ring.Chunk so that we can use another loadSender 2019-02-15 23:55:51 +10:30
saxon b6bf41b17d stream/mts: made mtsSender more general 
The mtsSender can now use any loadSender to send fixed and segmented mts data to.
 2019-02-15 23:35:45 +10:30
saxon 31d36577b1 stream/mts: ausOceanSender => mtsSender 2019-02-15 23:17:13 +10:30
saxon 3aa94887eb revid/senders.go: commenting of ausOceanSender 2019-02-15 14:33:18 +10:30
saxon d3a8bb20de revid: using ausOceanSender if we're doing http output with mpegtrs packetization 2019-02-15 13:05:48 +10:30
saxon 7d03830a4e revid & stream/mts: senders now handle clip duration and cc fixing for mts. 
Removed rtpSender as we now put in loadSender slice. Removed packer write method as no longer required to do clip duration logic. For initialisation of encoders, they are now no longer writing
to packer, but now straight to the ring buffer. Wrote ausOceanSender which will deal with clip logic and cc fixing for mts. Added some functionality to mts/mpegts.go that allows adding
of adaptation fields to mts packets.
 2019-02-15 12:01:07 +10:30
saxon 3ee2683ca9 cmd/revid-cli & revid: outputFileNamePtr => outputPathPtr, config.OutputFileName=>config.OutputPath, inputFileNamePtr=>inputPathPtr and finally, config.InputFileName=>config.InputPath 2019-02-12 18:22:46 +10:30
saxon ad04893432 revid/revid.go: intialising err from rtp send 2019-02-08 18:14:33 +10:30
saxon f4be7e72d7 Merge branch 'cpu-fix' of http://bitbucket.org/ausocean/av into cpu-fix 2019-02-08 18:12:29 +10:30
saxon 020428db62 revid/revid.go: checking err from ring buffer write within destinations length check 2019-02-08 18:12:03 +10:30
Saxon Milton bc1cb5245a Merged master into cpu-fix 2019-02-08 18:09:25 +10:30
saxon b28a75d665 av/revid: removed test commands that we're not using anymore 2019-02-08 18:07:43 +10:30
Saxon Milton 0bb1006c19 Merged in metadata-refactor (pull request #131) 
Metadata Refactor

Approved-by: kortschak <dan@kortschak.io>
 2019-02-08 01:20:08 +00:00
Saxon Milton 3a05fd533c Merged in mem-leak-debug (pull request #136) 
Mem usage fix

Approved-by: kortschak <dan@kortschak.io>
 2019-02-08 01:18:26 +00:00
saxon f0fc399d47 revid/revid.go: removed space 2019-02-08 11:24:41 +10:30
saxon 8bdfed9960 stream/mts: fixing conflicts 2019-02-08 10:13:51 +10:30
saxon 734cf8cca9 revid/cmd: merged in master and again removed cmds 2019-02-07 23:49:10 +10:30
saxon c7f1acac26 doesn't look like it worked 2019-02-07 18:19:38 +10:30
saxon 3f72e21970 revid: reducing ring buffer size 2019-02-07 18:03:59 +10:30
saxon 628adee49a commenting out things i don't want to run 2019-02-07 16:42:39 +10:30
Saxon Milton ccb8a52db1 revid/revid.go: removing shorthand initialisations for vars already declared 2019-02-06 05:28:57 +00:00
Saxon Milton 87cb303935 revid/revid.go: again checking to see we actually have destinations before putting anything into the ring buffer 2019-02-06 05:27:35 +00:00
saxon ef4aa8efd1 revid/revid.go: reverted change regarding putting things in ringbuffer when we won't use it 2019-02-06 15:52:59 +10:30
saxon cdd6703930 } 2019-02-06 15:45:14 +10:30
saxon de4f471201 revid/revid.go: defer r.wg.Done() in revid.outputClips routine 2019-02-05 10:50:21 +10:30
saxon a4d179039b revid/revid.go: removed default case in switch with revid.Update() 2019-02-05 10:49:05 +10:30
saxon bd2958ba4e cmd/revid-cli & revid: added TODO for the use of Run() instead of send in cmd/revid-cli/main.go. Fixed filename in revid/revid.go file header. Renamed ret to cfg in revid.Config(). Catching error from call to revid.Stop() in revid.Udate() 2019-02-04 19:14:02 +10:30
saxon 8978f9edc5 cmd/revid-cli & revid: using goto to sleep for monitor period, and using wg.Done() at the end of output routine. 2019-02-04 17:12:30 +10:30
saxon ee7eb84d26 revid-cli: correctly using ns.Mode() and ns.SetMode() 2019-02-04 13:25:37 +10:30
saxon 6171c4e999 revid: added handling of burstPeriod to config 2019-02-03 23:43:51 +10:30
saxon 1010721dd0 cmd/revid-cli & revid: Checking revid mode differently - now using ns.Mode(), which should soon be an available feature. Also now using ns.SetMode() - which tells netreceiver that we've changed mode. 2019-02-03 23:37:38 +10:30
saxon 9095044e23 revid: using waitgroups so that revid.Stop() is safer - we can wait until the input and output routines are done before we do anything, like touch the revid config. Also started modifying revid.Update() to remove errors introduced after the copy of updateRevid from revid-cli to revid.go in the previous commit. 2019-02-03 21:55:40 +10:30
saxon 1af4b25030 cmd/revid-cli & revid: removed startRevid and stopRevid as shouldn't be required when we have revid.Start() and revid.Stop(). Created revid.Config() which returns copy of config safely using mutex. removed updateRevid in revid-cli and move to fun revid.Update() - as there's no reason why it can't just be a receiver func - even better considering we want to start moving alot of stuff from revid-cli to the revid-api anyways. 2019-02-03 21:17:44 +10:30
saxon bad68923e6 Merge branch 'master' into metadata-refactor 2019-02-01 15:11:57 +10:30
saxon c44d6bbfd3 revid/revid.go: not during time.Duration conversion 2019-02-01 10:08:49 +10:30
saxon 9bddf343f5 revid/revid.go: moved revid.mu declaration 
. Updated todo owner
 2019-02-01 10:07:00 +10:30
saxon d26aa8643a revid: renamed transcode to processFrom. Using mutex for isRunning flag. Created setIsRunning func to set state of isRunning. 2019-02-01 09:47:31 +10:30
saxon 1f1546a284 revid: updated code in senders.go to work with meta changes 2019-01-31 21:30:08 +10:30
saxon 051263c144 revid/revid.go: revid.lex to revid.transcode 2019-01-31 19:58:25 +10:30
saxon 1e307fc37b revid/revid.go: made routines named rather than anonymous 2019-01-31 19:42:20 +10:30
saxon e18b1f51f0 revid/revid.go: capture error from r.Start() in error handling routine 2019-01-31 15:49:44 +10:30
saxon d53eafe215 revid/revid.go: not running r.setupInput() as routine - now getting error an returning 2019-01-31 15:15:38 +10:30
saxon ed4d97f893 stream/mts: patch for revid.Start() no exit bug 2019-01-31 15:03:50 +10:30
Dan Kortschak 58102e5587 revid: fix http destination assignment 2019-01-30 13:19:00 +10:30
Dan Kortschak 071e6fd0f7 revid: honour difference between rtmp dst and others 2019-01-29 19:56:02 +10:30
saxon 37bdb2cf8e av/revid: removed test commands that we're not using anymore 2019-01-22 14:31:42 +10:30
Dan Kortschak 92ba9c89a2 cmd/revid-cli,revid: use a slice for output destination flags 2019-01-19 20:01:42 +10:30
scruzin fd903b4add rtmp.Session now rtmp.Conn and rtmp.NewSession() and Open() replaced with Dial(). 2019-01-19 13:10:38 +10:30
Dan Kortschak 35d63f664f revid: add v4l properties and fix default device handling 
Also fix logging typos found during work.
 2019-01-17 17:04:59 +10:30
Saxon Milton ddb8fc1e1c Merged in rtp-ringbuff-bypass (pull request #88) 
Rtp ringbuff bypass

Approved-by: Alan Noble <anoble@gmail.com>
Approved-by: kortschak <dan@kortschak.io>
 2019-01-16 23:22:18 +00:00
Saxon Milton a58a784a16 Merged in clean-up-revid-consts (pull request #111) 
revid: clean up some revid constants

Approved-by: kortschak <dan@kortschak.io>
 2019-01-16 07:37:07 +00:00
saxon 95349f461d revid/revid.go: removed unused logging consts 2019-01-16 17:52:49 +10:30
saxon d3c8f31c08 revid/revid.go: actually fixed conflict 2019-01-16 17:49:22 +10:30
saxon 606c1a5885 revid/revid.go: fixed conflict 2019-01-16 17:47:57 +10:30
saxon 59024fea79 revid/revid.go: further split up miscy consts 2019-01-16 17:46:17 +10:30
Saxon Milton ef6811d3b8 Merged in webcam (pull request #86) 
revid: addition of webcam input

Approved-by: kortschak <dan@kortschak.io>
 2019-01-16 07:12:30 +00:00
saxon 582f12d157 revid/revid.go: in execution of ffmpeg, the device path is replaced by r.config.InputFileName 2019-01-16 17:29:56 +10:30
saxon e184b091d3 revid/revid.go: rtmp connection properties comment changed to RTMP 2019-01-16 16:42:37 +10:30
saxon 59cc2d409a Revert "revid: removed redundant error logging" 
This reverts commit eacbfb9ee3.
 2019-01-14 16:37:18 +10:30
saxon eacbfb9ee3 revid: removed redundant error logging 2019-01-14 16:31:43 +10:30
Saxon Milton ae34ebe368 Merged in revid-start-stop-errors (pull request #114) 
Return errors from revid.Start and revid.Stop

Approved-by: kortschak <dan@kortschak.io>
 2019-01-14 04:27:34 +00:00
Saxon Milton 137943af82 Merged in revid-config-safer (pull request #112) 
Made revid's Config() func safer

Approved-by: kortschak <dan@kortschak.io>
 2019-01-13 23:57:27 +00:00
saxon 5ae1e41e38 revid: start and stop now return errors 2019-01-13 22:01:04 +10:30
saxon ba54974de9 revid: removed Config() func from revid because it's not being used 2019-01-13 21:50:47 +10:30
saxon a0d7681d5f revid: not wrapping webcam args in string to pass to func 2019-01-13 20:52:09 +10:30
saxon fc06ec235e revid: checking for webcam input in config.go validate() 2019-01-13 19:33:07 +10:30
saxon 07307ed492 updating webcam branch 
Merge branch 'master' into webcam
 2019-01-13 19:29:32 +10:30
saxon aa5d316816 revid: made revid.Config() return copy of revid's config rather than pointer so that mutation isn't possible 2019-01-13 19:15:02 +10:30
saxon 08069e22d1 revid: sectioned constants and added some commenting 2019-01-13 17:17:35 +10:30
saxon 9365c4a1de revid: removed unused consts 2019-01-13 17:10:17 +10:30
saxon bf8d85d0ba revid: removed unused loglevels 2019-01-13 17:03:58 +10:30
Dan Kortschak 7f07c4cb20 revid,stream/flv: add back initial header write 2019-01-11 13:53:05 +10:30
saxon 9ca7288622 psi: removed conflict with master 2019-01-11 13:17:14 +10:30
saxon 4e62606622 updating this branch with master 
Merge branch 'master' into psi-pr-cleanup
 2019-01-11 13:15:23 +10:30
saxon 0d6aac0247 revid: fixed build errors by updating calls to mts.MetaData.SetLocation() and mts.MetaData.SetTimeStamp() 2019-01-11 11:53:41 +10:30
saxon ebd6d5816d psi: full stop at end of comment, made lastTime belong to packer and moved some vars to a more appropriate location 2019-01-08 19:39:22 +10:30
scruzin cbe6149c8f Added proper logging. 2019-01-07 23:59:41 +10:30
saxon 703f0a0523 revid: cleaned up send logic in httpSender send func 2019-01-07 10:45:22 +10:30
saxon 8878063dc8 revid: clean up vars for use in calculation of time between writes to packer 2019-01-07 10:43:30 +10:30
Dan Kortschak 05e0672e89 stream/flv: remove unnecessary header write on creation 2019-01-05 17:56:55 +10:30
saxon 26a43d54bb rtp: updated error message to suit new rtpSender.send() function 2019-01-03 13:01:35 +10:30
saxon 5f20086440 rtp: removed code in rtpSender relating to chunks - something we're not using anymore in this case 2019-01-03 12:57:50 +10:30
saxon 4da0bddf2f revid: improved error message in rtpSender.send when there is no data provided but also when there is no data in the senders chunk 2019-01-03 12:08:41 +10:30
saxon a934e02e9a revid: using switch in rtpSender.send logic rather than if-else 2019-01-03 12:06:51 +10:30
saxon e12f3e0b41 revid: updated comment above revid.rtpSender declaration 2019-01-03 12:03:06 +10:30
saxon 53d737d426 revid: missed a rtpSndr 2019-01-03 11:59:29 +10:30
saxon 12c8c604e0 Updating branch with master 
Merge branch 'master' into rtp-ringbuff-bypass
 2019-01-03 11:57:48 +10:30
saxon 496fa994bd revid: rtpSndr=>rtpSender 2019-01-03 11:57:43 +10:30
saxon 325067ac1f revid: linuxWebcam to startWebcam to keep less specific to particular platform as we may eventually stream from webcam on windows 2019-01-03 11:49:02 +10:30
saxon 03a88313d1 revid: fixed build errors 2019-01-03 11:25:06 +10:30
saxon d4e0fb516b Fixing smartlogger errors 
Merge branch 'master' into webcam
 2019-01-03 10:35:29 +10:30
saxon fd3c4010e4 revid: add old webcam starting code and renamed func to LinuxWebcam considering this will only work on linux 2019-01-03 10:35:22 +10:30
saxon 5b73c2c2ba revid: using simple startWebcam func considering it's only for testing purposes and works 2019-01-03 10:11:42 +10:30
saxon cec95cd652 rtmp: using TCP rather IP 2019-01-02 21:54:01 +10:30
saxon cca95f1c5d revid: fixed cmds used for testing 2019-01-02 17:32:20 +10:30
saxon a4c73cf6c5 av: updated logging to suit changes made on iot and utils 2019-01-02 15:39:47 +10:30
saxon aefdc46273 revid: updated some comments 2019-01-02 08:50:59 +10:30
saxon d0d9e20c87 revid: if no data is provided to rtpSender.send() then we check if the rtpSenders chunk is not nil, if it is, then return error 2019-01-01 16:11:32 +10:30
saxon ccd4c32ff6 revid: revid now has it's own rtpSender seperate from the loadSender slice used for multiple outputs, therefore, we can now bypass the ringbuffer in this case with a check if the rtpSender exists in the packer write method 2019-01-01 16:03:04 +10:30
Saxon Milton ebccfa1a54 Merged in raspivid-no-start-fatal (pull request #87) 
revid: fatal when raspivid cannot be started

Approved-by: kortschak <dan@kortschak.io>
 2018-12-29 10:57:49 +00:00
saxon e4e4e217c6 revid: using smarter startWebcam func as suggested by Dan 2018-12-29 17:04:35 +10:30
Dan Kortschak 1e3b4b1ab8 cmd/revid-cli,revid: reduce stringly typing in config/flags 2018-12-28 13:43:21 +10:30
Saxon Milton 5a181f3576 revid: fix rtmp sending 
Approved-by: kortschak <dan@kortschak.io>
 2018-12-28 03:09:41 +00:00
saxon ca681a6176 revid: fatal when raspivid cannot be started 2018-12-28 10:53:10 +10:30
saxon f9c1231cc4 revid: added input flag for webcam input and added func to handle webcam input using ffmpeg 2018-12-28 10:48:21 +10:30
saxon 7118f1566c revid: added input flag for webcam input and added func to handle webcam input using ffmpeg 2018-12-28 10:44:53 +10:30
saxon 32e2d61ec1 revid: fixed rtmp problem by adding extra check of output to figure out clip duration before send 2018-12-28 10:31:50 +10:30
saxon 1095f32ae4 revid: added send retry flag 2018-12-14 20:50:26 +10:30
saxon ab643f2b97 revid: set default bitrate to 400000 2018-12-14 20:38:53 +10:30
saxon 618fadd90b revid: trying to fix jumpy rtp 2018-12-14 20:05:10 +10:30
saxon c7f55c3c43 revid: using NewJSONDecoder rather than newJsonDecoder to be consistent with changes in iot 2018-12-14 16:58:02 +10:30
saxon fbdce669e7 revid: cleaned and added commenting 2018-12-14 16:46:36 +10:30
saxon 21dd2f4b70 revid: using location instead of gps in names 2018-12-14 16:02:47 +10:30
saxon e79f6d191d revid: made extractMeta a function of httpSender 2018-12-14 16:01:10 +10:30
saxon f1ee09ad7b revid: improved naming of encoder globals for location and timestamp 2018-12-14 15:59:44 +10:30
saxon 798add533b revid + mts +psi: wrote func to find pmt in byte slice, wrote func to get gps, changed the way in which psi are insterted, based no of mpgets packets to send on time, i.e. per second 2018-12-14 13:35:56 +10:30
saxon b78904ac72 revid + psi: getting metadata from replies now 2018-12-13 15:51:51 +10:30
saxon ce036abf8b revid: changed request time to recv 2018-12-13 12:59:40 +10:30
saxon 9a7d7a9ab3 revid: modified http sender to look at reply of send and get time and gps data to mts package 2018-12-13 12:59:40 +10:30
saxon f5a571547d revid: using config to define default packetsPerClipValue 2018-12-08 01:54:20 +10:30
saxon cfff3316b4 revid: updated revid packetsPerClip const from 7 to 560 to speed up data sending 2018-12-08 01:43:10 +10:30
saxon f89e0aefb5 revid: increased number of mpegts packets per clip so that we can send more 2018-12-08 01:14:42 +10:30
saxon 05bcfdc1b1 revid: changed request type to recv in order to be copmatible with new netsender and netreceiver function 2018-12-07 16:26:36 +10:30
Dan Kortschak 00216b444b cmd/revid-cli,revid: clean up flags handling 
This is a first step in simplifying and cleaning up the logic for config
and flag handling for revid.
 2018-12-05 19:54:52 +10:30
saxon 402f2fb165 revid: revert so that netsender pull request can be done first 2018-12-04 10:14:45 +10:30
saxon 0f273e42b6 revid: using RequestRecv for http sender 2018-12-04 10:13:18 +10:30
saxon e0207d979f revid: fixed test cases to use output1 to fix build errors 2018-12-01 11:17:12 +10:30
saxon 1c105405e8 revid: changed request type back to poll so that build compiles on master 2018-11-30 22:25:38 +10:30
saxon 2c2be84499 revid: iterating through destinations and using destination.release() instead of directly talking to ringbuffer chunks 2018-11-29 14:22:39 +10:30
saxon 14f4bb0e63 revid: changed back to requestVideo 2018-11-29 14:06:16 +10:30
saxon d32a715549 revid: testing request poll instead of requestvideo 2018-11-29 13:50:17 +10:30
saxon 89b7a0acfa revid: reverted section of code which deals with failed restart of connection 2018-11-28 15:33:56 +10:30
saxon 1824273f8c revid: undoing logging changes, removed chunk closing in http sender send method 2018-11-28 15:26:17 +10:30
saxon 227f25a3fb revid: improved some naming and revmoed uneeded const 2018-11-26 00:40:18 +10:30
saxon 98eb2c64e8 revid: revid output check and destination setting cleaner. Also changed destination release to single chunk.Close() so that chunks aren't closed more than once 2018-11-25 23:45:38 +10:30
saxon 5920d1c8d7 revid: made destination for revid a []loadSender and change code such that iterate through this when performing actions relating to destinations like write, send and close. Also created new sender call rtp sender that has a inherent rtp encoder 2018-11-25 23:10:38 +10:30
saxon a4ded5337d revid: changed close operation on destination to close operpation on slice ofoperations in reset() 2018-11-25 17:24:52 +10:30
saxon 4ce4525a1c revid: removed blank line under newUdpSender 2018-11-24 15:20:26 +10:30
saxon 5eb7225da9 revid & rtp: fixed up some logging, line breaks, and simplified some decrements/increments 2018-11-24 12:14:44 +10:30
saxon a231d57f06 revid: usage of nil error in logging message 2018-11-22 10:21:25 +10:30
saxon 4f4bebae25 revid: removed revid's overwnship of rtp encoder 2018-11-21 21:34:28 +10:30
saxon 92294aed70 rtp: assert that udp with no packetization works 2018-11-21 20:43:17 +10:30
saxon 1cebc821d1 revid and rtp: simplified relationship between mts encoder and rtp encoder and revmoed queue 2018-11-21 20:23:02 +10:30
saxon cedc63a0b5 revid: got rid of debug prints 2018-11-21 18:16:10 +10:30
saxon 315ba6bd76 revid: back to working state 2018-11-21 18:14:36 +10:30
saxon f53c866311 revid-cli: using MpegtsRtp to representation packetization under mpegtsrtp packetization 2018-11-21 17:30:46 +10:30
saxon 589ec15259 revid-cli: made -Output=Rtp to mean rtp over udp 2018-11-21 17:30:46 +10:30
saxon 8be3c4de23 revid-cli: allow setting of udp address through revid-cli options 2018-11-21 17:30:46 +10:30
saxon 16614df9f5 rtp: started using mpegts encoder inside rtp encoder so that fragmentation i.e. smaller rtp packets is easier. Streams fine. 2018-11-21 17:30:46 +10:30
saxon 42097ddef7 rtp: added print messages for debugging purposes 
rtp: added print messages for debugging purposes

rtp: removed binaries
 2018-11-21 17:30:46 +10:30