Skip to content

lavd/avfoundation2: fix framerate selection #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
lisional wants to merge 9,224 commits into
base: avfarc
Choose a base branch
from
Open

lavd/avfoundation2: fix framerate selection #2

lisional wants to merge 9,224 commits into from

Conversation

@lisional
Copy link

@lisional lisional commented Jan 19, 2016

framerate ranges can sometimes include only one value:
[30.000030,30.000030]
[15.5000,15.5000]

Detect when this is the case and use this value instead of the one
passed in arguments

thiloborgmann pushed a commit that referenced this pull request Feb 7, 2017
@tmm1 @fhvwy
avutil/hwcontext_vaapi: fix SEGV in vaTerminate when vaInitialize fails
3606602 
Program terminated with signal SIGSEGV, Segmentation fault.
  #0  0x0000000000aff8a4 in vaTerminate ()
  #1  0x0000000000ae50ce in vaapi_device_free (ctx=<optimized out>) at libavutil/hwcontext_vaapi.c:882
  #2  0x0000000000ae1f9e in hwdevice_ctx_free (opaque=<optimized out>, data=<optimized out>) at libavutil/hwcontext.c:66
  FFmpeg#3  0x0000000000ad856f in buffer_replace (src=0x0, dst=0x7fffa26ef1b8) at libavutil/buffer.c:119
  FFmpeg#4  av_buffer_unref (buf=buf@entry=0x7fffa26ef1f8) at libavutil/buffer.c:129
  FFmpeg#5  0x0000000000ae299f in av_hwdevice_ctx_create (pdevice_ref=0x170ac50 <hw_device_ctx>, type=type@entry=AV_HWDEVICE_TYPE_VAAPI, device=<optimized out>,
      opts=opts@entry=0x0, flags=flags@entry=0) at libavutil/hwcontext.c:494
  FFmpeg#6  0x0000000000400968 in vaapi_device_init (device=<optimized out>) at ffmpeg_vaapi.c:223

Signed-off-by: Mark Thompson <sw@jkqxz.net>
t-rapp and others added 29 commits May 8, 2017 08:42
@t-rapp
tests/fate/fifo-muxer: update fifo-muxer dependencies
78f51ec 
Fixes fate when configured with --disable-network.
@michaelni
avcodec/cdxl: Check format for BGR24
1e42736 
Fixes: out of array access
Fixes: 1427/clusterfuzz-testcase-minimized-5020737339392000

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/cavsdec: Check sym_factor
279420b 
Fixes: runtime error: signed integer overflow: 25984 * 130560 cannot be represented in type 'int'

Fixes: 1404/clusterfuzz-testcase-minimized-5000441286885376

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/hqxdsp: Fix multiple runtime error: signed integer overflow: …
5d5118f 
…248220 * 21407 cannot be represented in type 'int' in idct_col()

Fixes: 1405/clusterfuzz-testcase-minimized-5011491835084800

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/vp8dsp: Fixes: runtime error: signed integer overflow: 133014…
8824b73 
…3360 - -1023040530 cannot be represented in type 'int'

Fixes: 1406/clusterfuzz-testcase-minimized-5064865125236736

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/dvbsubdec: check region dimensions
0075d9e 
Fixes: 1408/clusterfuzz-testcase-minimized-6529985844084736
Fixes: integer overflow

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/dss_sp: Fix multiple runtime error: signed integer overflow: …
ea59ef0 
…-15699 * -164039 cannot be represented in type 'int'

Fixed: 1409/clusterfuzz-testcase-minimized-5237365020819456

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/bmvvideo: Fix runtime error: left shift of 137 by 24 places c…
2969202 
…annot be represented in type 'int'

Fixes: 1411/clusterfuzz-testcase-minimized-5776085184675840

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@jamrial
configure: add missing lpc dependency to mlp and truehd encoders
74fee97
@jamrial
avcodec/mjpegenc: move ff_mjpeg_encode_picture_frame to mjpegenc_common
2cb656a 
Fixes compilation of ljpeg encoder if mjpeg and amv encoders are disabled
@michaelni
avcodec/wavpack: Fix signed integer overflow: 1285114081 * 2 cannot b…
aaeec1c 
…e represented in type 'int'

Fixes: 945/clusterfuzz-testcase-6037937588273152
Fixes: integer overflow

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/htmlsubtitles: Check for string truncation and return error
f4ae3cc 
Fixes out of array access
Fixes: 1354/clusterfuzz-testcase-minimized-5520132195483648

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/samidec: Check ff_htmlmarkup_to_ass() return code
983e3fb 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/srtdec: Check ff_htmlmarkup_to_ass() return code
7b94df2 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
doc/build_system: Document how to build decoder fuzzer
8ef2c79 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@jamrial
Merge commit '52627248e49e58eb4b78e4fcda90a64f4c476ea3'
a47bd5d 
* commit '52627248e49e58eb4b78e4fcda90a64f4c476ea3':
  frame: add a cropping rectangle to AVFrame

