Commit Graph

847 Commits

Author SHA1 Message Date
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
saxon fce0937810 rtp: wrote some code so that config validated udp and rtp stuff as well 2018-11-21 17:30:46 +10:30
saxon c0e6ba2a5b rtp: checking for udp output and rtp packetisation in revid such that the right sender and encoder is selected 2018-11-21 17:30:46 +10:30
saxon 3515958a99 rtp: added rtp and udp options to the revid config 2018-11-18 13:22:48 +10:30
saxon d291744f63 revid: wrote loadsender implementation for udp sending for the rtp - need to test 2018-11-18 12:32:11 +10:30
Dan Kortschak 57caef8937 revid: clean up output clips some more
The low volume throttle is removed since that's the job of the kernel's scheduler.
2018-10-19 21:11:02 +10:30
kortschak cec4f3803f Merged in remove-stream-chan (pull request #68)
revid: remove stream chan

* revid,stream: factor chan operations out into a separate type

* revid: remove stream chan

* revid: reduce label length

Approved-by: Alan Noble <anoble@gmail.com>
2018-10-19 00:50:08 +00:00
Dan Kortschak 4f5a47b1e5 revid: fix logging for completed stream with error 2018-10-05 08:21:21 +09:30
Dan Kortschak 81997cd68e revid: self-document and harmonize arguments to raspivid 2018-10-05 08:20:27 +09:30
Dan Kortschak c20ed48c40 revid: move command creation and logging out of switch 2018-10-05 08:20:27 +09:30
Dan Kortschak aba6ab1645 stream,revid: clean up data flow and docs 2018-10-04 10:35:43 +09:30
Saxon Milton 6a0c9941ea revid: capturing any errors from r.lexTo 2018-09-28 04:23:43 +00:00
saxon 0c2ccf55fa revid: move initialisation of revids netsender up higher in New so that we don't get nil pointer deference 2018-09-25 17:10:35 +09:30
saxon e6d0ee035e revid: added yet another message 2018-09-24 20:27:43 +09:30
saxon 9b7b88be98 revid: adding another debug print to make sure we're flushing ring buffer 2018-09-24 20:24:15 +09:30
saxon 195f52ae16 revid: adding debug prints 2018-09-24 20:21:49 +09:30
saxon 724042baeb revid: change no of frames per clip to 25 for http 2018-09-24 19:56:05 +09:30
saxon ed8613a255 revid: return any errors from conversion of frame rate to int 2018-09-24 16:09:03 +09:30
Saxon Milton 0cf6014887 revid: passing delay corresponding to fps into lexTo - fixing quality issue when streaming from raspivid (not sending stuff too fast) 2018-09-24 15:57:00 +09:30
saxon 8df244891a revid: used args... in exec rather than strings.join to fix bug 2018-09-24 13:21:03 +09:30
saxon b210530330 revid: change Verbosity to LogLevel in config.go 2018-09-22 14:46:54 +09:30
saxon 8f56a82053 revid: fixed log messages in config.go to make easier to understand 2018-09-22 14:45:07 +09:30
saxon 108344f882 revid: fixed case and removed exclamation marks in error/logging messages in config.go 2018-09-20 11:34:17 +09:30
saxon 6e773abd4e revid: made logging messages lowercase and removed exclamation marks 2018-09-20 11:23:52 +09:30
saxon e31678dc9b revid: moved pkg const declaration to revid.go and removed space in pkg string 2018-09-20 11:17:08 +09:30
saxon 0efb2abd6c revid: added pkg to logging messages in senders.go 2018-09-20 11:15:27 +09:30
saxon 0f24e19a2a revid: added pkg name to logging messages in revid.go and senders.go 2018-09-19 22:35:15 +09:30
saxon 5c94f556b4 revid: added pkg name to logging messages in config.go 2018-09-19 22:31:58 +09:30
saxon 534610f6b8 revid: removed revid_test.go 2018-09-19 22:15:00 +09:30
saxon d17f7c87e9 revid: fixed raspivid args and logging 2018-09-19 22:02:50 +09:30
saxon d697b4013d revid: cleaned up key value pairs in config.go 2018-09-15 12:26:05 +09:30
saxon b3a8f2bca3 revid: improved logging key value pairs in revid.go 2018-09-14 12:17:29 +09:30
saxon 043ff7779a main: updated logging in h264 file to mpegts file driver for revid 2018-09-11 18:40:45 +09:30
saxon 547e24da7d main: actually used logger in driver for h264 file to flv rtmp 2018-09-11 18:39:52 +09:30
saxon 03eb68d774 main: added new logger to revid driver file for h264 file to flv rtmp 2018-09-11 18:36:13 +09:30
saxon 35cb30ccf9 revid: updated logging in senders.go 2018-09-11 17:15:45 +09:30
saxon 85ab3a5744 revid: updated logging messages in config.go and revid.go to use new logger 2018-09-11 16:56:33 +09:30
kortschak ea33007173 Merged in deshim (pull request #47)
revid,stream: improve package organisation

Approved-by: saxon.milton@gmail.com <saxon.milton@gmail.com>
2018-08-24 21:17:17 +00:00
saxon.milton@gmail.com d813a56ad6 Merged in librtmpPorting (pull request #41)
LibrtmpPorting

Approved-by: saxon.milton@gmail.com <saxon.milton@gmail.com>
2018-08-23 20:55:15 +00:00
Dan Kortschak b8bf44f57e parse=>stream/lex: move lexing to better location and name 2018-08-23 15:06:32 +09:30
Dan Kortschak eedc473125 revid,parse: remove io.Writer/stream.Encoder shim 2018-08-23 14:51:12 +09:30
saxon 1b4db5b0dc Removed session interface and mad session struct exported 2018-08-20 10:22:36 +09:30
Dan Kortschak 05ba19e4aa encoding->stream: rename packages 2018-08-20 07:49:02 +09:30
Dan Kortschak 7e1d7f77b8 revid,encoding/{flv,mts}: remove in-bound chans for packet encoders 2018-08-19 21:28:20 +09:30
Dan Kortschak 437c7756df flv: rename encoder type 2018-08-19 21:05:04 +09:30
Dan Kortschak 5d8eca850c mts: rename encoder type 2018-08-19 20:39:57 +09:30
Dan Kortschak c0f9f7bf7b encoding: restructure packages handling stream encoding 2018-08-19 20:29:22 +09:30
saxon 9f61f33deb deleting binary 2018-08-19 13:35:22 +09:30
Dan Kortschak ddb78a6234 generator: clean up MPEG-TS encoding
This deletes or marks unused cruft, removes internal chans and makes
interface chans single item long to make way for removal.
2018-08-18 11:27:39 +09:30
saxon 6b2644a517 Fixed problems with mpegts generator 2018-08-18 00:48:13 +09:30
Raul Vera dc1d09f8ae Separate the revid -t argument from the raspivid -t argument. 2018-08-10 04:37:54 +00:00
saxon 21e80b483c Taking out linker option I don't need 2018-07-13 20:20:12 +09:30
saxon.milton@gmail.com 5861fe64d0 Merged in revidTestingImrpovement (pull request #37)
RevidTestingImprovement

Approved-by: kortschak <dan@kortschak.io>
2018-07-10 03:15:13 +00:00
Dan Kortschak 372c42d5aa flv,generator: clean up FLV handling 2018-07-07 15:27:59 +09:30
Dan Kortschak db6ca2922a revid,parse: wire parse.H264 to revid
Through experimentation I have realised the previous ordering of NALU
types does not work with YouTube. I have also exhaustively checked the
requirement for each of the 3 NALU types that are checked and all are
needed. Finally, I have checked whether 7 is needed because of its
inclusion in a parallel branch; checking for this type prevents this
code from working.
2018-07-05 19:10:17 +09:30
saxon 419ee0e76e Deleting stuff I don't need 2018-07-05 09:49:30 +09:30
saxon 1f6c2cf466 Getting rid of tests I don't need atm 2018-07-05 09:30:47 +09:30
saxon cac22540c0 Using flag for rtmp url 2018-07-04 22:44:39 +09:30
saxon c861862ff7 Got rtmp test working 2018-07-04 16:39:09 +09:30
saxon 0f47256297 Got h264 file to flv rtmp test driver built 2018-07-04 13:34:09 +09:30
Saxon Milton 79710f27f6 Trying to get it to build 2018-07-02 13:12:11 +09:30
Dan Kortschak 353d2cfcc7 revid,revid-cli: remove non-functional RTP mention and add MPEGTS config option 2018-06-30 21:50:55 +09:30
Saxon Milton 94a9f8fe77 no message 2018-06-29 03:31:05 +09:30
Saxon Milton 0cae97b9ee removing stuff we don't need 2018-06-29 01:06:40 +09:30
Saxon Milton bbb3ddf00f changing package names to hopefully something more go idiomatic 2018-06-28 22:54:20 +09:30
Saxon Milton ede44cefe1 for some reason didn't track changes, committing again 2018-06-28 21:56:06 +09:30
Saxon Milton f1aefcdfeb added appropriate test files and ran go fmt over av 2018-06-28 21:52:48 +09:30
Alan Noble 99ef1d0727 PR feedback and some other clean-up. 2018-06-27 07:50:05 +09:30
Alan Noble 1645b759f1 Added ns to Revid struct, so it could be exposed as a httpSender, and refactored revid-cli accordingly. 2018-06-26 15:53:55 +09:30
Alan Noble 9d113cc498 Renamed NativeRtmp to just Rtmp - since it is exposed to clients. FfmpegRtmp should be deprecated. 2018-06-25 10:53:26 +09:30
Dan Kortschak 647641bed6 revid: clean up input handling 2018-06-24 21:31:09 +09:30
Alan Noble 60c09c2800 Merge branch 'master' of https://bitbucket.org/ausocean/av 2018-06-22 15:57:33 +09:30
Alan Noble a8b56ddb19 Moved test data to test repo. 2018-06-22 15:53:13 +09:30
Dan Kortschak fba613ab60 revid: make FramesPerClip an int 2018-06-20 14:38:34 +09:30
Dan Kortschak ec3eefeb37 revid: do not double report returned error 2018-06-20 13:59:38 +09:30
Dan Kortschak 090ad746a6 revid: change default frames/clip to 7 for http
This increases effective bitrate to 88kpbs from 12kbps with fpc=1.
2018-06-20 12:48:12 +09:30
Dan Kortschak 89e5178fde revid: release ring resource quickly for httpSender 2018-06-20 12:42:36 +09:30
kortschak 5840e483b8 Merged in ring/bytes (pull request #35)
revid: use direct access to ring.Chunk bytes
2018-06-18 22:52:55 +00:00
kortschak 74a2891ed7 Merged in revid/httpaddress (pull request #32)
revid: use correct address for HTTP
2018-06-18 22:49:24 +00:00
Dan Kortschak 1800d2f6da revid: use direct access to ring.Chunk bytes 2018-06-18 19:30:00 +09:30
Dan Kortschak ca5eefa4c3 generator,parser: remove Get prefix from read accessors
Also make user-facing chan exposure a little safer.
2018-06-17 21:52:55 +09:30
Dan Kortschak b66abcbfec revid: improve doc comment 2018-06-17 21:11:44 +09:30
Dan Kortschak a7d3edbe57 revid: rename ChangeConfig to SetConfig 2018-06-17 21:10:27 +09:30
Dan Kortschak ed923ed256 revid: rename GetConfigRef to Config 2018-06-17 21:08:37 +09:30
Dan Kortschak 6de4f8c9a6 revid: rename GetBitrate to Bitrate
Also change to int; when we get more than 2Gbs^-1, we'll probably be
using 64 bit devices.
2018-06-17 20:57:52 +09:30
Dan Kortschak 5bdd66e22b rtmp: rename StartSession to Open 2018-06-17 20:45:58 +09:30
Alan Noble 05c6c376b4 Payload data has now moved onto Pin struct. 2018-06-16 19:04:32 +09:30
kortschak 4c0d219fbf Merged in revid/nilcheck (pull request #33)
revid: fix nil dereference on RTMP reconnect
2018-06-16 04:10:17 +00:00
Dan Kortschak 36ebb5d58a revid: remove unused field in Revid 2018-06-15 21:18:22 +09:30
Alan Noble 53f923afb1 netsender.MakePins() now takes a 2nd arg. 2018-06-15 19:34:50 +09:30
Alan Noble 5ba5327f33 httpSender now implemented as a NetSender client, rather than a generic HTTP client. 2018-06-15 16:42:29 +09:30
Dan Kortschak a995a36ad7 revid: fix nil dereference on RTMP reconnect 2018-06-14 22:54:44 +09:30
Dan Kortschak 3e6a3283e1 revid: use correct address for HTTP 2018-06-14 13:42:54 +09:30
kortschak b72d9bdd0d Merged in config/ctrlCctrlV (pull request #31)
revid: fix incorrect assignment
2018-06-13 05:25:35 +00:00
Dan Kortschak b89514847d revid: fix incorrect assignment 2018-06-13 14:45:03 +09:30
Dan Kortschak f953216f31 revid: fix nil dereference panic 2018-06-13 12:42:33 +09:30
Dan Kortschak 820dae7b4c revid: various cleanups 2018-06-09 14:58:33 +09:30
Dan Kortschak 1105ee3ea9 revid: use loadSender for clip sending 2018-06-09 14:08:48 +09:30
Dan Kortschak 3881cb9712 revid: avoid monomorphic interface 2018-06-09 11:31:21 +09:30
Dan Kortschak 3da57cbe46 revid: use time.Duration for durations 2018-06-08 12:48:11 +09:30
Dan Kortschak 902ac744fe revid: address review comments 2018-06-08 09:32:13 +09:30
Dan Kortschak dee6dec8d4 revid: wait for URL from netreceiver 2018-06-07 21:50:01 +09:30
Dan Kortschak 71a30bcc67 revid: lower-case names 2018-06-07 20:32:53 +09:30
Dan Kortschak 123cf9c7cf ring: migrate package to utils/ring 2018-06-07 15:45:14 +09:30
Dan Kortschak b7b000aeac revid,ring: plumb in ring buffer with WriteTo
There is a residual scar of an intermediate []byte copy because of the
signature of http.NewRequest, but this can be addressed later. The rtmp
interface needed alteration so that rtmp.Session satisfies io.Writer.
2018-06-06 17:55:10 +09:30
Dan Kortschak 2791939f34 ring: reverse time discounting 2018-06-06 17:53:15 +09:30
Dan Kortschak 04df5c2aa2 revid: plumb ring.Buffer into clip handling
This drops ringbuffer and changes the behaviour from purging old
unhandled clips to dropping new unhandled clips.
2018-06-06 17:53:15 +09:30
Alan Noble 9e5e10f413 Changed defaultRtmpUrl to use the endpoint for rig0@ausocean.org, rather than the main AusOcan YouTube channel. 2018-06-02 16:40:41 +09:30
Dan Kortschak d6fd3d4539 all: manual clean up of imports 2018-05-30 16:53:57 +09:30
Dan Kortschak 173d7c3879 rtmp: clean up session handling and CGO interface
* Make C compilation arch-independent, including shared lib use and fix
  for broken librtmp include install.
* Provide package-root level makefile for building C lib.
* Remove package global.
* Use Go-idiomatic naming for methods.
* Restucture flow to reduce indentation.
* Use []byte len in place of additional param.
* Use unix-idiomatic return status values.
2018-05-29 15:36:28 +09:30
richardsonjack c08a2c079f rename smartlogger 2018-05-24 13:05:29 +09:30
richardsonjack 898b231521 Update log API call 2018-05-24 12:20:41 +09:30
richardsonjack 63f56a964f Merge branch 'master' of https://bitbucket.org/ausocean/av/src 2018-05-24 12:13:05 +09:30
richardsonjack 9b4d2127b0 fix spelling error 2018-05-24 12:12:53 +09:30
Saxon1 074eab0fb2 Merge branch 'master' of https://bitbucket.org/ausocean/av/src 2018-05-24 11:59:12 +09:30
richardsonjack 7dbb48f5c1 Update to use new logger 2018-05-24 11:58:53 +09:30
Saxon1 8282cd3880 printing clearing output chan less 2018-05-24 11:58:49 +09:30
Saxon1 e76deb3864 Merge branch 'master' of https://bitbucket.org/ausocean/av/src 2018-05-24 11:52:50 +09:30
Saxon1 2ff683160a changing verbosity 2018-05-24 11:52:24 +09:30
Saxon Milton 0741643ac6 fix bitrate update 2018-05-17 16:39:36 +09:30
Saxon Milton 8e806b59dc Merge branch 'master' of https://bitbucket.org/ausocean/av 2018-05-14 16:24:45 +09:30
Saxon Milton 839ac9d922 updating changes 2018-05-14 16:23:55 +09:30
Alan Noble 3792c7953d Export GetBitrate(). 2018-05-14 15:43:19 +09:30
Alan Noble 953cecf9da Use a separate sendMutex not the main mutex! 2018-05-07 23:06:06 +09:30
Alan Noble cc45b02609 Use mutex instead of isSending to be safe. 2018-05-07 22:39:58 +09:30
Alan Noble defe5c54a8 Made logging a bit less verbose using Detail messages. 2018-05-07 21:16:40 +09:30
Saxon Milton 3f49f56ec5 defunct process fix 2018-05-07 14:21:11 +09:30
Saxon Milton 5b5d17ee87 Removed additional isRunning check. 2018-05-07 12:26:39 +09:30
Saxon Milton 47125ef281 Created isSending flag 2018-05-07 12:23:50 +09:30
Alan Noble 098cc19c60 More checks for isRunning. 2018-05-07 12:11:43 +09:30
Saxon Milton b2269ef8d8 Fixed error 2018-05-06 23:36:49 +09:30
Saxon Milton 8179b371e6 Increased debugging messages and also potentially fixed blocking issue 2018-05-06 23:03:44 +09:30
Saxon1 463e983b21 Changing bitrate/ringbuffer size to debug 2018-05-06 19:33:51 +09:30
Saxon1 6ccdcef83f Removed the other error count 2018-05-06 19:15:01 +09:30
Saxon1 cbcbc10658 Removing error count 2018-05-06 19:12:35 +09:30
Saxon1 76d0de2ffb trying new way to deal with send errors 2018-05-06 19:11:42 +09:30
Saxon1 d03e70e8dc perhaps clip size theshold was too small?? 2018-05-06 18:50:21 +09:30
Saxon1 99515edee5 ran go fmt 2018-05-06 18:08:45 +09:30
Saxon1 4dbc6532ec More messages 2018-05-06 17:42:02 +09:30
Saxon1 23a086dfaa Fixing blocking 2018-05-06 17:33:44 +09:30
Saxon1 b111d98892 fixing issues 2018-05-06 17:24:36 +09:30
Saxon1 145708c334 some more checks 2018-05-06 17:16:38 +09:30
Saxon1 5d7238f5b3 Trying to fix a whole heap of bugs 2018-05-06 16:48:17 +09:30
Saxon1 d2ff9731e4 flushing data in different spot 2018-05-06 01:15:51 +09:30
Saxon1 c7ec750b4f need to stop it from blocking 2018-05-06 00:49:34 +09:30
Saxon1 6500eef888 This could be it 2018-05-06 00:36:07 +09:30
Saxon1 39e6a785ef removed bad free and added better to clean output chan 2018-05-06 00:26:02 +09:30
Saxon1 88c2104048 Let's try this 2018-05-05 23:42:29 +09:30
Saxon1 0e8ee5975d trying not to end and start rtmp session 2018-05-05 23:33:06 +09:30
Saxon1 0b9f678354 Trying to fix mem leak 2018-05-05 23:25:59 +09:30
Saxon1 3d0a88036a decrease bitrate/ringubffer verbosity 2018-05-05 14:30:18 +09:30
Saxon1 5bb2bcc5f6 trying to slow things down a little 2018-05-05 14:26:01 +09:30
Saxon1 2289bb8e5a changing bitrate 2018-05-05 14:01:45 +09:30
Saxon1 a7544006cb printing out raspivid command 2018-05-05 13:57:49 +09:30
Saxon1 144e352e41 removing flip flags 2018-05-05 13:53:45 +09:30
Saxon1 432e9d6c54 Fixed []strgin to string 2018-05-05 13:53:01 +09:30
Saxon1 393583572b Still fixing flipping stuff 2018-05-05 13:51:58 +09:30
Saxon1 3c0b507bd1 fixing some more errors 2018-05-05 13:48:38 +09:30
Saxon1 40c0989fc1 adding forward slash 2018-05-05 13:47:11 +09:30
Saxon1 900aca638e fixing import 2018-05-05 13:46:28 +09:30
Saxon1 6f94ea3107 fixing flilp bug 2018-05-05 13:45:07 +09:30
Saxon1 b2c7eced99 Fixing some more syntax errors 2018-05-05 13:13:52 +09:30
Saxon1 740e03c0d6 Fixing some more syntax errors 2018-05-05 13:12:43 +09:30
Saxon1 6896ae2966 Fixing syntax error 2018-05-05 13:10:04 +09:30
Saxon Milton d66c5c5ae0 Adding vertical and horizontal flip 2018-05-03 22:06:17 +09:30
Saxon1 16d925af08 fixed another syntax error 2018-05-03 17:59:50 +09:30
Saxon1 ef1ede1eb5 fixed some syntax errors 2018-05-03 17:58:56 +09:30
Saxon1 12cefea60a Updated config options 2018-05-03 17:57:36 +09:30
Saxon1 03a919dd0c trying to fix mem problem 2018-05-03 14:28:14 +09:30
Saxon1 ea0ee8fc08 Changing raspivid command 2018-05-03 13:34:20 +09:30
Saxon1 f01e095e9e Fixed output setup problem 2018-05-02 13:24:01 +09:30
Saxon Milton 242a333620 Changed rotate to Rotate :S 2018-05-02 10:11:29 +09:30
Saxon Milton 1da7fcd837 added config field to config struct 2018-05-02 10:10:44 +09:30
Saxon Milton 6bfa72b3fc Cleaned up librtmp output setup 2018-05-02 10:08:51 +09:30
Saxon Milton 56c63237dc Fixed syntax error 2018-05-02 10:05:57 +09:30
Saxon Milton 5e03ed8724 Trying to fix mem leaks 2018-05-02 09:58:00 +09:30
Saxon Milton 9b4681e29f implementing rotate 2018-05-01 06:07:37 +09:30
Saxon Milton 6803554434 fixing rtmp handshake error 2018-05-01 05:40:41 +09:30
Saxon1 b9987fe227 trying to fix rtmp issues 2018-04-26 16:30:18 +09:30
Saxon1 c29d4097e2 Let's try this 2018-04-26 16:17:09 +09:30
Saxon1 5847aad552 removed mutex 2018-04-26 16:04:47 +09:30
Saxon1 45f33f3d3a simple try 2018-04-26 16:01:18 +09:30
Saxon1 a416edfc74 still trying to fix things 2018-04-26 15:49:30 +09:30
Saxon1 51b18fbaa7 Fixing dropout problems 2018-04-26 15:35:59 +09:30
Saxon Milton 7ad6276189 Trying another fix 2018-04-25 19:21:43 +09:30
Saxon Milton 36dea12e7e decreasing verbosity 2018-04-25 18:56:43 +09:30
Saxon Milton 029b2ae3d0 FIxed verbosity 2018-04-25 18:28:39 +09:30
Saxon Milton 929f9992f3 potential fix 2018-04-25 16:55:42 +09:30
Saxon Milton 6a475152d0 bad fix for now, reboot when buffer full 2018-04-25 15:42:08 +09:30
Saxon Milton 6efea26bc5 Added more debug messages 2018-04-25 14:42:16 +09:30
Saxon Milton 46cc47c661 outputting frame sizes that are too big 2018-04-25 14:21:47 +09:30
Saxon Milton ff1cb979ac Think Ive finally got it 2018-04-25 14:20:17 +09:30
Saxon Milton abfa93aab3 outage fix 2018-04-25 13:56:46 +09:30
Saxon Milton b430224020 Fixed buffer full issue! 2018-04-25 13:31:14 +09:30
Saxon Milton 2d812363cf Improved logging 2018-04-25 12:28:30 +09:30
Saxon Milton 6f2cb19ab7 fixed another syntax error 2018-04-25 12:14:17 +09:30
Saxon Milton b57cf661b7 create fpcAsInt var 2018-04-25 12:12:55 +09:30
Saxon Milton a2b8d0c182 fix syntax error 2018-04-25 12:11:41 +09:30
Saxon Milton 04fecac797 Attempting to fix crashing 2018-04-25 12:09:53 +09:30
Saxon1 719cbe3a9a Fixed syntax error 2018-04-24 15:19:53 +09:30
Saxon1 d8a103c4d3 fixed some syntax errors 2018-04-24 15:17:45 +09:30
Saxon1 f73345db9a Merge branch 'RevidCLI' of https://bitbucket.org/ausocean/av/src into RevidCLI 2018-04-24 15:08:40 +09:30
Saxon1 ab31f0bd67 Improving handling of send errors 2018-04-24 15:08:30 +09:30
richardsonjack 3b3e010f3f fix syntax error 2018-04-24 14:52:18 +09:30
Saxon Milton 6f602479e2 Merge branch 'RevidCLI' of https://bitbucket.org/ausocean/av/src into RevidCLI 2018-04-24 13:52:11 +09:30
Saxon Milton 113293a3e0 handling buffer full error better 2018-04-24 13:47:05 +09:30
richardsonjack 11fc2f50f4 fix typos 2018-04-23 13:12:37 +09:30
richardsonjack 26636b0976 fix missing bracket 2018-04-23 11:59:51 +09:30
Saxon Milton 7edf430f9a Fixed some logging stuff 2018-04-22 14:04:48 +09:30
Saxon1 5b666af41f Debugging 2018-04-20 16:23:51 +09:30
Saxon1 ee6cecd908 further fixed error handling 2018-04-19 19:33:37 +09:30
Saxon1 920755376e improving error handling 2018-04-19 19:32:05 +09:30
Saxon1 323a0ae83a getting rid of some bad output 2018-04-19 19:18:29 +09:30
Saxon1 583374a94c got rid of some debugging messages 2018-04-19 19:15:44 +09:30
Saxon1 f0b3eeeb21 fixing some consts 2018-04-19 19:09:48 +09:30
Saxon1 7201f52ac1 fixed framesPerClip Validation 2018-04-19 18:52:09 +09:30
Saxon Milton f41d02e705 still fixing stuff 2018-04-19 08:07:57 +00:00
Saxon Milton 85c8ee8c97 fixing some syntax errors 2018-04-19 08:05:37 +00:00
Saxon1 01b99b3c14 Moving RevidCLI.go 2018-04-19 16:55:37 +09:30
Saxon1 0381a5dda0 ready for some testing 2018-04-19 16:33:12 +09:30
Saxon1 f50e1085b2 Merged and ready to start getting things ready 2018-04-19 16:12:07 +09:30
Saxon1 c888448d8e fixed merge conflicts 2018-04-19 15:40:43 +09:30
richardsonjack bebe53b5fa Implement netsender functionality 2018-04-19 15:28:16 +09:30
Saxon1 60163e007d Fixing some syntax errors 2018-04-19 13:42:36 +09:30
Saxon Milton d1283b9bb8 Last commit 2018-04-17 14:36:45 +09:30
Saxon Milton 175afb89a2 got rid of redundant error case 2018-04-16 15:02:00 +09:30
Saxon Milton 80b2672a08 using const for camera retry period 2018-04-16 14:59:49 +09:30
Saxon Milton fa7437cbd7 Removed extra indentation using continue 2018-04-16 14:57:42 +09:30
Saxon Milton 3e9d7ef523 Two different outputs rather than rtmp output and two different methods 2018-04-16 14:55:28 +09:30
Saxon Milton 093df161f1 Changed NewRevidInstance to NewRevid 2018-04-16 14:47:50 +09:30
Saxon Milton 597b0840a4 change ffmpeg path to system path 2018-04-16 14:43:29 +09:30
Saxon Milton 7d112175f6 Changed RevidInst to revid 2018-04-16 14:42:16 +09:30
Saxon Milton cad9078c17 ran go fmt on everything 2018-04-16 14:24:21 +09:30
Saxon Milton e3f5c14562 using go fmt 2018-04-15 20:23:53 +09:30
Saxon Milton 6f82735ab2 Got a RevidCLI written, just need to test 2018-04-15 20:12:06 +09:30
Saxon Milton 4ae6919cae Fixing some reboot issues 2018-04-14 19:08:52 +09:30
Saxon Milton ed42d6746c fixed err problem 2016-11-04 09:07:56 +10:30
Saxon1 dbde36d23a checking config instead of func 2018-04-14 18:31:19 +09:30
Saxon Milton c6fb433dd5 trying to fix syntax errors 2016-11-04 09:02:01 +10:30
Saxon1 41f7b3afb7 Hopefully fixed rtmp can't connect problem! 2018-04-14 18:25:09 +09:30
Saxon Milton 35bda5d3ff Cleaning some bits up before pull request 2018-03-18 10:30:05 +10:30
Saxon Milton d39c6483eb increasing robustness 2018-03-17 23:59:42 +10:30
saxon 585ddca663 updating code 2018-03-16 09:43:32 +10:30
Unknown f40d77ea48 pls 2018-03-14 20:37:07 +10:30
Unknown efa02c3799 Fixing something 2018-03-14 20:24:26 +10:30
Unknown f3da74a364 Fixing rtmp stuff 2018-03-14 20:17:00 +10:30
Unknown 36986d543b fixing error handling 2018-03-14 20:09:08 +10:30
Unknown f1f7235fa5 fixed a potential problem 2018-03-14 20:06:28 +10:30
Unknown 1f9a14a0ee Doing another error check 2018-03-14 19:54:11 +10:30
richardsonjack 0f8b7c3370 add extra check 2018-03-14 18:14:09 +10:30
richardsonjack 34c8fcd98c dont set up http output 2018-03-14 16:37:27 +10:30
Unknown af4f7de2ea Fixed something small 2018-03-14 12:41:44 +10:30
saxon.milton@gmail.com 09b5fb9066 updating remote 2018-03-14 12:37:30 +10:30
Unknown a2ddf3dbe5 fixing main 2018-03-14 12:24:43 +10:30
Unknown 466634a6cb added a test driver so that we don't have testing limit 2018-03-14 12:22:32 +10:30
Unknown 86bc3602d7 go fmted 2018-03-14 11:48:03 +10:30
Unknown 431b2c4a5f Auto stash before merge of "rtmpOutputFunctionality" and "origin/rtmpOutputFunctionality" 2018-03-14 11:32:22 +10:30
saxon.milton@gmail.com d718534f0f updating remote 2018-03-14 11:19:21 +10:30
Unknown 77ed186529 Fixing bitrate 2018-03-14 08:43:36 +10:30
saxon.milton@gmail.com f443ffe6a2 what's happening 2018-03-14 08:41:33 +10:30
saxon.milton@gmail.com 2787110e14 fixed conflict 2018-03-14 08:33:38 +10:30
saxon.milton@gmail.com 2a0652042b increased ring buffer element size 2018-03-14 08:31:45 +10:30
saxon.milton@gmail.com bf78218787 Merge branch 'rtmpOutputFunctionality' of https://bitbucket.org/ausocean/av into rtmpOutputFunctionality 2018-03-14 08:30:43 +10:30
saxon.milton@gmail.com 8fbad24c95 it's working! 2018-03-14 08:28:33 +10:30
Unknown 2eae228d73 constant bitrate 2018-03-14 08:21:33 +10:30
Unknown f7b3acb4d6 This has got to work 2018-03-13 21:27:34 +10:30
Unknown 2dccba6969 Trying one last thing 2018-03-13 21:20:36 +10:30
saxon.milton@gmail.com d762352a97 updating remote 2018-03-13 21:19:24 +10:30
Unknown 4d152494c5 Fixing timestamp problem 2018-03-13 19:59:15 +10:30
saxon.milton@gmail.com 31eb35b5e8 updating remote 2018-03-13 19:44:30 +10:30
Unknown 3f9c73a612 Reducing mem requirements 2018-03-13 19:05:28 +10:30
saxon.milton@gmail.com e9f0fc9da7 managed to get it to build 2018-03-13 18:59:18 +10:30
Unknown 6431448db4 updating 2018-03-13 16:02:52 +10:30
Unknown 0309b5abfa Getting ready to put onto pi 2018-03-13 15:45:42 +10:30
Unknown f68385330c updating 2018-03-13 15:13:32 +10:30
Unknown 76df33ceb9 Fixing bugs 2018-03-13 15:03:31 +10:30
Unknown 57d416563a Just cleaning stuff up before testing 2018-03-13 11:44:43 +10:30
Saxon Milton 5c4eda1d6f removing stuff i don't need 2018-03-01 01:23:39 +10:30
Saxon Milton 92a2b033c9 Working on cleaning up code and comments 2018-02-28 01:40:38 +10:30
Unknown 7b50a4e95c last update 2018-02-19 16:13:01 +10:30
Unknown ed88df0110 Auto stash before merge of "rtmpOutputFunctionality" and "origin/rtmpOutputFunctionality" 2018-02-19 15:36:13 +10:30
Unknown 182cfeef88 Still trying 2018-02-16 16:16:24 +10:30
Unknown a38b86236c almost there I think (hope) 2018-02-15 18:43:45 +10:30
Unknown 1407ebe39b Trying to get rtmp working, but it's not 2018-02-15 17:32:04 +10:30
Unknown 7f498c8d00 Debugging 2018-02-14 17:32:57 +10:30
Unknown 400f909dd4 Managed to link c code with cgo :) 2018-02-14 16:30:44 +10:30
Saxon Milton a276809ec9 Ready for debugging tomorrow 2018-02-13 20:16:21 +10:30
Unknown bf6b1383c0 UPdating test file 2018-02-12 18:29:13 +10:30
Unknown c46a8d8f08 Fixed errors and bugs and it seems like flv packetization is working 2018-02-12 18:28:29 +10:30
Saxon Milton ec796bd9ae fixing bugs and wrote test file... need to build and see my errors now 2018-02-11 17:04:52 +10:30
Saxon Milton 010b252782 Need to do some testing on my flv stuff next 2018-02-11 16:36:59 +10:30
Saxon Milton 1a083d3059 created file dedicated to config 2018-02-10 17:38:14 +10:30
Saxon Milton 369337cc39 Cleaning things up and have started thinking about an FLV generator 2018-02-10 17:29:56 +10:30
Saxon e522c34f36 STill working on stuff 2018-02-09 17:30:09 +10:30
Unknown 871fb45b5b Got youtube streaming working to an extent 2018-02-09 16:53:06 +10:30
Unknown ed14ebb9b9 Working on getting rtmp to youtube. Have a testing file to start with 2018-02-08 17:51:43 +10:30
Saxon Milton c8c9c3f0d2 Baby steps: starting by output rtmp to youtube via ffmpeg 2018-02-08 12:23:44 +10:30
Unknown edb4ffd826 Getting started on rtmp output 2018-02-07 17:05:34 +10:30
Jack Richardson 91bc6fbff9 Everything seems to be working except for fps 2018-02-01 12:04:05 +10:30
Jack Richardson 31a13b2dc2 Just updating changes 2018-02-01 10:31:04 +10:30
Unknown 333e18e1c6 Updating remote 2018-02-01 10:25:06 +10:30
Jack Richardson 26430f1ff8 Seems like MJPEG doesn't like quantisation - we'll have to work out a nice bitrate 2018-01-31 17:12:29 +10:30
Unknown e33f4fded0 FIshing some issues with code
Something is breaking raspivid, need to work out what it is
2018-01-31 16:56:36 +10:30
Jack Richardson 5a0aedff8c updating updating remote so that I can make changes on my system 2018-01-31 16:53:45 +10:30
Jack Richardson c73afb65f3 Just updating remote 2018-01-31 16:43:04 +10:30
Unknown 9ae75e67b7 Just updating 2018-01-31 13:44:59 +10:30
Unknown d87a727f0f Fixing error 2018-01-31 13:05:10 +10:30
Unknown 81eab1c634 Getting ready to run on pi
Changed imports for pi
2018-01-31 12:58:22 +10:30
Unknown 147716ccab Builds and bugs are out (for now)
Let's try testing on the pi next
2018-01-31 12:53:18 +10:30
Unknown 7572968ad3 Think it's ready for testing 2018-01-31 11:46:43 +10:30
Unknown a07953042c Improving error checking further 2018-01-31 11:30:03 +10:30
Saxon Milton 535d898a3c Finished commenting, now I can think about only testing 2018-01-31 10:53:09 +10:30
Saxon Milton 3738659eae Working on more comments and getting ready for testing 2018-01-31 10:21:53 +10:30
Unknown ccd2bd2bed Seems to be compiling fine
builds fine -  need to test tomorrow
2018-01-30 16:54:39 +10:30
Unknown 76e253753d Looks like parser is working
Parser can successfully extract individual jpeg images
2018-01-30 12:49:39 +10:30
Unknown 4ff3092f4a Starting editing files to incorperate new mjpeg functionality 2018-01-29 17:04:08 +10:30
Unknown e9693c3289 fixing build errors 2018-01-24 14:52:52 +10:30
Unknown 40079c6346 Fixing cosmetic stuff 2018-01-24 14:42:22 +10:30