Commit Graph

4100 Commits

Author SHA1 Message Date
Saxon Milton c54259b8bd Merged in motion-exp (pull request #305)
exp/gocv-exp: added gocv experimental code with testing files
2019-12-16 02:22:35 +00:00
Saxon e1712773e1 Added gocv experimental code with testing files 2019-12-16 12:48:10 +10:30
Trek H ee4b188175 mjpeg-player: revert reorder of switch cases to minimise diff 2019-12-13 14:03:39 +10:30
Trek H 9ba9eb14af mjpeg-player: cosmetic changes to minimise diff 2019-12-13 13:53:52 +10:30
Trek H 47d9130385 mjpeg-player: added header to mts-demuxer 2019-12-12 14:16:52 +10:30
Trek H a0a5496d44 mjpeg-player: demux mods added 2019-12-12 14:00:21 +10:30
Trek H c1930baf40 mjpeg-player: added player code and hlsjs modifications 2019-12-12 13:56:50 +10:30
Trek Hopton 191d5cef3d Merged in hlsjs-code (pull request #302)
mjpeg-player: added original hls.js code for mts demuxer
2019-12-12 03:16:57 +00:00
Trek H 9476440e21 mjpeg-player: added original hls.js code for mts demuxer 2019-12-12 13:41:44 +10:30
Scott Barnard 67a09589f7 Merged in v-h-flip-variable-name (pull request #301)
Flip Horizontal & Flip Vertical variables renamed to match convention

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2019-12-06 06:30:32 +00:00
Scott c11444f043 FlipHorizontal & FlipVertical variables renamed 2019-12-06 16:36:29 +10:30
Frank Cui 73398f96a7 Merged in ParseInt-to-Atoi (pull request #297)
revid/revid.go: Replaced ParseInt with Atoi

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2019-12-05 09:36:42 +00:00
Frank Cui fe22d55050 revid/revid.go: Changed remaining ParseUint to Atio 2019-12-05 14:50:44 +10:30
Ella Pietraroia f8da6b0609 Merged in raspivid-stderr (pull request #299)
device/raspivid/raspivid.go: piping stderr and checking for errors

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2019-12-05 01:05:20 +00:00
Scott Barnard d9d78ac275 Merged in file-valid-input-var (pull request #298)
File is a valid value to the input variable

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2019-12-05 00:50:46 +00:00
Scott ad7af04f13 revid/revid.go Added file as a valid value to the input variable 2019-12-05 10:43:28 +10:30
Frank Cui 6e2dcc4b4d revid/revid.go: Replaced ParseInt with Atoi 2019-12-05 09:55:11 +10:30
Frank Cui 8d57977fd9 Merged in simplfy_statement (pull request #296)
revid/config: Simplfied LogLevel check

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2019-12-04 23:10:34 +00:00
Frank Cui f88c6fc096 revid/config: Simplfied LogLevel check 2019-12-05 09:30:51 +10:30
Scott Barnard 8fa9f7df48 Merged in revid-crash-file-input (pull request #294)
Revid crash on file input fixed

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2019-12-04 07:16:16 +00:00
Scott Barnard 863d0e3bd4 Merged in using-%w-errors (pull request #293)
Standardise on using %w when wrapping errors using fmt.Errorf

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2019-12-04 07:12:00 +00:00
Ella Pietraroia 9f567fbfed device/raspivid/raspivid.go: piping stderr and checking for errors
We now pipe stderr as well as stdout and check for errors on this pipe in a routine called in
raspivid.Start().
2019-12-04 16:41:26 +10:30
Scott f8fc5156f1 revid/revid.go Revid crash on file input fixed
Now the file input has the lexer set to config's codec
2019-12-04 16:17:51 +10:30
Scott e116e197ae Changed all %v's to %w's where appropriate 2019-12-04 14:12:20 +10:30
Scott Barnard 94380ef17e Merged in mjpeg-output-v4l (pull request #292)
Mjpeg output v4l

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2019-12-04 01:55:41 +00:00
Scott 70802022bb revid/revid.go MPEG lexer enabled and encoder options set for v4l 2019-12-04 11:40:12 +10:30
Frank Cui 9f077b3799 Merged in define_MaxMin_frames (pull request #291)
revid/config.go: define max value for MinFrames

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2019-12-03 06:00:01 +00:00
Frank Cui b49e722c0b revid/config.go: define max value for MinFrames 2019-12-03 16:00:58 +11:00
Scott 565ba3079c Formatted code 2019-12-03 14:55:08 +10:30
Scott 48d36c2082 Ffmpeg gets different args for mjpeg encoding 2019-12-03 14:36:16 +10:30
Scott d5191d9daf Revid CLI accepts MJPEG as an input codec
The ffmpeg command uses the input codec value (H264 or mjpeg). However, it does not yet capture in mjpeg correctly.
2019-12-03 12:05:57 +10:30
Alan Noble ec0e19aec3 Merged in update-iot (pull request #290)
Update iot

Approved-by: Alan Noble <anoble@gmail.com>
2019-11-26 06:06:13 +00:00
scruzin 521fda86e5 Use ausocean/iot v1.2.8. 2019-11-23 19:21:49 +10:30
scruzin 42ad086537 Merge branch 'master' of https://bitbucket.org/ausocean/av 2019-11-23 18:16:47 +10:30
Saxon 870c0bc3fa codec/mjpeg/jpeg.go: fixed indentation in file header 2019-11-23 15:34:59 +10:30
Saxon 5b3988a5e0 codec/mjpeg/extract.go: corrected comment for Extractor.dst field 2019-11-23 15:33:41 +10:30
Saxon 82d9e5e8bd codec/mjpeg: tidying up
Separated my code from code that was ported from ffmpeg (differen copyright). Also added utils.go file to house the putBuffer and bytestream types. Reduced copying and use of bytes.Buffer.
Instead expanded putBuffer functionality so that I can use this throughout process (reduce copying from buffer to buffer).
2019-11-23 15:25:18 +10:30
Saxon Milton 1382df4878 Merged in default-to-vbr (pull request #286)
revid: defaulting to VBR for camera devices

Approved-by: Alan Noble <anoble@gmail.com>
2019-11-22 07:13:40 +00:00
Saxon c2c0a576e6 using slice functions from sliceutils package 2019-11-22 17:38:30 +10:30
Saxon ed9f6f5336 fixed typo and also defaulting to CBR for RTMP with geovision 2019-11-22 17:38:30 +10:30
Saxon a6797a929d revid: defaulting to VBR for camera devices
Easiest way to do this is change VBR config field to CBR (therefore CBR defaults to false without having to do anything).
2019-11-22 17:38:30 +10:30
scruzin e45a6922b8 Merge branch 'master' of https://bitbucket.org/ausocean/av 2019-11-22 17:32:40 +10:30
Alan Noble f7fb7d0a42 Merged in deprecate-stringinslice (pull request #288)
Deprecate stringinslice (take 2)

Approved-by: Saxon Milton <saxon.milton@gmail.com>
Approved-by: Alan Noble <anoble@gmail.com>
2019-11-22 07:01:25 +00:00
scruzin d661b4b34e Use ausocean/utils v1.2.11. 2019-11-22 17:19:52 +10:30
scruzin b4570f1aa1 Use sliceUtils.ContainsString instead of stringInSlice. 2019-11-22 17:19:27 +10:30
scruzin f63eac7acc Use ausocean/utils v1.2.11. 2019-11-22 17:18:41 +10:30
scruzin 85c4c7857a Use sliceUtils.ContainsString instead of stringInSlice. 2019-11-22 17:18:11 +10:30
Alan Noble 41945c9868 Merged in additional-logging (pull request #283)
Log size along with ring buffer error

Approved-by: kortschak <dan@kortschak.io>
Approved-by: Saxon Milton <saxon.milton@gmail.com>
Approved-by: Alan Noble <anoble@gmail.com>
2019-11-22 03:28:05 +00:00
Alan Noble 47e621ad1f Merged in build-on-windows (pull request #285)
Make audio platform specific.

Approved-by: Trek Hopton <trek.hopton@gmail.com>
Approved-by: Saxon Milton <saxon.milton@gmail.com>
Approved-by: Alan Noble <anoble@gmail.com>
2019-11-22 03:22:25 +00:00
scruzin e233ac8fd8 Remove unused code. 2019-11-22 13:30:27 +10:30