summaryrefslogtreecommitdiff
path: root/libavcodec/h264_sei.c
Commit message (Collapse)AuthorAge
* Merge commit '80ea66112817c719b476de8f7d8d3b325f4c7dd1'Hendrik Leppkes2015-08-02
|\ | | | | | | | | | | | | | | | | | | * 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-01
| | | | | | | | | | | | | | | | | | | | | | 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-17
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-17
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec: Add support for Closed Caption export in h264Kieran Kunhya2015-07-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: Greenmetadata SEI parsingNicolas DEROUINEAU2015-06-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '271ce76d317c5432e151216cf23f12b77ed6cb7e'Michael Niedermayer2015-06-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-30
| | | | | | | | | | | | 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-30
|\| | | | | | | | | | | | | | | | | | | * 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-30
| |
| * h264: prevent theoretical infinite loop in SEI parsingVittorio Giovara2014-08-01
| | | | | | | | | | | | | | 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-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_sei: ff_h264_decode_sei: dont try to parse trailing zeroesMichael Niedermayer2014-09-16
| | | | | | | | | | | | reduces noise for tserrors.ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09'Michael Niedermayer2014-07-10
|\| | | | | | | | | | | | | | | | | | | * 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-09
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/h264: in the absence of recovery points, be more tolerant on ↵Michael Niedermayer2014-06-04
| | | | | | | | | | | | | | accepting plain I frames Fixes: Ticket3652 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '066ad249843bde656265b59110c2521e2b1ce131'Michael Niedermayer2014-02-14
|\| | | | | | | | | | | | | * commit '066ad249843bde656265b59110c2521e2b1ce131': h264_sei: reorder headers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_sei: reorder headersVittorio Giovara2014-02-14
| | | | | | | | Also drop unused assert.h.
* | Merge commit '304e916a92bc17385a485bec2f957e192257ddb6'Michael Niedermayer2014-02-14
|\| | | | | | | | | | | | | * 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-14
| |
* | Merge commit '3d9fc21e593aa89b5877bd739268499b079052f2'Michael Niedermayer2013-12-17
|\| | | | | | | | | | | | | | | | | | | * 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-17
| | | | | | | | Directly set the fields when necessary.
* | Merge commit '5b10ef729f610fcbc9c485e7b643ce53268144cb'Michael Niedermayer2013-12-09
|\| | | | | | | | | | | | | | | | | | | | | * 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-09
| | | | | | | | stereo3d information
* | avcodec/h264_sei: make SEI type truncated message more informativeMichael Niedermayer2013-10-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a454dec19aa6666b555deec431bc42eda391d7b6'Michael Niedermayer2013-09-24
|\| | | | | | | | | | | | | | | * 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-24
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '26179964ff3fa1173e6f512c5735ba8223e2395d'Michael Niedermayer2013-09-24
|\| | | | | | | | | | | | | | | | | | | * 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-24
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '2a61592573d725956a4377641344afe263382648'Michael Niedermayer2013-08-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-20
| |
* | Merge commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0'Michael Niedermayer2013-08-03
|\| | | | | | | | | | | | | | | | | | | * 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-02
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-02
|\| | | | | | | | | | | | | | | | | | | * 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-01
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c'Michael Niedermayer2013-08-02
|\| | | | | | | | | | | | | | | * 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-01
| |
* | avcodec/h264_sei: Try to make code more robust by jumping to the specified ↵Michael Niedermayer2013-07-22
| | | | | | | | | | | | SEI ends Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ff_h264_decode_sei: use skip_bits_long()Michael Niedermayer2013-07-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ff_h264_decode_sei: Check SEI sizeMichael Niedermayer2013-07-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ff_h264_decode_sei: fix integer overflow with size.Michael Niedermayer2013-07-21
| | | | | | | | | | | | This issue is hypothetical and no testcase is available. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_sei/ff_h264_decode_sei: fix error codes for insufficient dataMichael Niedermayer2013-07-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: add frame packing as stereo_mode frame metadataJoakim Plate2013-07-21
| | | | | | | | | | | | | | This matches the matroska defintion of stereo_mode, with no metadata written if no info exist in sei Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264_sei/decode_picture_timing: do not depend on h->sps being setMichael Niedermayer2013-05-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: show recovery SEIs in debug outputMichael Niedermayer2013-03-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: deMpegEncContextize Conflicts: libavcodec/dxva2_h264.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_mb_template.c libavcodec/h264_parser.c libavcodec/h264_ps.c libavcodec/h264_refs.c libavcodec/h264_sei.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: deMpegEncContextizeAnton Khirnov2013-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the changes are just trivial are just trivial replacements of fields from MpegEncContext with equivalent fields in H264Context. Everything in h264* other than h264.c are those trivial changes. The nontrivial parts are: 1) extracting a simplified version of the frame management code from mpegvideo.c. We don't need last/next_picture anymore, since h264 uses its own more complex system already and those were set only to appease the mpegvideo parts. 2) some tables that need to be allocated/freed in appropriate places. 3) hwaccels -- mostly trivial replacements. for dxva, the draw_horiz_band() call is moved from ff_dxva2_common_end_frame() to per-codec end_frame() callbacks, because it's now different for h264 and MpegEncContext-based decoders. 4) svq3 -- it does not use h264 complex reference system, so I just added some very simplistic frame management instead and dropped the use of ff_h264_frame_start(). Because of this I also had to move some initialization code to svq3. Additional fixes for chroma format and bit depth changes by Janne Grunau <janne-libav@jannau.net> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | h264: add support for AFD detectionMarton Balint2012-10-21
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Kieran Kunhya <kierank@ob-encoder.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: fix x264 build detectionMichael Niedermayer2012-08-13
| | | | | | | | | | | | Fixes Ticket1503 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: some fields in SEIs are longer than 25 bits thus use get_bits_long()Michael Niedermayer2012-04-23
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 13:36:01 +0000