summaryrefslogtreecommitdiff
path: root/libavcodec/h264_sei.c
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | avcodec/h264_sei/ff_h264_decode_sei: fix error codes for insufficient dataMichael Niedermayer2013-07-211-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: add frame packing as stereo_mode frame metadataJoakim Plate2013-07-211-0/+86
| | | | | | | | | | | | | | 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-061-6/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: show recovery SEIs in debug outputMichael Niedermayer2013-03-121-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-161-65/+57
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-151-49/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-211-0/+41
| | | | | | | | | | | | 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-131-0/+2
| | | | | | | | | | | | 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-231-4/+4
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-061-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) cdxl demux: do not create packets with uninitialized data at EOF. Replace computations of remaining bits with calls to get_bits_left(). amrnb/amrwb: Remove get_bits usage. cosmetics: reindent avformat: do not require a pixel/sample format if there is no decoder avformat: do not fill-in audio packet duration in compute_pkt_fields() lavf: Use av_get_audio_frame_duration() in get_audio_frame_size() dca_parser: parse the sample rate and frame durations libspeexdec: do not set AVCodecContext.frame_size libopencore-amr: do not set AVCodecContext.frame_size alsdec: do not set AVCodecContext.frame_size siff: do not set AVCodecContext.frame_size amr demuxer: do not set AVCodecContext.frame_size. aiffdec: do not set AVCodecContext.frame_size mov: do not set AVCodecContext.frame_size ape: do not set AVCodecContext.frame_size. rdt: remove workaround for infinite loop with aac avformat: do not require frame_size in avformat_find_stream_info() for CELT avformat: do not require frame_size in avformat_find_stream_info() for MP1/2/3 avformat: do not require frame_size in avformat_find_stream_info() for AAC ... Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/avcodec.h libavcodec/h264.c libavcodec/h264_ps.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/dsputil_mmx.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace computations of remaining bits with calls to get_bits_left().Alex Converse2012-03-051-1/+1
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | h264_sei: Fix infinite loop.Michael Niedermayer2012-01-261-0/+4
| | | | | | | | | | | | | | Fixes not yet fixed parts of CVE-2011-3946. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: allow debuging SEI typesMichael Niedermayer2011-08-301-0/+3
|/ | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Ignore x264 build=0 as there is no such version, this restores previousMichael Niedermayer2010-03-211-1/+1
| | | | | | behavior approximately. Originally committed as revision 22628 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split SEI code off h264.c.Michael Niedermayer2010-01-121-0/+206
Originally committed as revision 21168 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status