Commit Graph

3922 Commits

Author SHA1 Message Date
Saxon 398543ac8e 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).
2020-01-03 17:15:06 +10:30
Saxon 2d824707ee Fixed bugs, now working 2020-01-03 17:15:06 +10:30
Saxon f0f401ab8c codec/mjpeg/extract.go: wrote Extractor type
Wrote extractor type that provides an Extract function to extract JPEG frames from an RTP/MJPEG stream and writes them to a destination.
2020-01-03 17:15:05 +10:30
Saxon 0ae133d7fb codec/mjpeg/jpeg.go: added writeHeader function to write JPEG header
This also included the addition of some lunimance and chrominance tables, a multiError type (implements error) and a putter type, that will put uint16s, bytes and "buffers" into a byte
slice.
2020-01-03 17:15:05 +10:30
Saxon 238771459b codec/mjpeg/jpeg.go: added writeHuffman function to write JPEG huffman tables to an io.Writer. 2020-01-03 17:15:05 +10:30
Saxon db877fd934 codec/mjpeg/jpeg.go: added putMarker function to write JPEG marker codes to an io.Writer 2020-01-03 17:15:05 +10:30
Saxon c6252195af codec/mjpeg: added jpeg.go file to hold JPEG specific stuff and added some JPEG marker codes. 2020-01-03 17:15:05 +10:30
Saxon 47d145a222 codec/mjpeg: added jpeg_test.go, tests.go and expected output, expect.mjpeg to test ParsePayload function in jpeg.go 2020-01-03 17:10:18 +10:30
Ella Pietraroia b9df8e388a all mjpeg input codecs will have constant bitrate, as variable bitrate is only for h264 2020-01-03 16:47:38 +10:30
Trek Hopton 5a2a5496bb Merged in hlsjs-code-m3u (pull request #322)
mjpeg-player: added m3u hls.js code
2020-01-02 08:21:21 +00:00
Trek H 42ccdd1ef7 mjpeg-player: added m3u hls.js code
Added original hls.js code for m3u loading and parsing which will be modified to work with our mjpeg player.
2020-01-02 18:36:52 +10:30
Scott Barnard ddd7b5750d Merged in multiple-filters (pull request #315)
Multiple filters

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-02 06:38:24 +00:00
Scott 523dfab86b revid/config/config.go: Added full stop. 2020-01-02 17:05:50 +10:30
Scott d853860526 Added type data for filters variable 2020-01-02 16:14:37 +10:30
Scott e5db4f0f1c Fixed shared windows between motion filters bug 2020-01-02 16:12:48 +10:30
Scott f74e08d70a Filter safely closes. 2020-01-02 16:12:48 +10:30
Scott 15efc8331d Initial implementation 2020-01-02 16:12:48 +10:30
Scott Barnard c2df8a8fc1 Merged in enums-var-type (pull request #320)
Outputs variable uses the enums var type

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-02 05:41:42 +00:00
Saxon 36bcd361ed codec/mjpeg/jpeg.go: removed 'mark' function 2020-01-02 15:42:15 +10:30
Scott Barnard 24c9377017 Merged in show-windows-var (pull request #321)
Show windows var

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-02 04:45:24 +00:00
Scott 1f8ef44216 revid/config/config.go: Made string a const, removed redundant == true 2020-01-02 15:13:39 +10:30
Saxon 5a09a5f12d codec/mjpeg/jpeg.go: simplified if statement 2020-01-02 15:04:16 +10:30
Scott 442ad27e98 revid/config/config.go: Validation for ShowWindows, so that windows cannot be opened on the raspberry pi. 2020-01-02 15:03:43 +10:30
Trek Hopton af6532296d Merged in mjpeg-player-new (pull request #303)
Player demuxing MTS and playing MJPEG from file (new branch).

Approved-by: Alan Noble
2020-01-02 03:41:36 +00:00
Scott Barnard 474b58d616 Merged in MOG-err-imgdecode (pull request #319)
filter/mog.go: handles error from IMGDecode

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-02 03:30:21 +00:00
Scott 55981f8ae9 Made variable for showing windows 2020-01-02 13:48:23 +10:30
Scott d7fa1569a4 revid/revid.go: Disabled windows 2020-01-02 13:47:02 +10:30
Scott Barnard 0fe0579ba8 Merged in constants-for-MOG (pull request #318)
Created constants for the MOG filter

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-02 03:09:38 +00:00
Scott 90f448170f revid/revid.go: Full stops at the end of comments. 2020-01-02 13:38:31 +10:30
Scott cf51d07532 revid/revid.go: Separated const block into 3 sections 2020-01-02 13:35:03 +10:30
Scott 3e19fb7cd6 filter/mog.go: Write returns 0 instead of -1 2020-01-02 13:32:05 +10:30
Scott c7fa55a993 revid/revid.go: Renamed constants to be more specific to the MOG filter 2020-01-02 13:27:38 +10:30
Scott 9d857b8a66 Created constants for the MOG filter 2020-01-02 13:25:21 +10:30
Trek H e9b4a04e0c Merge branch 'mjpeg-player-new' of https://bitbucket.org/ausocean/av into mjpeg-player-new 2020-01-02 11:39:21 +10:30
Trek H 372865132b mjpeg-player: fomatting and removed bootstrap. 2020-01-02 11:35:43 +10:30
Saxon 31902f2448 codec/mjpeg/jpeg.go: componenting consts for SOF0 and SOS headers 2020-01-02 11:30:51 +10:30
Saxon 323cc185dc codec/mjpeg/jpeg.go: defining consts for SOS header fields 2020-01-02 11:20:21 +10:30
Scott 322ebcfa81 Outputs variable uses the enums var type 2020-01-02 10:24:58 +10:30
Saxon 49138ce021 codec/mjpeg/jpeg.go: defining consts for SOF0 header fields 2020-01-01 19:15:32 +10:30
Saxon 3f4561da5b codec/mjpeg/jpeg.go: defining consts for JFIF header 2020-01-01 18:34:51 +10:30
Alan Noble e5f764a06e Merged master into mjpeg-player-new 2020-01-01 06:12:03 +00:00
Ella Pietraroia 29b9a9267a Merged in knn (pull request #316)
KNN filter

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2019-12-31 06:04:36 +00:00
Ella Pietraroia ab211be6eb filter/filters_circleci.go fix type to NoOp 2019-12-31 16:10:09 +10:30
Ella Pietraroia f06d9641c8 moving build !circleci 2019-12-31 15:40:47 +10:30
Ella Pietraroia 062b341e68 fixing merge problems 2019-12-31 15:39:09 +10:30
Ella Pietraroia 5d6899e346 Merge branch 'knn' of https://bitbucket.org/ausocean/av into knn 2019-12-31 15:36:17 +10:30
Scott 29443bd61f filter/mog.go: handles error from IMGDecode 2019-12-31 15:31:47 +10:30
Ella Pietraroia 8c32265ae3 error message for decoding image 2019-12-31 15:29:58 +10:30
Ella Pietraroia 40b5374856 fixing circleci build problem with knn filter 2019-12-31 15:22:57 +10:30
Ella Pietraroia 8ebfa0a7fb adding constants for the integer arguments 2019-12-31 15:21:34 +10:30