summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_mp4toannexb_bsf.c
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/h264_mp4toannexb_bsf: implement a AVBSFContext.flush() callbackJames Almer2018-08-161-0/+10
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/h264_mp4toannexb_bsf: use enum constants for the NAL unit type valuesJames Almer2018-07-301-7/+8
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* h264_mp4toannexb_bsf: Fix start code size of parameter sets.Yusuke Nakamura2018-03-131-11/+11
| | | | | | Any parameter set shall have start code of at least 4 byte size. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'f3ed484953b81856e40239d2410058a96188b2be'Derek Buitenhuis2016-05-121-1/+10
|\ | | | | | | | | | | | | * commit 'f3ed484953b81856e40239d2410058a96188b2be': h264_mp4toannexb_bsf: do not fail on annex B extradata Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * h264_mp4toannexb_bsf: do not fail on annex B extradataAnton Khirnov2016-04-241-1/+10
| | | | | | | | | | Just pass through the bitstream as is. This is the same as what is done for HEVC already.
* | Merge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab'Derek Buitenhuis2016-04-171-113/+109
|\ \ | |/ | | | | | | | | | | | | | | * commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab': lavc: add a new bitstream filtering API Conversions-by: Hendrik Leppkes <h.leppkes@gmail.com> Conversions-by: Derek Buitenguis <derek.buitenhuis@gmail.com> Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: add a new bitstream filtering APIAnton Khirnov2016-03-201-63/+88
| | | | | | | | Deprecate the current bitstream filtering API.
* | h264_mp4toannexb: fix the pps offset when there are more than one sps in avcc赵宇龙2015-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | the pps offset is used to locate pps in the spspps_buf; however, the current calc method is wrong because it is the offset of the original avctx->extradata; when there is only one sps in the avcc; the value is correct by coincidence, however, it will fail in avcc with multi sps Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/h264_mp4toannexb_bsf: Use av_freep() to free spspps_bufMichael Niedermayer2015-10-101-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/h264_mp4toannexb_bsf: Reorder operations in nal_size checkMichael Niedermayer2015-08-211-1/+1
| | | | | | | | | | | | Fixes Ticket4778 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer2015-07-271-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: Consistently prefix input buffer definesVittorio Giovara2015-07-271-3/+3
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | libavcodec/h264_mp4toannexb_bsf.c: Optional argument "private_spspps_buf" to ↵Ivan Uskov2015-07-261-7/+34
| | | | | | | | | | | | avoid extradata modification. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/h264_mp4toannexb_bsf: reset the new IDR flag when SPS/PPS is seen.Benoit Fouet2014-10-051-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_mp4toannexb_bsf: use the given padding in ↵Benoit Fouet2014-09-301-1/+1
| | | | | | | | | | | | h264_extradata_to_annexb(). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_mp4toannexb_bsf: add a case when only SPS/PPS is in the stream.Benoit Fouet2014-09-301-9/+48
| | | | | | | | | | | | | | When only SPS or PPS is present in the stream, copy the missing one from AVCC before insertion to the output stream. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264_mp4toannexb_bsf: rename first_idr to new_idrBenoit Fouet2014-08-011-8/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264_mp4toannexb_bsf: always set idr_sps_pps_seen when SPS/PPS is seen.Benoit Fouet2014-08-011-1/+1
| | | | | | | | | | | | | | In order not to break a sequence like "SPS IDR SPS IDR", the boolean telling that the SPS/PPS has been seen should always be set. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264_mp4toannexb_bsf: account for consecutive IDR pictures.Benoit Fouet2014-07-311-0/+5
| | | | | | | | | | | | | | If there are consecutive IDR pictures, then SPS/PPS should be prepended to all of them, not only the first one. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_mp4toannexb_bsf: fix issue when sps/pps are already in the bistreamChris \"Koying\" Browet2014-07-271-3/+11
| |
* | avcodec/h264_mp4toannexb_bsf: prepend global headers before any in stream ↵Michael Niedermayer2014-03-261-1/+1
| | | | | | | | | | | | | | | | parameter sets Fixes h264_mp4toannexb_bsf_failure.mkv Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'Michael Niedermayer2013-12-091-12/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c': avcodec: Use av_reallocp where suitable Conflicts: libavcodec/bitstream.c libavcodec/eatgv.c libavcodec/flashsv.c libavcodec/libtheoraenc.c libavcodec/libvpxenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Use av_reallocp where suitableAlexandra Khirnova2013-12-091-12/+9
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec: use designated initializers for bitstream filtersPaul B Mahol2013-10-021-3/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc/h264_mp4toannexb: improve feedback in case of invalid bitstreamStefano Sabatini2013-07-171-3/+9
| |
* | Merge commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7'Michael Niedermayer2013-06-161-1/+1
|\ \ | |/ | | | | | | | | | | * commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7': h264_mp4toannexb_bsf: return a padded buffer Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_mp4toannexb_bsf: return a padded bufferLuca Barbato2013-06-151-1/+1
| | | | | | | | | | The code using the returned buffer might expect it to be FF_INPUT_BUFFER_PADDING_SIZE padded as any other avpacket.
* | Merge commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e'Michael Niedermayer2013-06-161-63/+71
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e': h264_mp4toannexb_bsf: factor out extradata parsing Conflicts: libavcodec/h264_mp4toannexb_bsf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_mp4toannexb_bsf: factor out extradata parsingLuca Barbato2013-06-151-68/+78
| |
* | Merge commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e'Michael Niedermayer2013-06-161-32/+41
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e': h264_mp4toannexb_bsf: K&R formatting cosmetics Conflicts: libavcodec/h264_mp4toannexb_bsf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_mp4toannexb_bsf: K&R formatting cosmeticsLuca Barbato2013-06-151-32/+41
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-161-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Don't include common.h from avutil.hMartin Storsjö2012-08-151-0/+3
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | h264_mp4toannexb_bsf: use i instead of misusing unit_type.Michael Niedermayer2012-03-211-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264_mp4toannexb_bsf: support 24bit lengthsgs_gail2012-03-211-8/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-291-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: aacenc: Fix LONG_START windowing. aacenc: Fix a bug where deinterleaved samples were stored in the wrong place. avplay: use the correct array size for stride. lavc: extend doxy for avcodec_alloc_context3(). APIchanges: mention avcodec_alloc_context()/2/3 avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS. aacsbr: ARM NEON optimised sbrdsp functions aacsbr: align some arrays aacsbr: move some simdable loops to function pointers cosmetics: Remove extra newlines at EOF Conflicts: libavcodec/utils.c libavfilter/formats.c libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Remove extra newlines at EOFAlex Converse2012-01-271-1/+0
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | h264_mp4toannexb_filter: pass error code through.Michael Niedermayer2011-12-291-5/+7
| | | | | | | | | | | | Bug-Found-by and Suggested bugfix: Tanami, Ohad Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Cleanup 'Fix spurious warning when stream has SPS and PPS units.'Michael Niedermayer2011-04-081-6/+2
|/ | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* h264_mp4toannexb_bsf: Fix spurious warning when stream has SPS and PPS units.Philip Langdale2011-03-151-1/+4
| | | | | Signed-off-by: Philip Langdale <philipl@overt.org> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* reindent.Ronald S. Bultje2011-03-071-3/+1
|
* h264_mp3toannexb_bsg: don't crash, but warn, if PPS/SPS not found.Sean McGovern2011-03-071-2/+17
| | | | | | | | | | Should an AVC-1 in MP4 stream not contain SPS or PPS NAL units, this BSF is then unable to allocate an output buffer for the modified stream. Warn that the resulting stream may be unplayable. Fix roundup issue #2386. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-261-1/+1
| | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
* Cosmetics: alignment and long line break.Benoit Fouet2010-06-101-5/+6
| | | | Originally committed as revision 23559 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: use and place braces correctly in if ... else statements.Benoit Fouet2010-06-101-7/+6
| | | | Originally committed as revision 23558 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Sanitize av_realloc() use in h264 mp4toannexb bistream filter.Benoit Fouet2010-06-101-8/+21
| | | | Originally committed as revision 23557 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Improve the mp4toannexb BSF to convert the extradata.Luca Abeni2010-06-091-17/+12
| | | | Originally committed as revision 23545 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check NAL unit size to avoid reading past the buffer.Thomas Devanneaux2010-05-101-1/+14
| | | | | | | | This fixes issue1907 Patch by Thomas Devanneaux gmail(thomdev) Originally committed as revision 23078 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a quick description to the H.264 BSFAlex Converse2009-05-131-0/+1
| | | | Originally committed as revision 18809 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud