1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Aman Gupta b6eaa3928e avcodec/h264, videotoolbox: fix crash after VT decoder fails
The way videotoolbox hooks in as a hwaccel is pretty hacky. The VT decode
API is not invoked until end_frame(), so alloc_frame() returns a dummy
frame with a 1-byte buffer. When end_frame() is eventually called, the
dummy buffer is replaced with the actual decoded data from
VTDecompressionSessionDecodeFrame().

When the VT decoder fails, the frame returned to the h264 decoder from
alloc_frame() remains invalid and should not be used. Before
9747219958, it was accidentally being
returned all the way up to the API user. After that commit, the dummy
frame was unref'd so the user received an error.

However, since that commit, VT hwaccel failures started causing random
segfaults in the h264 decoder. This happened more often on iOS where the
VT implementation is more likely to throw errors on bitstream anomolies.
A recent report of this issue can be see in
http://ffmpeg.org/pipermail/libav-user/2016-November/009831.html

The issue here is that the dummy frame is still referenced internally by the
h264 decoder, as part of the reflist and cur_pic_ptr. Deallocating the
frame causes assertions like this one to trip later on during decoding:

  Assertion h->cur_pic_ptr->f->buf[0] failed at src/libavcodec/h264_slice.c:1340

With this commit, we leave the dummy 1-byte frame intact, but avoid returning it
to the user.

This reverts commit 9747219958.

Signed-off-by: wm4 <nfxjfg@googlemail.com>
2017-03-07 11:58:38 +01:00
compat compat/cuda: fix ulong size on cygwin 2017-03-01 12:08:34 +01:00
doc doc/encoders: mention valid values for compression_level when using FLAC encoder 2017-03-03 13:49:26 -03:00
libavcodec avcodec/h264, videotoolbox: fix crash after VT decoder fails 2017-03-07 11:58:38 +01:00
libavdevice avdevice/decklink_dec: remove AVFMT_RAWPICTURE 2017-02-26 22:47:33 +01:00
libavfilter avfilter/aeval: trim last frame's number of samples to match requested duration 2017-02-25 19:53:14 +01:00
libavformat avformat/flvdec: remove meaningless warning 2017-03-06 11:08:03 +01:00
libavresample Bump minor versions after 3.2 branchpoint to seperate release 2016-10-26 20:52:42 +02:00
libavutil avutil/md5: stop discarding the const qualifier for the src pointer 2017-03-03 13:37:11 -03:00
libpostproc Bump minor versions after 3.2 branchpoint to seperate release 2016-10-26 20:52:42 +02:00
libswresample lswr/rematrix: Remove an aggressive loop optimization. 2017-02-25 18:53:34 +01:00
libswscale swscale: add P016 input support 2017-02-01 14:29:11 -08:00
presets
tests ffmpeg: init filtergraphs only after we have a frame on each input 2017-03-03 08:45:43 +01:00
tools tools/target_dec_fuzzer: Fix misaligned read 2017-02-24 14:12:13 +01:00
.gitattributes fate: add SCC test 2017-01-27 17:06:42 +01:00
.gitignore Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1' 2016-06-26 15:43:05 +02:00
.travis.yml
arch.mak
Changelog avcodec: add ClearVideo decoder 2017-03-02 11:39:54 +01:00
cmdutils_common_opts.h cmdutils: add show_demuxers and show_muxers 2016-11-08 01:56:31 +01:00
cmdutils_opencl.c cmdutils_opencl: fix resource_leak cid 1396852 2017-01-13 07:54:49 +08:00
cmdutils.c cmdutils: remove duplicate windows.h include 2016-11-16 15:06:16 +01:00
cmdutils.h cmdutils: add show_demuxers and show_muxers 2016-11-08 01:56:31 +01:00
common.mak Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1' 2016-06-27 19:39:46 +02:00
configure lavfi: Add VAAPI deinterlacer 2017-02-23 22:08:26 +00:00
CONTRIBUTING.md Add CONTRIBUTING.md 2016-09-18 10:02:13 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_cuvid.c ffmpeg_cuvid: adapt for recent filter graph initialization changes 2017-03-03 08:45:43 +01:00
ffmpeg_dxva2.c Merge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28' 2016-06-26 15:34:01 +02:00
ffmpeg_filter.c ffmpeg: properly cleanup filter graph on init failure 2017-03-03 08:45:43 +01:00
ffmpeg_opt.c ffmpeg: init filtergraphs only after we have a frame on each input 2017-03-03 08:45:43 +01:00
ffmpeg_qsv.c ffmpeg: init filtergraphs only after we have a frame on each input 2017-03-03 08:45:43 +01:00
ffmpeg_vaapi.c ffmpeg_vaapi: Always set hwaccel_ctx, so it gets properly cleaned up on error 2017-02-05 15:13:15 +00:00
ffmpeg_vdpau.c Merge commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6' 2016-06-26 15:29:39 +02:00
ffmpeg_videotoolbox.c
ffmpeg.c ffmpeg: remove unnecessary hack for decoders which refuse to drain 2017-03-06 11:08:03 +01:00
ffmpeg.h ffmpeg: delay processing of subtitles before filters are initialized 2017-03-03 08:45:43 +01:00
ffplay.c ffplay: change keyboard volume control to logarithmic 2017-02-08 22:36:42 +01:00
ffprobe.c lavc: Add spherical packet side data API 2016-12-07 14:40:06 -05:00
ffserver_config.c ffserver_config: Check for failure to allocate FFServerIPAddressACL 2016-12-22 19:23:08 +01:00
ffserver_config.h ffsrever: Make the status page bitexact if any stream is bitexact 2016-11-29 19:26:26 +01:00
ffserver.c ffserver: local OOB write with custom program name 2017-01-08 03:50:56 +01:00
INSTALL.md
library.mak Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1' 2016-06-27 19:39:46 +02:00
LICENSE.md lavfi/f_ebur128: relicense to LGPL 2016-11-27 20:46:20 +01:00
MAINTAINERS MAINTAINERS: Add Rodger Combs to ffmpeg-security 2017-02-28 01:13:52 +01:00
Makefile Makefile: Clean compat/atomics/pthread subdirectory. 2017-03-01 13:43:03 +01:00
README.md Add CONTRIBUTING.md 2016-09-18 10:02:13 +01:00
RELEASE RELEASE: Update for past 3.2 branch 2016-10-26 20:52:43 +02:00
version.sh version.sh: Fix spurious rebuilds. 2016-03-10 09:53:10 +01:00

