summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_sei.c
Commit message (Collapse)AuthorAgeFilesLines
* avcodec: Use get_ue_golomb_long() when neededMark Harris2015-12-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | get_ue_golomb() cannot decode values larger than 8190 (the maximum value that can be golomb encoded in 25 bits) and produces the error "Invalid UE golomb code" if a larger value is encountered. Use get_ue_golomb_long() instead (which supports 63 bits, up to 4294967294) when valid h264/hevc values can exceed 8190. This updates decoding of the following values: (maximum) first_mb_in_slice 36863* for level 5.2 abs_diff_pic_num_minus1 131071 difference_of_pic_nums_minus1 131071 idr_pic_id 65535 recovery_frame_cnt 65535 frame_packing_arrangement_id 4294967294 frame_packing_arrangement_repetition_period 16384 display_orientation_repetition_period 16384 An alternative would be to modify get_ue_golomb() to handle encoded values of up to 49 bits as was done for get_se_golomb() in a92816c. In that case get_ue_golomb() could continue to be used for all of these except frame_packing_arrangement_id. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'b4a82e740743744136e07054525560351e4892ae'Hendrik Leppkes2015-11-021-6/+8
|\ | | | | | | | | | | | | * commit 'b4a82e740743744136e07054525560351e4892ae': h264: Print the complete user message Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * h264: Print the complete user messageVittorio Giovara2015-10-301-6/+8
| | | | | | | | | | | | | | Previously the message was cut off at 256th byte. This will allow dumping the complete x264 encode info when needed. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '8487987b87a252963b27b6adfd82887ea5933918'Hendrik Leppkes2015-11-021-1/+1
|\ \ | |/ | | | | | | | | | | * commit '8487987b87a252963b27b6adfd82887ea5933918': h264: Print user data SEI under normal debug verbosity Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * h264: Print user data SEI under normal debug verbosityVittorio Giovara2015-10-301-1/+1
| | | | | | | | | | | | Drop the need of setting -debug bugs since it's not a bug, and the message is already under a AV_LOG_DEBUG log level. Instead only print it when there is an actual string in it.
| * h264: Fix faulty call to avpriv_request_sampleLuca Barbato2015-08-221-1/+1
| | | | | | | | Broken in f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068
* | avcodec/h264_sei: Remove "Subtitles with data type 0x%02x" sample requestMichael Niedermayer2015-09-091-2/+0
| | | | | | | | Suggested-by: Carl and Hendrik
* | Merge commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068'Hendrik Leppkes2015-08-241-0/+6
|\ \ | |/ | | | | | | | | | | * commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068': h264: Discard currently unsupported registered sei Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * h264: Discard currently unsupported registered seiJohn Högberg2015-08-211-0/+6
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '80ea66112817c719b476de8f7d8d3b325f4c7dd1'Hendrik Leppkes2015-08-021-57/+76
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '80ea66112817c719b476de8f7d8d3b325f4c7dd1': avcodec: h264: Extract decoder methods Conflicts: libavcodec/h264_sei.c Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avcodec: h264: Extract decoder methodsDavid Holm2015-08-011-54/+70
| | | | | | | | | | | | | | | | | | | | | | Extract two methods from decode_registered_user_data in order to improve code readability. Also make the constant holding the allocation size a 64-bit unsigned integer so that the size comparison against INT_MAX makes sense. Bug-Id: CID1312090 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37'Michael Niedermayer2015-07-171-8/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37': h264: Add support for Closed Caption export Conflicts: libavcodec/h264.c libavcodec/h264_sei.c See: 8234f0e3b485811d60c228c40a94a141c46e61ca Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * h264: Add support for Closed Caption exportKieran Kunhya2015-07-171-1/+44
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec: Add support for Closed Caption export in h264Kieran Kunhya2015-07-061-2/+37
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: Greenmetadata SEI parsingNicolas DEROUINEAU2015-06-301-0/+63
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '271ce76d317c5432e151216cf23f12b77ed6cb7e'Michael Niedermayer2015-06-301-22/+30
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '271ce76d317c5432e151216cf23f12b77ed6cb7e': h264: Parse registered data SEI message and AFD value Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_sei.c libavcodec/version.h See: d6e95669496a89d186f923c34bcaf7d86b7cd59c See: 22291c372fa703242e8429bed61700ba81258f19 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Parse registered data SEI message and AFD valueVittorio Giovara2015-06-301-0/+49
| | | | | | | | | | | | Partially based on code by Marton Balint and Kieran Kunhya. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '0bfab80a0d9fce0180e8aa2a947267f89b725091'Michael Niedermayer2015-06-301-12/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '0bfab80a0d9fce0180e8aa2a947267f89b725091': h264_sei: Group error check outside the switch block Conflicts: libavcodec/h264_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_sei: Group error check outside the switch blockVittorio Giovara2015-06-301-12/+2
| |
| * h264: prevent theoretical infinite loop in SEI parsingVittorio Giovara2014-08-011-6/+12
| | | | | | | | | | | | | | Properly address CVE-2011-3946 and parse bitstream as described in the spec. CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* | avcodec: Add support for per-frame AFD output in h264Kieran Kunhya2015-06-261-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_sei: ff_h264_decode_sei: dont try to parse trailing zeroesMichael Niedermayer2014-09-161-1/+1
| | | | | | | | | | | | reduces noise for tserrors.ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09'Michael Niedermayer2014-07-101-0/+22
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09': h264: parse display orientation SEI message Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: parse display orientation SEI messageVittorio Giovara2014-07-091-0/+22
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/h264: in the absence of recovery points, be more tolerant on ↵Michael Niedermayer2014-06-041-0/+2
| | | | | | | | | | | | | | accepting plain I frames Fixes: Ticket3652 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '066ad249843bde656265b59110c2521e2b1ce131'Michael Niedermayer2014-02-141-4/+2
|\ \ | |/ | | | | | | | | | | * commit '066ad249843bde656265b59110c2521e2b1ce131': h264_sei: reorder headers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_sei: reorder headersVittorio Giovara2014-02-141-4/+2
| | | | | | | | Also drop unused assert.h.
* | Merge commit '304e916a92bc17385a485bec2f957e192257ddb6'Michael Niedermayer2014-02-141-1/+1
|\ \ | |/ | | | | | | | | | | * commit '304e916a92bc17385a485bec2f957e192257ddb6': h264_sei: name buffering period type consistently Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_sei: name buffering period type consistentlyVittorio Giovara2014-02-141-1/+1
| |
* | Merge commit '3d9fc21e593aa89b5877bd739268499b079052f2'Michael Niedermayer2013-12-171-21/+12
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '3d9fc21e593aa89b5877bd739268499b079052f2': h264: Refactor decode_frame_packing_arrangement Conflicts: libavcodec/h264_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Refactor decode_frame_packing_arrangementVittorio Giovara2013-12-171-16/+7
| | | | | | | | Directly set the fields when necessary.
* | Merge commit '5b10ef729f610fcbc9c485e7b643ce53268144cb'Michael Niedermayer2013-12-091-24/+35
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '5b10ef729f610fcbc9c485e7b643ce53268144cb': h264: parse frame packing arrangement SEI messages and save relevant stereo3d information Conflicts: libavcodec/h264.c libavcodec/h264_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: parse frame packing arrangement SEI messages and save relevant ↵Vittorio Giovara2013-12-091-0/+40
| | | | | | | | stereo3d information
* | avcodec/h264_sei: make SEI type truncated message more informativeMichael Niedermayer2013-10-031-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a454dec19aa6666b555deec431bc42eda391d7b6'Michael Niedermayer2013-09-241-1/+2
|\ \ | |/ | | | | | | | | | | | | * commit 'a454dec19aa6666b555deec431bc42eda391d7b6': pixdesc: fix NV20* descriptors h264_sei: check SEI size Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_sei: check SEI sizeMichael Niedermayer2013-09-241-0/+6
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '26179964ff3fa1173e6f512c5735ba8223e2395d'Michael Niedermayer2013-09-241-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '26179964ff3fa1173e6f512c5735ba8223e2395d': h264_sei: log unknown sei messages Conflicts: libavcodec/h264_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_sei: log unknown sei messagesVittorio Giovara2013-09-241-0/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '2a61592573d725956a4377641344afe263382648'Michael Niedermayer2013-08-211-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2a61592573d725956a4377641344afe263382648': avcodec: Remove some commented-out debug cruft Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_mvpred.h libavcodec/mjpegdec.c libavcodec/mjpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Remove some commented-out debug cruftDiego Biurrun2013-08-201-1/+0
| |
* | Merge commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0'Michael Niedermayer2013-08-031-11/+16
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0': h264_sei: Return meaningful values Conflicts: libavcodec/h264_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_sei: Return meaningful valuesVittorio Giovara2013-08-021-11/+16
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-021-67/+87
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: h264_sei: K&R formatting cosmetics Conflicts: libavcodec/h264_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_sei: K&R formatting cosmeticsVittorio Giovara2013-08-011-58/+78
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c'Michael Niedermayer2013-08-021-1/+1
|\ \ | |/ | | | | | | | | | | | | * commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c': h264_sei: Remove pointless old comment twinvq: Add proper twinvq prefixes to identifiers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_sei: Remove pointless old commentDiego Biurrun2013-08-011-1/+1
| |
* | avcodec/h264_sei: Try to make code more robust by jumping to the specified ↵Michael Niedermayer2013-07-221-3/+3
| | | | | | | | | | | | SEI ends Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ff_h264_decode_sei: use skip_bits_long()Michael Niedermayer2013-07-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ff_h264_decode_sei: Check SEI sizeMichael Niedermayer2013-07-211-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ff_h264_decode_sei: fix integer overflow with size.Michael Niedermayer2013-07-211-1/+2
| | | | | | | | | | | | This issue is hypothetical and no testcase is available. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud