summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avcodec: do not use AVFrame accessorMuhammad Faiz2017-04-23
| | | | | Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* Merge commit '03a80925effc2698d21dc0b00290eecf42dd9e68'James Almer2017-04-22
|\ | | | | | | | | | | | | * commit '03a80925effc2698d21dc0b00290eecf42dd9e68': lavc: add a bitstream filter for splitting VP9 superframes Merged-by: James Almer <jamrial@gmail.com>
| * lavc: add a bitstream filter for splitting VP9 superframesAnton Khirnov2016-12-14
| | | | | | | | Partially based on code by Ronald S. Bultje <rsbultje@gmail.com>.
* | Merge commit '8fb4210ad8785c01fccf2fc59af6a6fa2892b6b2'James Almer2017-04-22
|\| | | | | | | | | | | | | * commit '8fb4210ad8785c01fccf2fc59af6a6fa2892b6b2': qsvdec_h2645: switch to the new generic filtering mechanism Merged-by: James Almer <jamrial@gmail.com>
| * qsvdec_h2645: switch to the new generic filtering mechanismAnton Khirnov2016-12-14
| | | | | | | | Drop the internal manual conversion from the MP4 format to Annex B.
* | Merge commit '972c71e9cb63e24f57ee481e413199c7d88a8813'James Almer2017-04-22
|\| | | | | | | | | | | | | * commit '972c71e9cb63e24f57ee481e413199c7d88a8813': lavc: add support for filtering packets before decoding Merged-by: James Almer <jamrial@gmail.com>
| * lavc: add support for filtering packets before decodingAnton Khirnov2016-12-14
| |
* | avcodec/bsf: Check for packet payload when setting BSF EOF flag.Jan Sebechlebsky2017-04-22
| | | | | | | | | | | | | | | | Set BSF EOF flag only if pkt == NULL or both data and side data are not present in packet. Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | Revert "avcodec/bsf: Forbid packet without payload in av_bsf_send_packet"James Almer2017-04-22
| | | | | | | | | | | | | | | | | | This reverts commit bfdca87ab55c7f69087d962dc47aa45c8c6436fb. Packets with no data or side data will be valid EOF signal in an upcoming merge. Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/crystalhd: Adapt to new new decode APIPhilip Langdale2017-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The new new decode API requires the decoder to ask for the next input packet, and it cannot just return EAGAIN if that packet cannot be processed yet. This means we must finally confront how we get this decoder to block when the input buffer is full and no output frames are ready yet. In the end, that isn't too hard to achieve - the main trick seems to be that you have to aggressively poll the hardware - it doesn't seem to make any forward progress if you sleep. Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '061a0c14bb5767bca72e3a7227ca400de439ba09'James Almer2017-04-22
|\| | | | | | | | | | | | | | | | | * commit '061a0c14bb5767bca72e3a7227ca400de439ba09': decode: restructure the core decoding code CUVID decoder adapted by wm4. Merged-by: James Almer <jamrial@gmail.com>
| * decode: restructure the core decoding codeAnton Khirnov2016-12-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the new decoding API is pretty much just a wrapper around the old deprecated one. This is problematic, since it interferes with making full use of the flexibility added by the new API. The old API should also be removed at some future point. Reorganize the code so that the new send_packet/receive_frame functions call the actual decoding directly and change the old deprecated avcodec_decode_* functions into wrappers around the new API. The new internal API for decoders is now changing as well. Before this commit, it mirrors the public API, so the decoders need to implement send_packet() and receive_frame() callbacks. This turns out to require awkward constructs in both the decoders and the generic code. After this commit, the decoders only implement the receive_frame() callback and call a new internal function, ff_decode_get_packet() to obtain input data, in the same manner to how the bitstream filters now work. avcodec will now always make a reference to the input packet, which means that non-refcounted input packets will be copied. Keeping the previous behaviour, where this copy could sometimes be avoided, would make the code significantly more complex and fragile for only dubious gains, since packets are typically small and everyone who cares about performance should use refcounted packets anyway.
* | Merge commit '549d0bdca53af7a6e0c612ab4b03baecf3a5878f'James Almer2017-04-22
|\| | | | | | | | | | | | | | | | | | | * commit '549d0bdca53af7a6e0c612ab4b03baecf3a5878f': decode: be more explicit about storing the last packet properties Also copy pkt->size in extract_packet_props(), as it's needed for AVFrame.pkt_size Merged-by: James Almer <jamrial@gmail.com>
| * decode: be more explicit about storing the last packet propertiesAnton Khirnov2016-12-14
| | | | | | | | | | | | | | | | | | | | | | The current code stores a pointer to the packet passed to the decoder, which is then used during get_buffer() for timestamps and side data passthrough. However, since this is a pointer to user data which we do not own, storing it is potentially dangerous. It is also ill defined for the new decoding API with split input/output. Fix this problem by making an explicit internally owned copy of the packet properties.
* | libavutil/thread.h: Fixed g++ build error when ASSERT_LEVEL is greater than 1Aaron Levinson2017-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Purpose: libavutil/thread.h: Fixed g++ build error when ASSERT_LEVEL is greater than 1. This is only relevant when thread.h is included by C++ files. In this case, the relevant code is only defined if HAVE_PTHREADS is defined as 1. Use configure --assert-level=2 to do so. Note: Issue discovered as a result of Coverity build failure. Cause of build failure pinpointed by Hendrik Leppkes. Comments: -- libavutil/thread.h: Altered ASSERT_PTHREAD_NORET definition such that it uses av_make_error_string instead of av_err2str(). av_err2str() uses a "parenthesized type followed by an initializer list", which is apparently not valid C++. This issue started occurring because thread.h is now included by the DeckLink C++ files. The alteration does the equivalent of what av_err2str() does, but instead declares the character buffer as a local variable. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffmpeg; check return code of avcodec_send_frame when flushing encodersMarton Balint2017-04-22
| | | | | | | | | | | | Fixes Coverity CID 1404841. Signed-off-by: Marton Balint <cus@passwd.hu>
* | avcodec/h264_cavlc: Fix undefined behavior on qscale overflowMichael Niedermayer2017-04-22
| | | | | | | | | | | | | | Fixes: 1214/clusterfuzz-testcase-minimized-6130606599569408 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/interlace: change lowpass_line function prototypeThomas Mundt2017-04-22
| | | | | | | | | | Signed-off-by: Thomas Mundt <tmundt75@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/avf_avectorscope: Assert that format is validMichael Niedermayer2017-04-22
| | | | | | | | | | | | | | This should help coverity realize that src[] is inited Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter: add doubleweave filterPaul B Mahol2017-04-22
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/utvideodec: fix gradient prediction when stride does not match widthPaul B Mahol2017-04-21
| | | | | | | | | | | | Fixes #6340. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/utvideodec: fix decoding odd sizes with interlaced video with some ↵Paul B Mahol2017-04-21
| | | | | | | | | | | | | | | | formats Fixes #6316. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | doc/filters: deflicker size option value is in framesLou Logan2017-04-20
| | | | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Paul B Mahol <onemda@gmail.com> (in #ffmpeg-devel IRC)
* | avfilter: add deflicker filterPaul B Mahol2017-04-20
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/webmdashenc: Validate the 'streams' adaptation sets parameterDerek Buitenhuis2017-04-20
| | | | | | | | | | | | | | It should not be a value larger than the number of streams we have, or it will cause invalid reads and/or SIGSEGV. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/webmdashenc: Require the 'adaptation_sets' option to be setDerek Buitenhuis2017-04-20
| | | | | | | | | | | | | | This seems to be non-optional, and if the muxer is run without it, strlen() is run on NULL, causing a segfault. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/aac_adtstoasc: fix ASC passthrough on small framesJames Almer2017-04-19
| | | | | | | | | | | | | | ASC frames smaller than AAC_ADTS_HEADER_SIZE were being discarded. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | avfilter/af_compand: Check av_strtok() for failureMichael Niedermayer2017-04-20
| | | | | | | | | | | | Fixes CID1396256 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | tools/target_dec_fuzzer: Fuzz video decoder related fields in context.Michael Niedermayer2017-04-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/mov: Only copy extradata if it exists.Carl Eugen Hoyos2017-04-19
| | | | | | | | Avoids undefined call of memcpy(ptr, NULL, 0);
* | lavc/motion_est: Fix undefined negative left shifts.Carl Eugen Hoyos2017-04-19
| |
* | tests/fate-run.sh: Show packet flags for fate gapless tests.Sasi Inguva2017-04-19
| | | | | | | | | | Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/vf_drawtext: added expr evaluation to drawtext fontsizeBrett Harrison2017-04-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec: add Screen Recorder Gold Codec decoderPaul B Mahol2017-04-18
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec: add Mandsoft Screen Capture Codec decoderPaul B Mahol2017-04-18
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | doc/encoders.texi: document libvpxenc's -row-mtJames Zern2017-04-17
| | | | | | | | | | | | | | | | added in: 734d760e2f lavc/libvpxenc: add -row-mt option Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Zern <jzern@google.com>
* | ffmpeg: Clear fifo pointer on deallocationMichael Niedermayer2017-04-18
| | | | | | | | | | | | Not leaving stale pointers is more robust Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | doc/fftools-common-opts: Fixed a typo in the common arguments listMickael Maison2017-04-18
| | | | | | | | | | | | | | - Fixed a typo for the -sources argument Signed-off-by: Mickael Maison <mickael.maison@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | matroskadec,cosmetics: fix a couple typosJames Zern2017-04-17
| | | | | | | | Signed-off-by: James Zern <jzern@google.com>
* | webm_dash_manifest: Add option to specify bandwidthVignesh Venkatasubramanian2017-04-17
| | | | | | | | | | | | | | | | | | Add an option to webm_dash_manifest demuxer to specify a value for "bandwidth" field in the DASH manifest. The value is then used by the muxer. Fixes an existing FIXME in the code. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: James Zern <jzern@google.com>
* | Merge commit '47e547b321338c73c21fa623789f1efbd80a297a'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | * commit '47e547b321338c73c21fa623789f1efbd80a297a': lavc: add a null bitstream filter Merged-by: Clément Bœsch <u@pkh.me>
| * lavc: add a null bitstream filterAnton Khirnov2016-12-14
| | | | | | | | | | | | It is useful for testing/debugging and will also be used as the default filter in the following commit adding pre-decode filtering to avoid having a separate non-filtered codepath.
* | Merge commit '0309ddcfb25fd44883bfcdb07509eb4907576b97'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | * commit '0309ddcfb25fd44883bfcdb07509eb4907576b97': lavc: handle MP3 in get_audio_frame_duration() Merged-by: Clément Bœsch <u@pkh.me>
| * lavc: handle MP3 in get_audio_frame_duration()Anton Khirnov2016-12-14
| |
* | Merge commit '6aa4ba7131b6e8668e33430e18101a051fe492eb'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | * commit '6aa4ba7131b6e8668e33430e18101a051fe492eb': dxva2: Keep code shared between dxva2 and d3d11va under the correct #if Merged-by: Clément Bœsch <u@pkh.me>
| * dxva2: Keep code shared between dxva2 and d3d11va under the correct #ifDiego Biurrun2016-12-12
| | | | | | | | This partially reverts commit ac648bb835edd3f67bda2267d0e72e5e582eb5a1.
* | Merge commit 'b0e6b3f4777910d61083976aa9fc78a1e0731aae'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | * commit 'b0e6b3f4777910d61083976aa9fc78a1e0731aae': hevc: ppc: Add HEVC 4x4 IDCT for PowerPC Merged-by: Clément Bœsch <u@pkh.me>
| * hevc: ppc: Add HEVC 4x4 IDCT for PowerPCAlexandra Hajkova2016-12-12
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'fc368497f2fff54ddf5316224c573c9d1939fb25'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | * commit 'fc368497f2fff54ddf5316224c573c9d1939fb25': configure: Add missing dxva2 dependency for dxva2_lib Merged-by: Clément Bœsch <u@pkh.me>
| * configure: Add missing dxva2 dependency for dxva2_libDiego Biurrun2016-12-12
| |