Commit Graph

3341 Commits

Author SHA1 Message Date
Trek H 9c978be91b mjpeg-player: updated player for m3u changes
Updated player to play data that has been loaded using the hlsjs m3u loading code.
Added an input URL element to html to load playlists.
2020-01-20 20:52:37 +10:30
Trek Hopton feae838b3f Merged in m3u-files (pull request #329)
All files for m3u addition present with updated extensions

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-20 04:03:54 +00:00
Scott Barnard 75946c6bdd Merged in mode-var-type (pull request #331)
revid: include mode var in var types

Approved-by: Alan Noble <anoble@gmail.com>
2020-01-20 03:18:46 +00:00
Scott eea0f2d9dc revid/config/config.go: added vartype mode 2020-01-20 11:51:30 +10:30
Trek H e58e95f3ed Merge branch 'master' into m3u-files 2020-01-17 16:44:21 +10:30
Trek H acb6c28b9b mjpeg-player: added packages used by hls.js code 2020-01-17 16:28:48 +10:30
Scott Barnard 123c7d163a Merged in mjpeg-extract-error (pull request #327)
Fixed mjpeg extract.go returning errors when it should not.

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-17 05:56:59 +00:00
Trek H fd476ad964 mjpeg-player: renamed all .ts files to .js 2020-01-17 16:20:30 +10:30
Alan Noble 3a743ea917 revid/config/config.go: reverted incorrect change 2020-01-15 13:58:51 +10:30
Alan Noble ea42a532d7 Merge branch 'master' of https://bitbucket.org/ausocean/av 2020-01-15 13:47:37 +10:30
Alan Noble 4bfad21003 revid/config/config.go: fixed typo in outputs data type (enums->enum) 2020-01-15 13:46:56 +10:30
Scott 8dbcf1c148 extract_test.go: Simplified test code 2020-01-15 13:22:41 +10:30
Scott Barnard bf9f44dfb7 Merged in camera-ip-variable (pull request #326)
CameraIP variable added

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-14 10:49:56 +00:00
Scott 35a413c80a Added test file for extract.go 2020-01-14 16:46:35 +10:30
Scott 0a79ac3474 Fixed mjpeg extract.go returning errors when it should not. 2020-01-09 16:03:52 +10:30
Scott 6d2c58cd66 CameraIP variable added 2020-01-09 15:28:49 +10:30
Saxon Milton 949c4ee2af Merged in using-vring (pull request #324)
revid: now using variable ring buffer

Approved-by: Alan Noble <anoble@gmail.com>
2020-01-09 03:44:49 +00:00
Saxon 78bb0db323 revid: removed comment no longer needed 2020-01-09 14:04:37 +10:30
Saxon d90d2203bd revid: only using one set of ring buffer parameters rather than MTS and RTMP 2020-01-09 13:58:44 +10:30
Saxon 7086960e66 revid/revid.go: fixed ring buffer related string literal confusion 2020-01-09 13:38:23 +10:30
Saxon 0f9eba4bb1 revid/config/config.go: updated ring buffer variable names in TypeData map 2020-01-09 13:38:23 +10:30
Saxon e9bd2fc0d1 revid: now using variable ring buffer 2020-01-09 13:31:03 +10:30
Scott Barnard f5b8ea10fc Merged in motion-filter-variables (pull request #325)
Motion filter variables

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-09 02:13:27 +00:00
Scott be3f82616b Increased iot version to v1.2.11 2020-01-09 11:41:09 +10:30
Scott 1b45c52379 Added motion filter variables. 2020-01-09 11:41:09 +10:30
Saxon Milton be27d17c7a go.mod updated to use utils version with vring 2020-01-08 01:51:55 +00:00
Saxon Milton 36220e967f Merged in rtp-jpeg-extractor (pull request #289)
codec/mjpeg: RTP/JPEG extractor

Approved-by: Alan Noble <anoble@gmail.com>
2020-01-07 04:43:07 +00:00
Saxon ca9c1ad425 codec/mjpeg/jpeg.go: removed white space 2020-01-07 14:47:06 +10:30
Saxon 723166ec50 codec/mjpeg/jpeg.go: simplified copy 2020-01-07 14:45:25 +10:30
Saxon fcb8f18e1f codec/mjpeg/jpeg.go: removed white space 2020-01-07 14:43:26 +10:30
Saxon 7fca2257a4 codec/mjpeg/jpeg.go: simplified writing of huffman tables by calculating n values in global vars 2020-01-07 14:36:15 +10:30
Saxon 7fb5ed00a2 codec/mjpeg/jpeg.go: simplified copies 2020-01-07 13:53:26 +10:30
Ella Pietraroia 60dcf0e285 Merged in cbr-mjpeg (pull request #323)
Cbr true for mjpeg input codec

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-07 03:16:14 +00:00
Ella Pietraroia ba1c304281 no looging messages 2020-01-07 13:44:48 +10:30
Saxon 52f18cdc58 codec/mjpeg/jpeg.go: simplified some more indexing 2020-01-07 13:14:18 +10:30
Saxon 0b848cb01b codec/mjpeg/jpeg.go: no longer need to convert dri to uint16. 2020-01-07 13:12:22 +10:30
Saxon 4325b86a99 codec/mjpeg/jpeg.go: don't need to convert jfifLabel string to []byte for copy 2020-01-07 13:11:25 +10:30
Saxon 38c4972a76 codec/mjpeg/jpeg.go: simplified some indexing 2020-01-07 13:09:27 +10:30
Saxon d0e356314d codec/mjpeg/jpeg.go: moved get24 to bottom of file and gave comment. 2020-01-07 13:06:56 +10:30
Saxon 86e215f913 codec/mjpeg/jpeg.go: decrementing q by 128 before qLen > 0 check to simplify indexing where q-128 is done 2020-01-07 13:01:34 +10:30
Saxon f187af747b codec/mjpeg/jpeg.go: removing panics inside ParsePayload in favour of errors 2020-01-07 12:52:31 +10:30
Ella Pietraroia 55e13c2f8f device/raspivid/raspivid.go changing default bitrate to fit within buffer 2020-01-07 11:26:17 +10:30
Saxon 803cdf0747 codec/mjpeg/jpeg.go: dir is now uint16 to avoid conversion 2020-01-07 11:14:43 +10:30
Ella Pietraroia 492e5025de revid/revid.go adding info messages 2020-01-07 11:10:04 +10:30
Saxon 83a304037c codec/mjpeg/jpeg.go: simplified writing of bytes for SOF and SOS headers 2020-01-07 11:08:36 +10:30
Ella Pietraroia 04b7a79055 revid/revid.go adding CBR=true for MJPEG encoded video for RaspiVid and RSTP 2020-01-07 10:45:45 +10:30
Scott 4a4bf0dab6 Moved test videos from av to test repository 2020-01-07 09:37:56 +10:30
Saxon 4834aa8ca2 codec/mjpeg/jpeg.go: don't need to set c.blen to 0 2020-01-04 13:53:04 +10:30
Saxon ef4e9a3f69 codec/mjpeg: removed putBuffer and its usage 2020-01-04 13:10:40 +10:30
Saxon ab2f2e4c0b codec/mjpeg/testdata/expect.mjpeg: updated expected MJPEG file 2020-01-04 01:55:56 +10:30