Merged-by: James Almer <jamrial@gmail.com>
@jamrial
Merge commit '019ab88a95cb31b698506d90e8ce56695a7f1cc5'
f089e02 
* commit '019ab88a95cb31b698506d90e8ce56695a7f1cc5':
  lavc: add an option for exporting cropping information to the caller

Merged-by: James Almer <jamrial@gmail.com>
@cus
avdevice/decklink: fix MSVC build issues
7f7ee86 
Purpose: Made minor changes to get the decklink avdevice code to build
using Visual C++.

Notes: Made changes to configure per Hendrik Leppkes's review of first
and second versions of patch.  Also made slight alterations per Marton
Balint's reviews.

Comments:

-- configure: Added if enabled decklink section and setting
   decklink_indev_extralibs and decklink_outdev_extralibs here for
   both mingw and Windows.  Also eliminated the setting of these
   variables in the mingw section earlier in the file.

-- libavdevice/decklink_common.cpp: Switched the order of the include
   of libavformat/internal.h to workaround build issues with Visual
   C++.  See comment in file for more details.

-- libavdevice/decklink_dec.cpp:
a) Rearranged the include of libavformat/internal.h (for reasons as
   described above).
b) Made slight alteration to an argument for call to av_rescale_q() to
   workaround a compiler error with Visual C++.  This appears to only
   be an issue when building C++ files with Visual C++.  See comment
   in code for more details.

-- libavdevice/decklink_enc.cpp: Rearranged the include of
   libavformat/internal.h (for reasons as described above).

Signed-off-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
@michaelni
avcodec/g723_1dec: Fix several integer related cases of undefined beh…
d3088e0 
…aviour

Fixes: 1412/clusterfuzz-testcase-minimized-6561308772139008

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/fic: Check coefficients
5484590 
Fixes: signed integer overflow: 1258291200 * 2 cannot be represented in type 'int'
Fixes: 1413/clusterfuzz-testcase-minimized-5923451770503168

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/indeo2: Check for invalid VLCs
159fb8f 
Fixes: timeout
Fixes: 1416/clusterfuzz-testcase-minimized-5536862435278848

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/clearvideo: Fix runtime error: signed integer overflow: 181 *…
28230a6 
… 18050756 cannot be represented in type 'int'

Fixes: 1417/clusterfuzz-testcase-minimized-6606778030620672

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
qsvenc: Use MFXVideoENCODE_Query() to update the parameters
dd83197 
Purpose: Fill out the default/unset parameters with ones actually in use.

Note: Matches the current MediaSDK example code.  This code used to be
present in ffmpeg and was eliminated in revision 1f26a23 on Oct. 31,
2016 (qsv: Merge libav implementation, at
FFmpeg@1f26a23#diff-7d84a34d58597bb7aa4b8239dca1f9f8).
Already applied to libav.

Reviewed-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit b22094d)
Signed-off-by: Mark Thompson <sw@jkqxz.net>
Signed-off-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
qsvenc: Make sure the interlaced encoding works
ae5b67e 
Purpose: qsvenc: make sure that interlaced encoding works.  Also,
reduce the vertical alignment constraint when possible to reduce
memory usage.

Note: Most of this code used to be present in ffmpeg and was
eliminated in revision 1f26a23 on Oct. 31, 2016 (qsv: Merge libav
implementation, at
FFmpeg@1f26a23
edfa#diff-7d84a34d58597bb7aa4b8239dca1f9f8).  Already applied to
libav.

Reviewed-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 8fd8f91)
Signed-off-by: Mark Thompson <sw@jkqxz.net>
Signed-off-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
configure: Added require alternative for libmfx to support alternate …
164e277 
…installation options

Purpose: Added require alternative for libmfx in the case that pkg-config
cannot find libmfx.  On Linux, most people likely get libmfx via
https://github.com/lu-zero/mfx_dispatch , but on Windows, the most
well-known way to get libmfx is via the Intel Media SDK, which
provides a static build of libmfx.lib and also provides the source
code for building libmfx yourself.  If built this way, there are no
pkg-config files to be found.

Comments:

-- configure: Altered enabled libmfx step to use use_pkg_config()
   instead of require_pkg_config(), and, if use_pkg_config() fails, it
   falls back to require().  Also added explanatory comment.  Note
   that the reason that require() is passed -llibmfx as the last
   argument, instead of -lmfx, is the file name for the library
   produced from the Intel Media SDK starts with "libmfx".
   Apparently, the filename for the library produced via
   https://github.com/lu-zero/mfx_dispatch starts with "mfx".

