* commit '3ff8fbbf5a7bc40c09db74d4952364997fd3c611':
vaapi_h265: Add named options for setting profile and level
vaapi_h264: Add named options for setting profile and level
vaapi: Make the decode profile matching more explicit
vaapi_h264: Fix VUI max_dec_frame_buffering
vaapi_h265: Enable VBR mode
This commit is a noop, see
385cafb07af31478ba14efd0612fdcc490fc953671421f382f
Merged-by: James Almer <jamrial@gmail.com>
* commit '5a6707e49b7710f48d658b2f2591b9a6337fb9b7':
cbs_mpeg2: Fix marker_bit type
cbs: Add padding to slice data allocations
This commit is a noop, see
b4c915f4b35b2c71bb94
Merged-by: James Almer <jamrial@gmail.com>
Fixes: signed integer overflow: -1698586465 + -551542752 cannot be represented in type 'int'
Fixes: 4490/clusterfuzz-testcase-minimized-5210014592532480
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This fixes the use of old ad-hoc methods which are still supported by some
hwaccels which also support newer methods (DXVA2, VAAPI, VDPAU,
videotoolbox) - without the method being visible here, ff_get_format()
would refuse to use it.
Signed-off-by: Mark Thompson <sw@jkqxz.net>
After commit 3701d49 'error_resilience: remove avpriv_atomic usage'
we have included windows.h in much more files and we should
avoid conflicts with defines/function declarations.
Signed-off-by: Mateusz Brzostek <mateuszb@poczta.onet.pl>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Moved bitrate parameters set before Init() call because bitrate is used in
profile level correction code inside Init().
Signed-off-by: Mikhail Mironov <mikhail.mironov@amd.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
The opus.c file uses ff_celt_freq_range and ff_celt_freq_bands which are
defined in opustab.c. The opus parser needs to include that file to
avoid linker errors when not including the opus encoder/decoder.
Signed-off-by: Jacob Trimble <modmaker@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
In commit 061a0c14bb ("decode: restructure the core decoding code"), the
deprecated avcodec_decode_* APIs were reworked so that they called into the
new avcodec_send_packet / avcodec_receive_frame API. This had the side effect
of prohibiting sending new packets containing data after a drain
packet, but in previous versions of FFmpeg this "worked" and some
applications relied on it.
To restore some compatibility, reset the codec if we receive a new non-drain
packet using the old API after draining has completed. While this does
not give the same behaviour as the old API did, in the majority of cases
it works and it does not require changes to any other part of the decoding
code.
Fixes ticket #6775
Signed-off-by: James Cowgill <jcowgill@debian.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
Compilation error "out of range" fixed for armeabi-v7a. Compilation failed
trying to build libvlc.aar for ARM7 android on ubuntu 16.04 host. Error
messages is "Offset out of range". The reason of the error is assembler LDR
directives in function "ff_hevc_transform_luma_4x4_neon_8" need local storage
in range <1k, but no such storage provided.
Based on a patch by Ihor Bobalo <bob@eleks.com>
Suggested-by: wbs
Signed-off-by: James Almer <jamrial@gmail.com>
Copied the check from cuviddec.c (*_cuvid decoders) to allow the
capability check to be optional for older drivers.
Signed-off-by: Jacob Trimble <modmaker@google.com>
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
This was setting the input pixel type instead of the output one,
leading to incorrect data being fed to the library.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Resulted in valgrind errors due to uninitialized memory.
Also updates fate and makes it use the tron sample result.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Adds call to x265_param_apply_profile after x265_param_parse.
Added as private option since HEVC profiles other than
Main, Main 10 and MSP in AVCodecContext are consolidated in a single
constant.
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reviewed-by: Lou Logan <lou@lrcd.com>
Fixes: runtime error: signed integer overflow: 2147483646 + 2048 cannot be represented in type 'int'
Fixes: 4479/clusterfuzz-testcase-minimized-6529894147162112
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer
Carl Eugen Hoyos
Michael Niedermayer
Mark Thompson
Thomas Guillem
Mateusz
Mironov, Mikhail
tiejun.peng
Jacob Trimble
James Cowgill
Martin Vignali
Alexandra Hájková
Paul B Mahol
Mark Reid
sfan5
Jacob Trimble
Vittorio Giovara
Rostislav Pehlivanov
John Stebbins
Gyan Doshi