wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
100173 commits 40 branches 405 tags 230 MiB
Commit graph

44032 commits

Author SHA1 Message Date
Andreas Rheinhardt
f3e645a796 avcodec/mjpegdec: Fix memleak upon init failure 
This affected all decoders that used ff_mjpeg_decode_init() as init
function; and it also affected decoders that open jpeg decoders via
ff_codec_open2_recursive() as well as MxPEG.

Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
6a2defd7d8 avcodec/smc: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
b3912f8dfd avcodec/sipr: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
7b9f0b8059 avcodec/shorten: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
3c6b6f544c avcodec/sgirledec: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
7722704774 avcodec/sgienc: Combine av_log() statements 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
2aef81b063 avcodec/sgienc: Mark encoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
3e75631541 avcodec/sgidec: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
6c697aee52 avcodec/tmv: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
a85bb5d7e6 avcodec/ulti: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
bfee34caae avcodec/ws-snd1: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
9a7fe43c0f avcodec/xxan: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
e645f0f0d3 avcodec/xxan: Cleanup generically on init failure 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
703abb3c0e avcodec/xsubenc: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
42c0cf89fe avcodec/xsubdec: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
88f0d6b60c avcodec/xl: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
44a893f09c avcodec/xfacedec: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
dbdad78b40 avcodec/xan: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
85e1d469af avcodec/xan: Cleanup generically on init failure 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
13f10dc15e avcodec/yuv4dec: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
ced33a2cde avcodec/y41penc: Mark encoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
b509692c62 avcodec/y41pdec: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
c53f39abc3 avcodec/yop: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
b143f8c26a avcodec/cljrdec: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
a6bed40865 avcodec/loco: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
5ff030f922 avcodec/pcm: Mark decoders as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
5634ce234a avcodec/pcm: Make encoders init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
6643eaaa30 avcodec/adpcmenc: Mark encoders as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
87a5d9821f avcodec/adpcm: Mark decoders as init-threadsafe 
They don't modify any global state

Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
868368aa38 avcodec/cdtoons: Mark decoder as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:46 +01:00
Andreas Rheinhardt
6d4b969515 avcodec/a64multienc: Mark encoders as init-threadsafe 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-04 15:46:45 +01:00
Andreas Rheinhardt
0639f5c294 avcodec/pthread_slice: Don't use static variable, fix race 
ff_slice_thread_init() uses a static variable to hold a function
pointer, although the value of said pointer needn't be saved between
different runs of this function at all.

The reason for this being so is probably that said pointer points to
a static function (if used); but storage class specifiers like "static"
are not part of the type of an object and so including it in the pointer
declaration is wrong (anyway, "static" means different things in both
contexts: for the function declaration it affects linkage, for the
variable storage duration).

Using a static variable here can lead to races, e.g. when initializing
VP9 (for which said function pointer was added) and H.264 with slice
threading. The latter has the FF_CODEC_CAP_INIT_THREADSAFE flag set and
is therefore unaffected by the lock guarding initializations of
decoders.

Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-02 16:11:50 +01:00
Andreas Rheinhardt
4e26520039 avcodec/mpeg12enc: Disallow using MPEG-2 intra VLC table for mpeg1video 
Using MPEG-2 intra VLC tables is spec-incompliant for MPEG-1 and given
that an MPEG-1 bitstream can't signal whether MPEG-2 intra VLC tables
have been used the output is broken. Therefore this option is removed
immediately without any deprecation period.

Reviewed-by: James Almer <jamrial@gmail.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-12-02 15:38:15 +01:00
James Almer
c35cf9fe53 avcodec/cbs_h2645: remove dead code in cbs_h2645_replace_ps() 
Missed in 0720e15c03. PS units are now guaranteed
to always be reference counter.

Signed-off-by: James Almer <jamrial@gmail.com>
 2020-12-01 13:21:23 -03:00
James Almer
233a99e191 avcodec/cbs_av1: ensure Sequence Header unit content is always reference counted 
Prevents a NULL pointer dereference.

Signed-off-by: James Almer <jamrial@gmail.com>
 2020-12-01 12:31:58 -03:00
James Almer
052b4c3481 avcodec/vaapi_av1: read film grain param values from AV1Frames 
Signed-off-by: James Almer <jamrial@gmail.com>
 2020-11-30 19:12:39 -03:00
James Almer
6aa45a2769 avcodec/dxva2_av1: read film grain param values from AV1Frames 
Signed-off-by: James Almer <jamrial@gmail.com>
 2020-11-30 19:12:39 -03:00
James Almer
003aeeb3f6 avcodec/nvdec_av1: read film grain param values from AV1Frames 
Signed-off-by: James Almer <jamrial@gmail.com>
 2020-11-30 19:12:39 -03:00
James Almer
eee7ba8dba avcodec/av1dec: infer and store film grain param values in AV1Frame 
They are not always coded in the bistream for each frame. In some cases, the
values need to be taken from a reference frame.

See section 6.8.20 from the AV1 spec.

Signed-off-by: James Almer <jamrial@gmail.com>
 2020-11-30 19:12:39 -03:00
James Almer
aea80e2273 avcodec/cbs_av1: split film grain param fields into their own struct 
Cosmetic change in preparation for the following patches.

Signed-off-by: James Almer <jamrial@gmail.com>
 2020-11-30 19:12:39 -03:00
James Almer
e4c3ec3e00 Revert "avcodec/nvdec_av1: fix setting film grain parameters for frames with update_grain == 0" 
This reverts commit f9eec62983.

This does not effectively cover all cases. The values for some frames need
to be inferred by the decoder.

Signed-off-by: James Almer <jamrial@gmail.com>
 2020-11-30 19:12:39 -03:00
Michael Niedermayer
7cf852b03c avcodec/hevc_cabac: Limit value in coeff_abs_level_remaining_decode() tighter 
The max depth is 16bps, the max allowed coefficient depth is depth+6
Fixes: signed integer overflow: 1074266112 + 1073725439 cannot be represented in type 'int'
Fixes: 26493/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5657763331702784

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2020-11-29 16:10:56 +01:00
Michael Niedermayer
3f6653efdb avcodec/notchlc: Check available space for luma block code and alpha code 
Fixes: Timeout (too long -> 2sec)
Fixes: 25439/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_NOTCHLC_fuzzer-5688211127664640

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2020-11-29 16:10:55 +01:00
Andreas Rheinhardt
7eb9cf593e avcodec/pafvideo: Cleanup generically on init failure 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-11-29 00:38:32 +01:00
Andreas Rheinhardt
9227721ef0 avcodec/pnmenc: Mark encoders as init-threadsafe 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-11-29 00:38:01 +01:00
Andreas Rheinhardt
362fdc2657 avcodec/photocd: Mark decoder as init-threadsafe 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-11-29 00:01:53 +01:00
Andreas Rheinhardt
d12cfa17a5 avcodec/pcm-dvdenc: Mark encoder as init-threadsafe 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-11-29 00:01:53 +01:00
Andreas Rheinhardt
adf1ab002e avcodec/pcm-dvd: Mark decoder as init-threadsafe 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-11-29 00:01:53 +01:00
Andreas Rheinhardt
54135a0bd2 avcodec/pafvideo: Mark decoder as init-threadsafe 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-11-29 00:01:53 +01:00
Andreas Rheinhardt
ef04afa730 avcodec/pafaudio: Mark decoder as init-threadsafe 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-11-29 00:01:53 +01:00