Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavcodec/h264_slice.c
AgeCommit message (Collapse)Author
2015-09-02avcodec/h264_slice: replace assert by normal error checkMichael Niedermayer
Fixes assertion failure Fixes: c6075771557e4f3b7b74e63d2d24fb01/signal_sigabrt_7ffff6ac8cc9_133_cov_2853689970_CREDITS.FST Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-19vaapi: define a unique pixel format for VA-API (AV_PIX_FMT_VAAPI).Gwenole Beauchesne
Deprecate older VA pixel formats (MOCO, IDCT) as it is now very unlikely to ever be useful in the future. Only keep plain AV_PIX_FMT_VAAPI format that is aliased to the older VLD variant. This is an API change. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
2015-08-18lavc: put remaining bits of vdpau-in-decoder under FF_API_CAP_VDPAU.Ronald S. Bultje
2015-08-06lavc: propagate hwaccel errorswm4
At least the new videotoolbox decoder does not actually set a frame if end_frame fails. This causes the API to return success and signals that a picture was decoded, even though AVFrame->data[0] is NULL. Fix this by propagating end_frame errors.
2015-08-03avcodec: add new Videotoolbox hwaccel.Sebastien Zwickert
2015-07-28avcodec/h264_slice: Also check sei_recovery_frame_cnt for skip_frame nokeyMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-28avcodec/h264_slice: do not skip 2nd field if first was not skippedMichael Niedermayer
Found-by: John Högberg <john.hogberg@ericsson.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer
* commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: AV-prefix all codec flagsVittorio Giovara
Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-08avcodec/h264_slice: Fix container croppingMichael Niedermayer
Fixes out of array read Fixes: asan_heap-oob_394322e_138_cov_4265020547_CVPCMNL1_SVA_C.264 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-30Merge commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a'Michael Niedermayer
* commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a': h264: Allow stream and container cropping at the same time Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-30h264: Allow stream and container cropping at the same timeVittorio Giovara
The container cropping is applied only when difference is within 16 pixels, and the smallest value between the two is chosen. Bug-Id: 383 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-06-30avcodec/h264_slice: Use w/h from the AVFrame instead of mb_w/hMichael Niedermayer
Fixes out of array access Fixes: asan_heap-oob_4d5bb0_682_cov_3124593265_Fraunhofer__a_driving_force_in_innovation__small.mp4 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-28avcodec/h264_slice: Reformat IN_RANGE() uses to be readableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-28avcodec/h264_slice: Silence pointer type warningsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-28avcodec/h264_slice: assert that the first slice implies unfinished setupMichael Niedermayer
If this assert fails there is very likely a bug in the code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-27Merge commit '5ec0bdf2c524224f30ba4786f47324970aed4aaa'Michael Niedermayer
* commit '5ec0bdf2c524224f30ba4786f47324970aed4aaa': h264: do not update the context fields copied between threads after finish_setup() Conflicts: libavcodec/h264.h libavcodec/h264_slice.c See: f111831ed61103f9fa8fdda41473a23da016bdaa and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-27Merge commit 'e49e0f58e273237f83b4486f3536931ed1943d18'Michael Niedermayer
* commit 'e49e0f58e273237f83b4486f3536931ed1943d18': h264: make sure the slices do not overlap during slice threading Conflicts: libavcodec/h264.h libavcodec/h264_slice.c See: 43b434210e597d484aef57c4139c3126d22b7e2b Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-27h264: do not update the context fields copied between threads after ↵Anton Khirnov
finish_setup() Should fix a large number of possible races with frame threading.
2015-06-27h264: make sure the slices do not overlap during slice threadingAnton Khirnov
Based on a patch by Michael Niedermayer <michaelni@gmx.at>. CC: libav-stable@libav.org Found-by: Kieran Kunhya <kierank@obe.tv>
2015-06-15h264: er: Copy from the previous reference only if compatibleAndreas Cadhalpun
Also use the frame pixel format instead of the one from the codec context, which is more robust. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-06-15h264: er: Copy from the previous reference only if compatibleAndreas Cadhalpun
Also use the frame pixel format instead of the one from the codec context, which is more robust. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-06-12h264: update avctx width/height/pix_fmt when returning frameAndreas Cadhalpun
Inconsistencies between the dimensions/pixel format of avctx and the frame can confuse API users. For example this can crash the demuxing_decoding example. Back up the previous values and restore them, when decoding the next frame. This is necessary, because these can be different between the returned frame and the last decoded frame. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-06-10avcodec/h264_slice: Use AVFrame diemensions for grayscale handlingMichael Niedermayer
The AVFrame values are closer to the AVFrame bitmap changed instead of the AVCodecContext values, so this should be more robust Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-01h264: Fix HWACCEL_MAX for D3D11Michael Niedermayer
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-30Merge commit '0181ae9af2de1526464d23209b82e6674d362f5d'Michael Niedermayer
* commit '0181ae9af2de1526464d23209b82e6674d362f5d': h264: Make sure reinit failures mark the context as not initialized Conflicts: libavcodec/h264_slice.c See: e8714f6f93d1a32f4e4655209960afcf4c185214 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-30h264: Make sure reinit failures mark the context as not initializedLuca Barbato
Bug-Id: CVE-2015-3417 CC: libav-stable@libav.org
2015-05-26avcodec/h264: Fix HWACCEL_MAX for D3D11Michael Niedermayer
Found-by: philipl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-25Merge commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772'Michael Niedermayer
* commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772': D3D11va: add a Direct3D11 video decoder similar to DXVA2 Conflicts: Changelog configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/dxva2_vc1.c libavcodec/version.h libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-25D3D11va: add a Direct3D11 video decoder similar to DXVA2Steve Lhomme
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-15avcodec/h264_slice: Fix ranges in assertMichael Niedermayer
Fixes CID1297592, CID1297593 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29Merge commit 'a0f2946068c62e18cb05ac25c0df3d86077251a6'Michael Niedermayer
* commit 'a0f2946068c62e18cb05ac25c0df3d86077251a6': h264: use properly allocated AVFrames Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_refs.c libavcodec/h264_slice.c libavcodec/svq3.c libavcodec/vda_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29Merge commit '7a4f74eed51f914e9bbfebaffd4a92ac6791f819'Michael Niedermayer
* commit '7a4f74eed51f914e9bbfebaffd4a92ac6791f819': h264: embed the DPB in the context Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29avcodec/h264_slice: Also copy x264_build in ff_h264_update_thread_context()Michael Niedermayer
Fixes fate-h264-lossless Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29Merge commit '88c612e3a4d5b584e2d9f6e2541de78d67bdfb9f'Michael Niedermayer
* commit '88c612e3a4d5b584e2d9f6e2541de78d67bdfb9f': h264: merge the init and reinit paths in update_thread_context() Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29Merge commit '8a66fd40260b7aae6226d68c4dbad43b05a8e524'Michael Niedermayer
* commit '8a66fd40260b7aae6226d68c4dbad43b05a8e524': h264: drop the reinit parameter from init_slice_header() Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29Merge commit 'c9ccbc7333eddd025ebbde5cc4f27d68a950c623'Michael Niedermayer
* commit 'c9ccbc7333eddd025ebbde5cc4f27d68a950c623': h264: update the current bit depth/chroma type in init_slice_header() Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29Merge commit '29dcde2b87559b72957454a7e9bcd5227d8057ba'Michael Niedermayer
* commit '29dcde2b87559b72957454a7e9bcd5227d8057ba': h264: copy nal_length_size in update_thread_context Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29Merge commit '11f024ef0ab923ed8680fc35a087d576e549c849'Michael Niedermayer
* commit '11f024ef0ab923ed8680fc35a087d576e549c849': h264: move freeing the escaped RBSP buffer to free_context() Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29Merge commit 'ee62b364be0c30cba83b5ff10a3ca8c3e866ade6'Michael Niedermayer
* commit 'ee62b364be0c30cba83b5ff10a3ca8c3e866ade6': h264: eliminate ff_h264_set_parameter_from_sps() Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29Merge commit '54986d6db9116ef9704b1ce8414ffdb7f1ca127f'Michael Niedermayer
* commit '54986d6db9116ef9704b1ce8414ffdb7f1ca127f': h264: move context reinit lower down in update_thread_context() Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29Merge commit 'a6cd154463bea7eb56d28192db4c8c6d83f67fd7'Michael Niedermayer
* commit 'a6cd154463bea7eb56d28192db4c8c6d83f67fd7': h264: move the DPB init/uninit to init_context()/free_context() Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29Merge commit '9d33bab583a82cf12286c65258a29c6888e1ff98'Michael Niedermayer
* commit '9d33bab583a82cf12286c65258a29c6888e1ff98': h264: drop H264Context.ouputed_poc Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29Merge commit '27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3'Michael Niedermayer
* commit '27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3': h264: drop needs_realloc Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29h264: use properly allocated AVFramesAnton Khirnov
2015-04-29h264: merge the init and reinit paths in update_thread_context()Anton Khirnov
There is no real need to handle the init case specially, everything necessary is initialized in the reinit code as well.
2015-04-29h264: drop the reinit parameter from init_slice_header()Anton Khirnov
It is only used to decide whether to call free_tables(), but that function is safe to call on an uninitialized context as well.
2015-04-29h264: update the current bit depth/chroma type in init_slice_header()Anton Khirnov
With frame threading, it is currently only updated in the context where the change occurs, but not in any other contexts.
2015-04-29h264: copy nal_length_size in update_thread_contextAnton Khirnov
It does not make sense to copy is_avc without copying this as well. This patch should not change anything for now, but will have an effect in later commits.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 01:43:57 +0300