Commit Graph

308 Commits

Author SHA1 Message Date
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 e467c7792d Fixed bugs, now working 2019-11-22 13:05:11 +10:30
Saxon bee8cd270c 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.
2019-11-20 13:40:07 +10:30
Saxon eaac50f339 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.
2019-11-16 23:12:08 +10:30
Saxon a63cf5a1b7 codec/mjpeg/jpeg.go: added writeHuffman function to write JPEG huffman tables to an io.Writer. 2019-11-15 16:25:35 +10:30
Saxon 7577cfa0c4 codec/mjpeg/jpeg.go: added putMarker function to write JPEG marker codes to an io.Writer 2019-11-15 15:41:02 +10:30
Saxon f5b6af559f codec/mjpeg: added jpeg.go file to hold JPEG specific stuff and added some JPEG marker codes. 2019-11-15 15:11:53 +10:30
Trek H cd63d0d95a alsa: unexported ringbuffer chunksize
Chunksize can be calculated without needing an ALSA device instance.

Added a DataSize function to pcm package for calculating size of pcm data given relevant attributes.

Removed ChunkSize from config revid config struct.

Changed NewByteLexer to accept an in rather than a pointer.
2019-11-13 19:56:13 +10:30
Trek H 796a3b9a97 pcm: changed term clip to buffer 2019-11-13 16:54:41 +10:30
Trek H 3a7c2c5c5e pcm: removed unused sample formats 2019-11-13 14:00:52 +10:30
Trek H 678245c634 pcm: fix string format 2019-11-13 12:30:48 +10:30
Trek H 5e472ba4c9 pcm: refactored to be general not alsa only
Addition of new structs and helper functions for passing around pcm clips/buffers and their formats so that we don't have to import and rely on yobert/alsa code.

Updated any commands and alsa package to use refactored code.
2019-11-12 21:24:08 +10:30
Saxon 47f6dcfe51 codec/h264/extract.go: extracter->extractor everywhere 2019-10-28 08:41:49 +10:30
Saxon Milton 392ed399d9 Merged in use-gvctrl-in-revid (pull request #266)
Use gvctrl in revid

Approved-by: Alan Noble <anoble@gmail.com>
2019-10-25 01:27:05 +00:00
Saxon 529ca0d547 codec/h264/extract.go: simplified switch 2019-10-23 14:38:18 +10:30
Saxon 38cfad7b67 revid: fixing some more bugs
Fixed H264 RTP extractor. Fine tuned some timing regarding geovision setup. Added some more
logging to geovision setup.
2019-10-23 12:48:22 +10:30
Saxon f336a03d7a revid: general bug fixing
Use http instead of https in gvctrl getLogin request. Gave RTP client a close method so that the conn can
be closed after we're done with the client. Put timeout on reading from the RTP client PacketConn so that
we don't hang on the ReadFrom call if the conn is closed. Closing the RTSP and RTP clients when
startRTSPCamera is returned.
2019-10-22 23:04:33 +10:30
Saxon Milton 38eed6bb2d Merged in fix-mjpeg-lex (pull request #261)
codec/mjpeg/lex.go: returning nil error from Lex if we get io.EOF on reading bytes

Approved-by: Alan Noble <anoble@gmail.com>
2019-10-20 02:24:45 +00:00
Saxon 7181532ccb codec/mjpeg/lex.go changed error checks for io.EOF to positive checks 2019-10-20 09:08:19 +10:30
Saxon 9087f727db codec/h264/extract_test.go: fixed testing for extractor 2019-10-07 16:12:30 +10:30
Saxon fc4e88bce6 fixed bugs causing problems with GeoVision H264 RTMP to youtube streaming.
Two fixes were involved, firstly, access unit delimeters were used to denote access units and the Write timeout on rtmpSender's ringBuffer was
increased to stop the 'unable to dump old write' errors. Also made some small changes elsewhere that should fix future issues, particular with
MTS output.
2019-10-07 14:18:20 +10:30
Saxon 1c9146eec0 codec/mjpeg/lex.go: returning nil error from Lex if we get io.EOF on reading bytes 2019-10-03 00:32:34 +09:30
Saxon 2d5d8f3bdd codec/codecutil/helpers.go: added ADPCM support to SIDToMIMEType 2019-10-01 21:01:45 +09:30
Saxon 2acc729676 codec/codecutil/helpers.go: added helpers.go file with SIDToMIMEType function to provide MIME type given a stream ID 2019-10-01 21:01:45 +09:30
Saxon Milton f8f78947f9 Merged in picture-order-count (pull request #249)
codec/h264/h264dec/decode.go: decoding process for picture order count

Approved-by: Alan Noble <anoble@gmail.com>
2019-09-20 02:37:33 +00:00
Saxon Milton 1fba7556dd Merged in total-coeff-and-trailing-ones (pull request #243)
codec/h264/h264dec: parsing process for TotalCoeff and TrailingOnes

Approved-by: Alan Noble <anoble@gmail.com>
2019-09-20 00:38:58 +00:00
Saxon 4c7f36ee36 codec/h264/h264dec/decode.go: slightly simplified if-else statements regarding BottomField and FieldPic 2019-09-18 19:41:32 +09:30
Saxon 117a75ae55 codec/h264/h264dec: simplified logic where there are things applicable to non-IDRs, which we don't handle yet. 2019-09-16 22:07:57 +09:30
Saxon 89452d55d3 codec/h264/h264dec/cavlc.go: simplified logic in loop to count leading zeros in formCoeffTokenMap 2019-09-13 11:21:00 +09:30
Trek H 2c7e28206d Merge branch 'master' into adpcm-mts 2019-09-12 21:11:50 +09:30
Trek H 96035f6d8b adpcm and mts: comments and pid change 2019-09-12 19:16:11 +09:30
Saxon ecdaab175b codec/h264/parse.go: skip over access unit delimiters when getting nalType 2019-09-11 09:47:37 +09:30
Saxon 5939db6f1b codec/h264/h264dec/decode.go: using if else structures for topFieldOrderCnt/bottomFieldOrderCnt value derivations in decodePicOrderCntType2 2019-09-10 12:12:08 +09:30
Saxon 40fa50d4f0 codec/h264/h264dec/decode.go: using if else structure for derivation of topFieldOrderCnt and bottomFieldOrderCnt in decodePicOrderCntType1 function 2019-09-10 12:06:35 +09:30
Saxon 0df182018a codec/h264/h264dec/decode.go: using else if structure instead of switch to derive value of vid.picOrderCntMsb 2019-09-10 11:32:46 +09:30
Saxon 88857ec5b9 codec/h264/h264dec/cavlc.go: fixed error message that's returned on failure to read coeffTokenTable string 2019-09-10 11:22:25 +09:30
Saxon 445649311b codec/h264/h264dec/cavlc.go: added process to comgine level and run information 2019-09-09 17:05:22 +09:30
Saxon 05e16ec260 codec/h264/h2646dec/cavlc.go: fixed build error caused by rebase 2019-09-09 16:48:10 +09:30
Saxon d78ca2d2d2 codec/h264/h264dec/cavlctab.go: commented const string representation of table 9-5. 2019-09-09 16:41:26 +09:30
Saxon 42a1918c0d codec/h264/h264dec: using const string instead of CSV file to hold table 9-5. Also made some other minor improvements 2019-09-09 16:41:26 +09:30
Saxon 92eb3e85a5 codec/h264/h264dec: created tokenMap type to make things more readable 2019-09-09 16:41:26 +09:30
Saxon 8316a621b9 codec/h264/h264dec/cavlc.go: fix comment inside parseTotalCoeffAndTrailingOnes 2019-09-09 16:41:26 +09:30
Saxon 4aa71e901c codec/h264/h264dec: put function parameters on one line for parseTotalCoeffAndTrailingOnes 2019-09-09 16:41:26 +09:30
Saxon 61a5065556 codec/h264/h264dec: added functions to get TrailingOnes and TotalCoeff as well as testing
The functions firstly derive the value of nC and then read the value of coeff_token from the BitReader. The table read prior and loaded into
a 'map' is then used to get the corresponding values of TrailingOnes and TotalCoef.
2019-09-09 16:41:26 +09:30
Saxon ee9281925e codec/h264/h264dec: added functions for loading table 9-5 CSV into [nColumns]map[int]map[int][2]int with testing 2019-09-09 16:41:26 +09:30
Saxon e614633cbd codec/h264/h264dec: added CSV representation of table 9-5 from H.264 specifications 2019-09-09 16:40:42 +09:30
Saxon 245edafa68 codec/h264/h264dec: added binToInt function and test
This function will convert binary provided as a string and return as int.
2019-09-09 16:40:42 +09:30
Saxon Milton 614f42ec2c Merged in level-information (pull request #245)
codec/h264/h264dec: add function for parsing level information using process in section 9.2.2 of specifications

Approved-by: Alan Noble <anoble@gmail.com>
2019-09-09 06:56:59 +00:00
Saxon 31179205b9 codec/h264/264dec/decode.go: added decodePicOrderCnt to return topFieldOrderCnt and bottomFieldOrderCnt based on picOrderCntType
Also added placeholder for a general 'decode' function.
2019-09-09 16:18:39 +09:30
Saxon c0be9b1910 codec/h264/h264dec/decode.go: added picOrderCntType2 to derive topfieldOrderCnt and bottomFieldOrderCnt for when picOrderCntType == 2 2019-09-09 13:26:46 +09:30
Saxon 43118814fb codec/h264/h264dec/decode.go: added picOrderCntType1 to derive topfieldOrderCnt and bottomFieldOrderCnt for when picOrderCntType == 1 2019-09-09 13:03:11 +09:30
Saxon d92e0bfb5e codec/h264/h264dec/decode.go: wrote function picOrderCntType0 to handle derivation of TopFieldOrderCnt and BottomFieldOrderCnt when pic_order_cnt_type == 0 2019-09-09 11:59:41 +09:30
Saxon fbb98095a0 codec/h264/h264dec: embedded SliceHeader and SliceData into Slice type, and embedded SPS and PPS into VideoStream type 2019-09-09 11:08:48 +09:30
Saxon 46e7f9d303 codec/h264/h264dec/cavlc.go: simplified some logic regarding appending of values onto levelVal based on trailing_ones_sign_flag 2019-09-09 09:11:50 +09:30
Saxon 1eb1d10ac4 codec/h264/h2646dec: added decode.go file to hold slice decoding functionality 2019-09-08 14:09:08 +09:30
Saxon 960d41cb4f codec/h264/h264dec/cavlc.go: removed redundant if checks in parseLevelInformation 2019-09-08 13:31:10 +09:30
Saxon ce803ba488 codec/h264/h264dec: add function for parsing level information using process in section 9.2.2 of specifications 2019-09-06 17:45:23 +09:30
Trek Hopton f537da41f2 Merged in adpcm-chunks (pull request #237)
Added adpcm chunk length and ability to decode consecutive chunks

Approved-by: kortschak <dan@kortschak.io>
2019-08-28 03:30:02 +00:00
Saxon 838d5dd5d6 codec/h264/h264dec: added level_prefix parsing process and test 2019-08-28 10:09:27 +09:30
Saxon Milton 7f3f1a43f9 Merged in refresh-period (pull request #240)
revid: now have MinPeriod and ClipDuration params

Approved-by: Alan Noble <anoble@gmail.com>
2019-08-28 00:06:03 +00:00
Saxon 132059d26e codec/h264/h264dec/cabac.go: added binarization process for coded block pattern 2019-08-26 16:35:06 +09:30
Saxon d4fe1498f5 codec/h264/h264dec: moved CABAC encoding related stuff to cabacenc.go and cabacenc_test.go and corrected function names 2019-08-26 16:01:48 +09:30
Saxon b9cd6b3f13 container/mts/encoder.go: using NALTypeSPS from h264dec package 2019-08-26 09:24:18 +09:30
Saxon 817cc86a34 revid: now have MinPeriod and ClipDuration params
This change included a rename of IntraRefreshPeriod to MinPeriod, and the addition of the ClipDuration param. PSI are now written before IDR. Clips are no longer outputed
based on PSI but rather a time ClipDuration, where ClipDuration >= MinPeriod, however, PSI must still be at the beginning of each clip. Also created functionality to update
meta time even if we don't have a response to update.
2019-08-25 20:42:01 +09:30
Trek H 4e48a7aa09 adpcm: updated test file names 2019-08-21 16:20:11 +09:30
Trek H 4b8864ff20 adpcm: better decoding of chunks
added chunk length to chunk header
added to decoder the ability to decode consecutive chunks of variable length.
2019-08-21 15:39:58 +09:30
Saxon Milton 7ab8fd9e87 Merged in nalunit-test (pull request #224)
codec/h264/h264dec: added NAL unit parsing tests

Approved-by: Alan Noble <anoble@gmail.com>
2019-08-20 03:23:17 +00:00
Saxon Milton 13490e0145 Merged in slice-testing (pull request #225)
codec/h264/h264dec: added some testing for parsing found in slice.go

Approved-by: Alan Noble <anoble@gmail.com>
2019-08-20 02:53:00 +00:00
Saxon 0f35786d06 codec/h264/h264dec/slice_test.go: added license information to file header 2019-08-20 12:06:11 +09:30
Saxon bdcd340802 codec/h264/h264dec/slice_test.go: removed redundant comment 2019-08-20 12:02:39 +09:30
Saxon 27d8d0992c codec/h264/h264dec/slice.go: made corrections to file header 2019-08-20 11:56:42 +09:30
Saxon dab94f6ae2 codec/h264/h264dec: addressing PR feedback.
Updated comment. Put a space between file header and package declaration. Not dereferencing things
2019-08-20 11:39:12 +09:30
Saxon Milton e7f36162b1 codec/h264/h264dec/cabac_test.go: fixed indentation of Shawn's name in file header 2019-08-19 23:43:28 +00:00
Saxon Milton 2735f99f9c codec/h264/h264dec/cabac.go: fixed indentation of Shawn's name in file header 2019-08-19 23:41:56 +00:00
Saxon 657d62a10b codec/h2646/h264dec: added file headers for cabac.go and cabac_test.go 2019-08-20 09:07:55 +09:30
Saxon 9691b1346c codec/h264/h264dec: removed comment for unexported error message and bettered text 2019-08-20 08:59:18 +09:30
Saxon 04fef9ce1d codec/h264/h264dec: added fixedLenBinarization and testing 2019-08-20 08:58:16 +09:30
Saxon 1a5f07305d codec/h264/h2646dec/cabac.go: runcated=>truncated in truncUnaryBinarization comment 2019-08-20 08:04:17 +09:30
Saxon 4a2c3487c7 codec/h264/h264dec: got rid of unneeded closure and renamed suffix to s 2019-08-20 07:53:31 +09:30
Saxon 08d3f6c3d1 codec/h264/h264dec: made absi faster and more readable 2019-08-20 07:53:31 +09:30
Saxon a7abd76113 codec/h264/h264dec: made mini faster and more readable 2019-08-20 07:53:31 +09:30
Saxon 4e29a70b78 codec/h264/h264dec: made maxi faster and more readable 2019-08-20 07:53:31 +09:30
Saxon a4130404fd codec/h264/h264dec: added truncUnaryBinarization and unaryExpGolombBinarization functions both with testing 2019-08-20 07:53:30 +09:30
Saxon 336aa73107 codec/h264/h264dec: wrote UnaryBinarization function and TestUnaryBinarization 2019-08-20 07:53:30 +09:30
Saxon 806264cd42 codec/h264/h264dec/slice.go: added comment to slice type consts to reference specifications 2019-08-19 16:24:53 +09:30
Saxon 6d06fab39f codec/h264/h264dec: added subMbTypeBinarization and TestSubMbTypeBinarization 2019-08-15 00:31:48 +09:30
Saxon cd83cf9e8e codec/h264/h2646dec: fixed up binarization tables and added mbTypeBinarization function along with test TestMbTypeBinarization. 2019-08-15 00:31:12 +09:30
Saxon ba6ecc2902 codec/h264/h264dec: added tables from reference implementation which are adapted tables from tables 9-12 to 9-33 of specifications for use in CABC initialisation 2019-08-06 14:21:52 +09:30
Saxon 150492a5bd codec/h264/h264dec: merged in master and fixed resultant problems 2019-08-05 14:41:26 +09:30
Saxon 2473b9ee0a codec/h264/h264dec: fixed some bugs found by testing 2019-08-05 13:59:08 +09:30
Saxon Milton 401f75a712 Merged in vui-hrd-parameters-types (pull request #217)
codec/h264/h264dec: separated VUI and HRD from SPS struct
2019-08-05 04:18:59 +00:00
Saxon 951d9dd244 codec/h264/h264dec: merged in master, fixed conflicts and problems that that resulted 2019-08-05 13:46:02 +09:30
Saxon 95a5ce0ac0 codec/h264/h264dec: wrote TestDecRefPicMarking and fixed bugs 2019-08-05 10:40:20 +09:30
Saxon c2ac8cff24 codec/h264/h264dec: added TestNewPredWeightTable 2019-08-05 01:17:19 +09:30
Saxon b6eb39f4e0 codec/h264/h264dec: started added TestNewPredWeightTable 2019-08-05 00:18:15 +09:30
Saxon 34ce81370d codec/h264/h264dec: added file headers to slice.go and slice_test.go 2019-08-04 13:45:28 +09:30
Saxon 21603750aa codec/h264/h264dec/slice_test.go: added TestNewRefPicListModification with a single test 2019-08-04 13:40:53 +09:30
Saxon a94109e286 codec/h264/h264dec: fixed newRefPicListModification 2019-08-04 12:59:13 +09:30
Trek H 3f29f0c84e Merge branch 'master' into revid-audio 2019-08-02 23:32:21 +09:30
Trek H e63b51e24f codec-util: removed newticker helper 2019-08-02 23:26:15 +09:30