Commit Graph

4063 Commits

Author SHA1 Message Date
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
Saxon 692325523c codec/mjpeg/jpeg.go: removed usage of putBuffer in parsePayload 2020-01-04 01:50:56 +10:30
Saxon 7ee8fa566c codec/mjpeg: removed byteStream type and its usage 2020-01-04 01:32:45 +10:30
Saxon f67fcd35e7 codec/mjpeg/jpeg.go: fixed conflicts 2020-01-03 19:41:23 +10:30
Saxon 20b52dc5f0 codec/mjpeg: added jpeg_test.go, tests.go and expected output, expect.mjpeg to test ParsePayload function in jpeg.go 2020-01-03 19:38:31 +10:30
Saxon d98da29596 codec/mjpeg/jpeg.go: removed 'mark' function 2020-01-03 19:38:30 +10:30
Saxon 210d368adb codec/mjpeg/jpeg.go: simplified if statement 2020-01-03 19:38:30 +10:30
Saxon c42d58ea85 codec/mjpeg/jpeg.go: componenting consts for SOF0 and SOS headers 2020-01-03 19:38:30 +10:30
Saxon ac23e126e3 codec/mjpeg/jpeg.go: defining consts for SOS header fields 2020-01-03 19:38:30 +10:30
Saxon 6bdfdb1f2a codec/mjpeg/jpeg.go: defining consts for SOF0 header fields 2020-01-03 19:38:30 +10:30
Saxon 1d0c10a402 codec/mjpeg/jpeg.go: defining consts for JFIF header 2020-01-03 19:38:30 +10:30
Saxon 6f8300fdfb codec/mjpeg/utils.go: added TODO in file header DESCRIPTION field to make stuff in this file exported in codecutil 2020-01-03 19:38:30 +10:30
Saxon 423a5c12c4 codec/mjpeg: renamed putBuffer.putBuf to putBytes 2020-01-03 19:38:30 +10:30
Saxon 4c04cc033a codec/mjpeg/jpeg.go: renamed fields of putBuffer struct 2020-01-03 19:38:30 +10:30
Saxon e8fd1a8661 codec/mjpeg/jpeg.go: made JFIF header label local const 2020-01-03 19:38:30 +10:30
Saxon 029a59fc78 codec/mjpeg/jpeg.go: improve Context struct field names 2020-01-03 19:38:30 +10:30
Saxon ef699451d5 codec/mjpeg: renamed Ctx type to Context and name value of this type ctx instead of c 2020-01-03 19:38:30 +10:30
Saxon 7c8ba0ae4b codec/mjpeg/utils.go: using BigEndian.Uint16 in get16 2020-01-03 17:15:06 +10:30
Saxon 657ed2f277 codec/mjpeg/jpeg.go: renamed ParseScan to ParsePayload, updated call and comment 2020-01-03 17:15:06 +10:30
Saxon d4deb5b641 codec/mjpeg/jpeg.go: Fixed comment for Ctx struct 2020-01-03 17:15:06 +10:30
Saxon db0e292507 codec/mjpeg/extract.go: simplified error message when can't get RTP payload 2020-01-03 17:15:06 +10:30
Saxon 341af70d81 codec/mjpeg/jpeg.go: fixed indentation on file header 2020-01-03 17:15:06 +10:30
Saxon 7587a15fbf codec/mjpeg/jpeg.go: fixed indentation in file header 2020-01-03 17:15:06 +10:30
Saxon e1e890d49e codec/mjpeg/extract.go: corrected comment for Extractor.dst field 2020-01-03 17:15:06 +10:30
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