FFmpeg README

FFmpeg is a collection of libraries and tools to process multimedia content such as audio, video, subtitles and related metadata.

Libraries

  • libavcodec provides implementation of a wider range of codecs.
  • libavformat implements streaming protocols, container formats and basic I/O access.
  • libavutil includes hashers, decompressors and miscellaneous utility functions.
  • libavfilter provides a mean to alter decoded Audio and Video through chain of filters.
  • libavdevice provides an abstraction to access capture and playback devices.
  • libswresample implements audio mixing and resampling routines.
  • libswscale implements color conversion and scaling routines.

Tools

  • ffmpeg is a command line toolbox to manipulate, convert and stream multimedia content.
  • ffplay is a minimalistic multimedia player.
  • ffprobe is a simple analysis tool to inspect multimedia content.
  • ffserver is a multimedia streaming server for live broadcasts.
  • Additional small tools such as aviocat, ismindex and qt-faststart.

Documentation

The offline documentation is available in the doc/ directory.

The online documentation is available in the main website and in the wiki.

Examples

Coding examples are available in the doc/examples directory.

License

FFmpeg codebase is mainly LGPL-licensed with optional components licensed under GPL. Please refer to the LICENSE file for detailed information.

Contributing

Patches should be submitted to the ffmpeg-devel mailing list using git format-patch or git send-email. Github pull requests should be avoided because they are not part of our review process and will be ignored.