Signed-off-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@richardpl
avfilter/vf_histogram: actually add parade display mode
66be242 
Rename previous parade mode to stack, what it really was from start.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
@michaelni
avcodec/flacdec: Return error code instead of 0 for failures
3f5a685 
Fixes: infinite loop
Fixes: 1418/clusterfuzz-testcase-minimized-5934472438480896

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/snowdec: Remove unneeded {}
ea627dc 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/snowdec: Check width
78aa938 
Fixes: out of array read
Fixes: 1419/clusterfuzz-testcase-minimized-6108700873850880

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
jamrial and others added 23 commits May 20, 2017 21:29
@jamrial
configure: fix --tempprefix option
8794cfb 
It was broken in 091c986
@michaelni
avcodec/aacsbr_fixed: Fix multiple runtime error: shift exponent 170 …
6310fc7 
…is too large for 32-bit type 'int'

Fixes part of 1709/clusterfuzz-testcase-minimized-4513580554649600

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/sbrdsp_fixed: fix runtime error: left shift of 1 by 31 places…
384508b 
… cannot be represented in type 'int'

Fixes: part of 1709/clusterfuzz-testcase-minimized-4513580554649600

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/mlpdsp: Fix runtime error: signed integer overflow: -24419392…
1d04fc9 
… * 128 cannot be represented in type 'int'

Fixes: 1711/clusterfuzz-testcase-minimized-5248503515185152

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/takdec: Fix runtime error: left shift of negative value -63
d661932 
Fixes: 1713/clusterfuzz-testcase-minimized-5791887476654080

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/aac_defines: Fix: runtime error: left shift of negative value -2
c3547dc 
Fixes: 1716/clusterfuzz-testcase-minimized-4691012196761600

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/wavpack: Fix multiple runtime error: signed integer overflow:…
3b09d7c 
… 548 * -2147483648 cannot be represented in type 'int'

Fixes: 1659/clusterfuzz-testcase-minimized-5396490639900672

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/takdec: Fix runtime error: signed integer overflow: 8192 * 52…
955db41 
…4308 cannot be represented in type 'int'

Fixes: 1630/clusterfuzz-testcase-minimized-6326111917047808

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/vmnc: Check location before use
ec2b76a 
Fixes: runtime error: signed integer overflow: 65535 * 64256 cannot be represented in type 'int'
Fixes: 1717/clusterfuzz-testcase-minimized-5491696676634624

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/vp9block: fix runtime error: signed integer overflow: 196675 …
d4ee767 
…* 20670 cannot be represented in type 'int'

Fixes: 1710/clusterfuzz-testcase-minimized-4837032931098624

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/mpeg4videodec: Check for multiple VOL headers
efeb47f 
Fixes multiple: runtime error: signed integer overflow: 2147115008 + 413696 cannot be represented in type 'int'
Fixes: 1723/clusterfuzz-testcase-minimized-5309409372667904
Fixes: 1727/clusterfuzz-testcase-minimized-5900685306494976
Fixes: 1737/clusterfuzz-testcase-minimized-5922321338466304

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/aacdec_fixed: Fix runtime error: shift exponent 34 is too lar…
b5228e4 
…ge for 32-bit type 'int'

Fixes: 1721/clusterfuzz-testcase-minimized-4719352135811072

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@cehoyos
lavf/riff: Support more vlc fourcc's for 12 and 16 bit yuv4xx.
017a68e
@cehoyos
lavf/img2: Add svg and svgz to allow reading image sequences.
7f60dc0 
Increase the return value for svg_probe() to make it != AVPROBE_SCORE_EXTENSION.
@michaelni
avcodec/mjpegdec: Fix runtime error: signed integer overflow: -32767 …
40fa6a2 
…* 130560 cannot be represented in type 'int'

Fixes: 1724/clusterfuzz-testcase-minimized-4842395432648704

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/dct32_template: Fix runtime error: signed integer overflow: -…
a1cbf53 
…1071326067 - 1088238847 cannot be represented in type 'int'

Fixes: 1731/clusterfuzz-testcase-minimized-5123972414832640

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/ivi_dsp: Fix multiple runtime error: left shift of negative v…
8fb00b3 
…alue -71

Fixes: 1734/clusterfuzz-testcase-minimized-5385630815092736

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@richardpl
avfilter/avf_showspectrum: properly initialize pts
49d0678 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
@Nevcairiel
Use AVOnce as a static variable consistently
9fb293c 
Using AVOnce as a stack variable makes no sense as the state is lost
when the function exits.

This fixes repeated calls to av(filter/device)_register_all
@cboesch-gpsw
lavf/concatdec: do not transfer custom IO flag
0dcac9c 
If the source is using a custom IO, setting this flag causes heavy leaks
since the segments will not have their avio context closed.

Regression since f5da453.
@cboesch-gpsw
lavf/hls: do not transfer custom IO flag
ef01061 
See 0dcac9c
@michaelni
avcodec/escape124: Check depth against num_superblocks
da61740 
Fixes: runtime error: left shift of 66184 by 15 places cannot be represented in type 'int'
Fixes: 1707/clusterfuzz-testcase-minimized-6502767008940032

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
@michaelni
avcodec/mlpdec: Fix runtime error: shift exponent -5 is negative
42e42af 
Fixes part of 1708/clusterfuzz-testcase-minimized-5035111957397504

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.