]> git.sesse.net Git - ffmpeg/log
ffmpeg
3 years agolibavcodec/options_table: Add missing colorspace options
Harry Mallon [Wed, 19 Aug 2020 20:31:03 +0000 (21:31 +0100)]
libavcodec/options_table: Add missing colorspace options

* chroma-derived-nc / chroma-derived-c and ictcp

Signed-off-by: Harry Mallon <harry.mallon@codex.online>
Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
3 years agoavformat/segment: Avoid duplicating string when parsing frames list
Andreas Rheinhardt [Sun, 6 Sep 2020 10:07:39 +0000 (12:07 +0200)]
avformat/segment: Avoid duplicating string when parsing frames list

Reviewed-by: Ridley Combs <rcombs@rcombs.me>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavformat/segment: Fix error messages
Andreas Rheinhardt [Sun, 6 Sep 2020 09:24:22 +0000 (11:24 +0200)]
avformat/segment: Fix error messages

Reviewed-by: Ridley Combs <rcombs@rcombs.me>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavformat/segment: Remove redundant code for freeing in write_trailer
Andreas Rheinhardt [Sat, 5 Sep 2020 21:45:22 +0000 (23:45 +0200)]
avformat/segment: Remove redundant code for freeing in write_trailer

This code mostly duplicates code in the deinit function; the only
exception is av_opt_free(): The options are freed generically lateron.

Reviewed-by: Ridley Combs <rcombs@rcombs.me>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavformat/segment: Free SegmentListEntries in deinit, not write_trailer
Andreas Rheinhardt [Sat, 5 Sep 2020 21:36:03 +0000 (23:36 +0200)]
avformat/segment: Free SegmentListEntries in deinit, not write_trailer

This fixes leaks when the trailer is never written.

Reviewed-by: Ridley Combs <rcombs@rcombs.me>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavformat/segment: Fix leak and invalid free of AVIOContext
Andreas Rheinhardt [Sat, 5 Sep 2020 22:29:33 +0000 (00:29 +0200)]
avformat/segment: Fix leak and invalid free of AVIOContext

seg_init() and seg_write_header() currently contain a few error paths
in which an already opened AVIOContext for the child muxer leaks (namely
if there are unrecognized options for the child muxer or if writing the
header of the child muxer fails); the reason for this is that this
AVIOContext is not closed in the deinit function. If all goes well, it
is closed when writing the trailer. From this it also follows that the
AVIOContext also leaks when the trailer is never written, even when
writing the header succeeds.

But simply freeing said AVIOContext in the deinit function is
complicated by the fact that the AVIOContext may or may not have been
opened via the io_open callback: If options are set to discard header
and trailer, said AVIOContext can also be a null context which must not
be closed via the io_close callback. This may lead to crashes, as
io_close may presume the AVIOContext's opaque to be set. It currently
works with the default io_close callback which simply calls avio_close(),
because avio_close() doesn't care about opaque being NULL since commit
6e8e8431e15a58aa44cfdd8c11f9ea096837c0fa. Therefore this commit records
which of the two kinds of AVIOContext is currently in use to use the
right way to close it.

Finally there was one instance (namely if initializing the child muxer
fails with no unrecognized options) where the AVIOContext was always
closed via the io_close callback. The above remark applies to this; it
has been fixed, too.

Reviewed-by: Ridley Combs <rcombs@rcombs.me>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavformat/segment: Fix leak of string on error
Andreas Rheinhardt [Sat, 5 Sep 2020 19:22:21 +0000 (21:22 +0200)]
avformat/segment: Fix leak of string on error

A string containing the segment's filename that the segment muxer
allocates got only freed in its write_trailer function. This implies
that it leaks if write_trailer is never called, e.g. if initializing
the child muxer fails. This commit fixes this by freeing the string
in the deinit function instead.

Reviewed-by: Ridley Combs <rcombs@rcombs.me>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavformat/segment: Fix segfault when error happens and segment list is output
Andreas Rheinhardt [Sat, 5 Sep 2020 16:12:27 +0000 (18:12 +0200)]
avformat/segment: Fix segfault when error happens and segment list is output

The segment muxer has an option to output a file containing a list of
the segments written. The AVIOContext used for writing this file is
opened via the main AVFormatContext's io_open callback; seg_free()
meanwhile unconditionally closes this AVIOContext by calling
ff_format_io_close() with the child muxer (the one for the actual output
format) as AVFormatContext.

The problem hereby is that the child AVFormatContext need not exist,
even when the AVIOContext does. This leads to a segfault in
ff_format_io_close() when the child muxer's io_close callback is called.

Situations in which the AVFormatContext can be NULL range from an
invalid reference stream parameter to an unavailable/bogus/unsupported
output format to inability to allocate the AVFormatContext.

The solution is to simply close the AVIOContext with the AVFormatContext
that was used to open it: The main AVFormatContext.

Reviewed-by: Ridley Combs <rcombs@rcombs.me>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavformat/segment: Fix segfault on allocation error, avoid allocation
Andreas Rheinhardt [Sun, 6 Sep 2020 10:34:58 +0000 (12:34 +0200)]
avformat/segment: Fix segfault on allocation error, avoid allocation

If the user has set none of the options specifying the segments'
durations, a default value of 2s is used by duplicating a "2" string and
using av_parse_time() on it. Yet duplicating the string was unchecked
and if the allocation failed, one would get a segfault in
av_parse_time().

This commit solves this by turning said option into an option of type
AV_OPT_TYPE_DURATION (which also uses av_parse_time() internally),
avoiding duplicating the string altogether.

Reviewed-by: Ridley Combs <rcombs@rcombs.me>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavformat/segment: Fix leak of duration/framenumber lists upon error
Andreas Rheinhardt [Sat, 5 Sep 2020 17:36:31 +0000 (19:36 +0200)]
avformat/segment: Fix leak of duration/framenumber lists upon error

The code to free them is not in the segment muxer's deinit function,
but in its write_trailer function which means that these lists leak if
write_trailer isn't called after their allocation. This happens e.g. if
the given lists are invalid (e.g. consisting only of ',' (which delimit
entries)), so that parsing them fails and so does the muxer's init
function; write_trailer is then never called.

This has been fixed by moving the code to free them to the deinit
function.

Reviewed-by: Ridley Combs <rcombs@rcombs.me>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavformat/segment: Don't overwrite AVCodecParameters after init
Andreas Rheinhardt [Sun, 6 Sep 2020 11:24:03 +0000 (13:24 +0200)]
avformat/segment: Don't overwrite AVCodecParameters after init

The segment muxer copies the user-provided AVCodecParameters to the
newly created child streams in its init function before initializing the
child muxer; and since commit 8e6478b723affe4d44f94d34b98e0c47f6a0b411,
it does this again before calling avformat_write_header() if that is
called from seg_write_header(). The reason for this is complicated:

At that time writing the header was delayed, i.e. it was not triggered
by avformat_write_header() (unless the AVFMT_FLAG_AUTO_BSF was unset),
but instead by writing the very first packet. The rationale behind this
was to allow to run bitstream filters on the packets in the interleavement
queue in order to generate missing extradata from them before the muxer's
write_header function is actually called.

The segment muxer went even further: It initialized the child muxer and
ran the child muxer's check_bitstream functions on the packets in its
own muxing queue and stole any bitstream filters that got inserted. The
reason for this is that the segment muxer has an option to write the
header to a separate file and for this it is needed to write the child
muxer's header without delay, but with correct extradata. Unsetting
AVFMT_FLAG_AUTO_BSF for the child muxer accomplished the first goal and
stealing the bitstream filters the second; and in order for the child
muxer to actually use the updated extradata, the old AVCodecParameters
(set before avformat_init_output()) were overwritten with the new ones.

Updating the extradata proceeded as follows: The bitstream filter itself
simply updated the AVBSFContext's par_out when processing a packet, in
violation of the new BSF API (where par_out may only be set in the init
function); the muxing code then simply forwarded the updated extradata,
overwriting the par_in of the next BSF in the BSF chain with the fresh
par_out of the last one and the AVStream's par with the par_out of the
last BSF. This was an API violation, too, of course, but it made
remuxing ADTS AAC into mp4/matroska work.

But this no longer serves a useful purpose since the aac_adtstoasc BSF
was updated to propagate new extradata via packet side data in commit
f63c3516577d605e51cf16358cbdfa0bc97565d8; the next commit then removed
the code in mux.c passing new extradata along the filter chain. This
alone justifies removing the code for setting the AVCodecParameters a
second time.

But there is even another reason to do so: It is harmful. The ogg muxer
parses the extradata of Theora and Vorbis in its init function and keeps
pointers to parts of it. Said pointers become dangling when the
extradata is overwritten by the segment muxer, leading to
use-after-frees as has happened in ticket #8881 which this commit fixes.

Ticket #8517 is about another issue caused by this: Immediately after
having overwritten the old AVCodecParameters the segment muxer checks
whether the codec_tag is ok (the codec_tag is set generically when
initializing the child muxer based upon muxer-specific lists). The check
used is: If the child output format has such a list and if the codec tag
of the non-child stream does not match the codec id given the list of
codec tags and if there is a match for the codec id in the codec tag
list, then set the codec tag to zero (and not to the existing match),
otherwise set the codec tag of the child stream to the codec tag
of the corresponding stream of the main AVFormatContext (which is btw
redundant given that the child AVCodecParameters have just been
overwritten with the AVCodecParameters of the corresponding stream of
the main AVFormatContext).

Reviewed-by: Ridley Combs <rcombs@rcombs.me>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/avfilter: remove obsolete comment
Paul B Mahol [Wed, 9 Sep 2020 17:42:40 +0000 (19:42 +0200)]
avfilter/avfilter: remove obsolete comment

3 years agoavfilter/vf_premultiply: add support for gbrapf32 format
Mark Reid [Thu, 10 Sep 2020 03:36:08 +0000 (20:36 -0700)]
avfilter/vf_premultiply: add support for gbrapf32 format

3 years agolavfi/buffersink: cast to uint64_t before shifting.
Nicolas George [Tue, 8 Sep 2020 17:55:41 +0000 (19:55 +0200)]
lavfi/buffersink: cast to uint64_t before shifting.

Fix CID 1466666.

3 years agoavcodec/extract_extradata: Consolidate zeroing extradata padding
Andreas Rheinhardt [Mon, 7 Sep 2020 12:42:46 +0000 (14:42 +0200)]
avcodec/extract_extradata: Consolidate zeroing extradata padding

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agodnn/dnn_backend_native_layer_conv2d: Fix allocation size
Andreas Rheinhardt [Wed, 9 Sep 2020 12:10:24 +0000 (14:10 +0200)]
dnn/dnn_backend_native_layer_conv2d: Fix allocation size

Found via ASAN with the dnn-layer-conv2d FATE-test.

Reviewed-by: Guo, Yejun <yejun.guo@intel.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Don't check for clipping in separate loop
Andreas Rheinhardt [Sat, 29 Aug 2020 05:15:53 +0000 (07:15 +0200)]
avfilter/af_headphone: Don't check for clipping in separate loop

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Remove pointless additions
Andreas Rheinhardt [Fri, 28 Aug 2020 13:28:33 +0000 (15:28 +0200)]
avfilter/af_headphone: Remove pointless additions

buffer_length is a power-of-two and modulo is buffer_length - 1, so that
buffer_length & modulo is zero.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Use more appropriate variable name
Andreas Rheinhardt [Wed, 26 Aug 2020 07:14:53 +0000 (09:14 +0200)]
avfilter/af_headphone: Use more appropriate variable name

Also unify incrementing the variable containing the pointer
to the currently used HRIR data.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Avoid indirection for function pointer
Andreas Rheinhardt [Fri, 28 Aug 2020 12:07:42 +0000 (14:07 +0200)]
avfilter/af_headphone: Avoid indirection for function pointer

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Avoid allocating array
Andreas Rheinhardt [Wed, 26 Aug 2020 04:51:18 +0000 (06:51 +0200)]
avfilter/af_headphone: Avoid allocating array

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Don't allocate unused element in array
Andreas Rheinhardt [Wed, 26 Aug 2020 04:24:51 +0000 (06:24 +0200)]
avfilter/af_headphone: Don't allocate unused element in array

The headphone filter uses an array with as many elements as the
filter has inputs to store some per-input information; yet actually it
only stores information for all inputs except the very first one (which
is special for this filter). Therefore this commit modifies the code to
remove this unused element.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Only keep one AVFrame at a time
Andreas Rheinhardt [Wed, 26 Aug 2020 04:10:47 +0000 (06:10 +0200)]
avfilter/af_headphone: Only keep one AVFrame at a time

Despite the headphone filter only using one AVFrame at a time, it kept
an array each of whose entries contained a pointer to an AVFrame at all
times; the pointers were mostly NULL. This commit instead replaces them
by using a single pointer to an AVFrame on the stack of the only
function that actually uses them.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Avoid intermediate buffer III
Andreas Rheinhardt [Tue, 25 Aug 2020 13:08:31 +0000 (15:08 +0200)]
avfilter/af_headphone: Avoid intermediate buffer III

The headphone filter allocates a pair of buffers to be used as
intermediate buffers lateron: Before every use they are zeroed, then
some elements of the buffer are set and lateron the complete buffers are
copied into another, bigger buffer. These intermediate buffers are
unnecessary as the data can be directly written into the bigger buffer.
Furthermore, the whole buffer has been zeroed initially and because no
piece of this buffer is set twice (due to the fact that duplicate
channel map entries are skipped), it is unnecessary to rezero the part
of the big buffer that is about to be written to.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Simplify finding channel index
Andreas Rheinhardt [Thu, 27 Aug 2020 05:28:55 +0000 (07:28 +0200)]
avfilter/af_headphone: Simplify finding channel index

Before this commit, the headphone filter called
av_channel_layout_extract_channel() in a loop in order to find out
the index of a channel (given via its AV_CH_* value) in a channel layout.
This commit changes this to av_get_channel_layout_channel_index()
instead.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Fix channel assignment
Andreas Rheinhardt [Wed, 26 Aug 2020 02:24:26 +0000 (04:24 +0200)]
avfilter/af_headphone: Fix channel assignment

The documentation of the map argument of the headphone filter states:

"Set mapping of input streams for convolution. The argument is a
’|’-separated list of channel names in order as they are given as
additional stream inputs for filter."

Yet this has not been honoured at all. Instead for the kth given HRIR
channel pair it was checked whether there was a kth mapping and if the
channel position so given was present in the channel layout of the main
input; if so, then the given HRIR channel pair was matched to the kth
channel of the main input. It should actually have been matched to the
channel given by the kth mapping. A consequence of the current algorithm
is that if N additional HRIR channel pairs are given, a permutation of
the first N entries of the mapping does not affect the output at all.

The old code might even set arrays belonging to streams that don't exist
(i.e. whose index is >= the number of channels of the main input
stream); these parts were not read lateron at all. The new code doesn't
do this any longer and therefore the number of elements of some of the
allocated arrays has been reduced (in case the number of mappings was
bigger than the number of channels of the first input stream).

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Avoid intermediate buffers II
Andreas Rheinhardt [Tue, 25 Aug 2020 13:35:23 +0000 (15:35 +0200)]
avfilter/af_headphone: Avoid intermediate buffers II

When the headphone filter is configured to perform its processing in the
frequency domain, it allocates (among other things) two pairs of
buffers, all of the same size. One pair is used to store data in it
during the initialization of the filter; the other pair is only
allocated lateron. It is zero-initialized and yet its data is
immediately overwritten by the content of the other pair of buffers
mentioned above; the latter pair is then freed.

This commit eliminates the pair of intermediate buffers.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Avoid intermediate buffers I
Andreas Rheinhardt [Tue, 25 Aug 2020 13:31:04 +0000 (15:31 +0200)]
avfilter/af_headphone: Avoid intermediate buffers I

The headphone filter has two modes; in one of them (say A), it needs
certain buffers to store data. But it allocated them in both modes.
Furthermore when in mode A it also allocated intermediate buffers of the
same size, initialized them, copied their contents into the permanent
buffers and freed them.

This commit changes this: The permanent buffer is only allocated when
needed; the temporary buffer has been completely avoided.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Remove delay fields
Andreas Rheinhardt [Tue, 25 Aug 2020 12:57:31 +0000 (14:57 +0200)]
avfilter/af_headphone: Remove delay fields

They seem to exist for an option that was never implemented.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Remove unused arrays
Andreas Rheinhardt [Tue, 25 Aug 2020 12:47:09 +0000 (14:47 +0200)]
avfilter/af_headphone: Remove unused arrays

The delay arrays were never properly initialized, only zero-initialized;
furthermore these arrays duplicate fields in the headphone_inputs
struct. So remove them.
(Btw: The allocations for them have not been checked.)

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Avoid duplicating string needlessly
Andreas Rheinhardt [Mon, 24 Aug 2020 21:03:45 +0000 (23:03 +0200)]
avfilter/af_headphone: Avoid duplicating string needlessly

The string given by an AVOption that contains the channel assignment
is used only once; ergo it doesn't matter that parsing the string via
av_strtok() is destructive. There is no need to make a copy.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Simplify parsing channel mapping string
Andreas Rheinhardt [Thu, 27 Aug 2020 01:14:02 +0000 (03:14 +0200)]
avfilter/af_headphone: Simplify parsing channel mapping string

When parsing the channel mapping string (a string containing '|'
delimited tokens each of which is supposed to contain a channel name
like "FR"), the old code would at each step read up to seven uppercase
characters from the input string and give this to
av_get_channel_layout() to parse. The returned layout is then checked
for being a layout with a single channel set by computing its logarithm.

Besides being overtly complicated this also has the drawback of relying
on the assumption that every channel name consists of at most seven
uppercase letters only; but said assumption is wrong: The abbreviation
of the second low frequency channel is LFE2. Furthermore it treats
garbage like "FRfoo" as valid channel.

This commit changes this by using av_get_channel_layout() directly;
furthermore, av_get_channel_layout_nb_channels() (which uses popcount)
is used to find out the number of channels instead of the custom code
to calculate the logarithm.

(As a consequence, certain other formats to specify the channel layouts
are now accepted (like the hex versions of av_get_channel_layout()); but
this is actually not bad at all.)

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Use uint64_t for channel mapping
Andreas Rheinhardt [Mon, 24 Aug 2020 20:17:02 +0000 (22:17 +0200)]
avfilter/af_headphone: Use uint64_t for channel mapping

The headphone filter has an option for the user to specify an assignment
of inputs to channels (or from pairs of channels of the second input to
channels). Up until now, these channels were stored in an int containing
the logarithm of the channel layout. Yet it is not the logarithm that is
used lateron and so a retransformation was necessary. Therefore this
commit simply stores the uint64_t as is, avoiding the retransformation.

This also has the advantage that unset channels (whose corresponding
entry is zero) can't be mistaken for valid channels any more; the old
code had to initialize the channels to -1 to solve this problem and had
to check for whether a channel is set before the retransformation
(because 1 << -1 is UB).

The only downside of this approach is that the size of the context
increases (by 256 bytes); but this is not exceedingly much.

Finally, the array has been moved to the end of the context; it is only
used a few times during the initialization process and moving it
decreased the offsets of lots of other entries, reducing codesize.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Only attempt once to init coeffs
Andreas Rheinhardt [Tue, 25 Aug 2020 13:00:52 +0000 (15:00 +0200)]
avfilter/af_headphone: Only attempt once to init coeffs

The headphone filter does most of its initialization after its init
function, because it can perform certain tasks only after all but its
first input streams have reached eof. When this happens, it allocates
certain buffers and errors out if an allocation fails.

Yet the filter didn't check whether some of these buffers already exist
(which may happen if an earlier attempt has been interrupted in the
middle (due to an allocation error)) in which case the old buffers leak.

This commit makes sure that initializing the buffers is only attempted
once; if not successfull at the first attempt, future calls to the
filter will error out. Trying to support resuming initialization doesn't
seem worthwhile.

Notice that some allocations were freed before a new allocation was
performed; yet this effort was incomplete. Said code has been removed.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Combine several loops when checking for EOF
Andreas Rheinhardt [Fri, 28 Aug 2020 12:49:49 +0000 (14:49 +0200)]
avfilter/af_headphone: Combine several loops when checking for EOF

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Fix stack buffer overflow
Andreas Rheinhardt [Wed, 26 Aug 2020 08:11:38 +0000 (10:11 +0200)]
avfilter/af_headphone: Fix stack buffer overflow

The number of channels can be up to 64, not only 16.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Don't overrun array
Andreas Rheinhardt [Mon, 24 Aug 2020 04:34:17 +0000 (06:34 +0200)]
avfilter/af_headphone: Don't overrun array

The headphone filter stores the channel position of the ith HRIR stream
in the ith element of an array of 64 elements; but because there is no
check for duplicate channels, it is easy to write beyond the end of the
array by simply repeating channels.

This commit adds a check for duplicate channels to rule this out.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Fix segfault when using very short streams
Andreas Rheinhardt [Fri, 28 Aug 2020 08:56:20 +0000 (10:56 +0200)]
avfilter/af_headphone: Fix segfault when using very short streams

When the headphone filter does its processing in the time domain,
the lengths of the buffers involved are determined by three parameters,
only two of which are relevant here: ir_len and air_len. The former is
the length (in samples) of the longest HRIR input stream and the latter
is the smallest power-of-two bigger than ir_len.

Using optimized functions to calculate the convolution places
restrictions on the alignment of the length of the vectors whose scalar
product is calculated. Therefore said length, namely ir_len, is aligned
on 32; but the number of elements of the buffers used is given by air_len
and for ir_len < 16 a buffer overflow happens.

This commit fixes this by ensuring that air_len is always >= 32 if
processing happens in the time domain.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Check for the existence of samples
Andreas Rheinhardt [Fri, 28 Aug 2020 08:37:46 +0000 (10:37 +0200)]
avfilter/af_headphone: Check for the existence of samples

Not providing any samples makes no sense at all. And if no samples
were provided for one of the HRIR streams, one would either run into
an av_assert1 in ff_inlink_consume_samples() or into a segfault in
take_samples() in avfilter.c.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Remove always true check
Andreas Rheinhardt [Fri, 28 Aug 2020 12:22:43 +0000 (14:22 +0200)]
avfilter/af_headphone: Remove always true check

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/af_headphone: Don't use uninitialized buffer in log message
Andreas Rheinhardt [Mon, 24 Aug 2020 04:08:56 +0000 (06:08 +0200)]
avfilter/af_headphone: Don't use uninitialized buffer in log message

This buffer was supposed to be initialized by sscanf(input, "%7[A-Z]%n",
buf, &len), yet if the first input character is not in the A-Z range,
buf is not touched (in particular it needn't be zero-terminated if the
failure happened when parsing the first channel and it still contains
the last channel name if the failure happened when one channel name
could be successfully parsed). This is treated as error in which case
buf is used directly in the log message. This commit fixes this by
actually using the string that could not be matched in the log message
instead.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agodnn_backend_native_layer_conv2d.c:Add mutithread function
Xu Jun [Sun, 6 Sep 2020 12:28:53 +0000 (20:28 +0800)]
dnn_backend_native_layer_conv2d.c:Add mutithread function

Use pthread to multithread dnn_execute_layer_conv2d.
Can be tested with command "./ffmpeg_g -i input.png -vf \
format=yuvj420p,dnn_processing=dnn_backend=native:model= \
espcn.model:input=x:output=y:options=conv2d_threads=23 \
 -y sr_native.jpg -benchmark"

before patch: utime=11.238s stime=0.005s rtime=11.248s
after patch:  utime=20.817s stime=0.047s rtime=1.051s
on my 3900X 12c24t @4.2GHz

About the increase of utime, it's because that CPU HyperThreading
technology makes logical cores twice of physical cores while cpu's
counting performance improves less than double. And utime sums
all cpu's logical cores' runtime. As a result, using threads num
near cpu's logical core's number will double utime, while reduce
rtime less than half for HyperThreading CPUs.

Signed-off-by: Xu Jun <xujunzz@sjtu.edu.cn>
Signed-off-by: Guo, Yejun <yejun.guo@intel.com>
3 years agodnn_backend_native.c: parse options in native backend
Xu Jun [Sun, 6 Sep 2020 12:28:51 +0000 (20:28 +0800)]
dnn_backend_native.c: parse options in native backend

Signed-off-by: Xu Jun <xujunzz@sjtu.edu.cn>
Signed-off-by: Guo, Yejun <yejun.guo@intel.com>
3 years agoavcodec/libopusenc: add option to set inband FEC
Gyan Doshi [Sun, 6 Sep 2020 06:54:46 +0000 (12:24 +0530)]
avcodec/libopusenc: add option to set inband FEC

3 years agoffplay: fix autoexit doesn't work in the case of pb->error
Zhao Zhili [Wed, 26 Aug 2020 16:44:56 +0000 (00:44 +0800)]
ffplay: fix autoexit doesn't work in the case of pb->error

Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoRevert "avfilter/src_movie: switch to activate"
Nicolas George [Tue, 8 Sep 2020 12:57:53 +0000 (14:57 +0200)]
Revert "avfilter/src_movie: switch to activate"

This reverts commit abc884bcc005c450a34e56cd1f4b8b6fa17ea768.

This patch was pushed without actual review.
An actual review would have revealed that the switch to activate
was not done correctly because the logic between request_frame()
and frame_wanted is not as direct with filters with multiple
outputs than with a single output.

3 years agolavfi/vsrc_testsrc: switch to activate.
Nicolas George [Thu, 25 Jun 2020 18:45:53 +0000 (20:45 +0200)]
lavfi/vsrc_testsrc: switch to activate.

Allow to set the EOF timestamp.

Also: doc/filters/testsrc*: specify the rounding of the duration option.

The changes in the ref files are right.

For filter-fps-down, the graph is testsrc2=r=7:d=3.5,fps=3.
3.5=24.5/7, so the EOF of testsrc2 will have PTS 25/7.
25/7=(10+5/7)/3, so the EOF PTS for fps should be 11/7,
and the output should contain a frame at PTS 10.

For filter-fps-up, the graph is testsrc2=r=3:d=2,fps=7,
for filter-fps-up-round-down and filter-fps-up-round-up
it is the same with explicit rounding options.
But there is no rounding: testsrc2 produces exactly 6 frames
and 2 seconds, fps converts it into exactly 14 frames.

The tests should probably be adjusted to restore them to
a useful coverage.

3 years agodoc: include general in *-all pages.
Nicolas George [Sat, 22 Aug 2020 10:41:15 +0000 (12:41 +0200)]
doc: include general in *-all pages.

3 years agodoc/general: move contents into a separate file.
Nicolas George [Sat, 22 Aug 2020 10:25:42 +0000 (12:25 +0200)]
doc/general: move contents into a separate file.

It will allow to include it.

3 years agodoc/texi2pod: support @float.
Nicolas George [Sat, 22 Aug 2020 10:40:56 +0000 (12:40 +0200)]
doc/texi2pod: support @float.

3 years agolavfi/formats: more logical testing of inputs and outputs.
Nicolas George [Sun, 23 Aug 2020 09:52:16 +0000 (11:52 +0200)]
lavfi/formats: more logical testing of inputs and outputs.

ff_set_common_formats() is currently only called after
graph_check_validity(), guaranteeing that inputs and outputs
are connected.
If we want to support configuring partially-connected graphs,
we will have a lot of redesign to do anyway.

Fix CID 1466262 / 1466263.

3 years agofate: disable automatic conversions on many tests.
Nicolas George [Fri, 14 Aug 2020 16:58:27 +0000 (18:58 +0200)]
fate: disable automatic conversions on many tests.

Explicitly insert the scale or aresample filter where it would
have been inserted by the negotiation.
Re-enable conversions if it cannot be done easily.

If a conversion is needed in a test, we want to know about it.
If the negotiation changes and makes new conversion necessary,
we want to know about it even more.

3 years agoffmpeg: add auto_conversion_filters option.
Nicolas George [Fri, 14 Aug 2020 11:06:34 +0000 (13:06 +0200)]
ffmpeg: add auto_conversion_filters option.

3 years agolavfi/buffersink: remove redundant channel layouts.
Nicolas George [Fri, 14 Aug 2020 08:53:38 +0000 (10:53 +0200)]
lavfi/buffersink: remove redundant channel layouts.

The channel_layouts and channel_counts options set what buffersink
is supposed to accept. If channel_counts contains 2, then stereo is
already accepted, there is no point in having it in channel_layouts
too. This was not properly documented until now, so only print a
warning.

3 years agolavfi: check the validity of formats lists.
Nicolas George [Thu, 13 Aug 2020 11:18:15 +0000 (13:18 +0200)]
lavfi: check the validity of formats lists.

Part of the code expects valid lists, in particular no duplicates.
These tests allow to catch bugs in filters (unlikely but possible)
and to give a clear message when the error comes from the user
((a)formats) or the application (buffersink).

If we decide to switch to a more efficient merging algorithm,
possibly sorting the lists, these functions will be the preferred
place for pre-processing, and can be renamed accordingly.

3 years agolavfi/formats: simplify a macro parameters.
Nicolas George [Thu, 13 Aug 2020 09:59:19 +0000 (11:59 +0200)]
lavfi/formats: simplify a macro parameters.

3 years agolavfi: regroup formats lists in a single structure.
Nicolas George [Mon, 24 Aug 2020 10:16:34 +0000 (12:16 +0200)]
lavfi: regroup formats lists in a single structure.

It will allow to refernce it as a whole without clunky macros.

Most of the changes have been automatically made with sed:

sed -i '
  s/-> *in_formats/->incfg.formats/g;
  s/-> *out_formats/->outcfg.formats/g;
  s/-> *in_channel_layouts/->incfg.channel_layouts/g;
  s/-> *out_channel_layouts/->outcfg.channel_layouts/g;
  s/-> *in_samplerates/->incfg.samplerates/g;
  s/-> *out_samplerates/->outcfg.samplerates/g;
  ' src/libavfilter/*(.)

3 years agoavformat/electronicarts: change non failure return of read_header() to 0
Michael Niedermayer [Mon, 7 Sep 2020 22:06:53 +0000 (00:06 +0200)]
avformat/electronicarts: change non failure return of read_header() to 0

This matches the documentation, but makes no functional difference

Found-by: James Almer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/electronicarts: Check if there are any streams
Michael Niedermayer [Sun, 6 Sep 2020 22:09:33 +0000 (00:09 +0200)]
avformat/electronicarts: Check if there are any streams

Fixes: Assertion failure (invalid stream index)
Fixes: 25120/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6565251898933248
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agotools/target_dec_fuzzer: Adjust threshold for WMV3IMAGE
Michael Niedermayer [Sat, 5 Sep 2020 21:20:09 +0000 (23:20 +0200)]
tools/target_dec_fuzzer: Adjust threshold for WMV3IMAGE

Fixes: Timeout (1131sec -> 1sec)
Fixes: 24727/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV3IMAGE_fuzzer-5754167793287168
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/ffwavesynth: Fix integer overflow in wavesynth_synth_sample / WS_SINE
Michael Niedermayer [Sat, 5 Sep 2020 15:58:53 +0000 (17:58 +0200)]
avcodec/ffwavesynth: Fix integer overflow in wavesynth_synth_sample / WS_SINE

Fixes: signed integer overflow: -1429092 * -32596 cannot be represented in type 'int'
Fixes: 24419/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFWAVESYNTH_fuzzer-5157849974702080
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoconfigure: Add additional glslang libraries to make linking work
Philip Langdale [Mon, 17 Aug 2020 23:19:39 +0000 (16:19 -0700)]
configure: Add additional glslang libraries to make linking work

The latest builds of glslang introduce new libraries that need to be
linked for all symbols to be fully resolved.

This change will break building against older installations of glslang
and it's very hard to tell them apart as the library change upstream
was not accompanied by any version bump and no official release has
been made with this change it - just lots of people packaging up git
snapshots. So, apologies in advance.

3 years agoavfilter/vf_nnedi: use av_fopen_utf8()
Paul B Mahol [Mon, 7 Sep 2020 17:11:55 +0000 (19:11 +0200)]
avfilter/vf_nnedi: use av_fopen_utf8()

3 years agoavfilter/vf_lut3d: support remaping negative values in the prelut
Mark Reid [Sat, 5 Sep 2020 21:13:01 +0000 (14:13 -0700)]
avfilter/vf_lut3d: support remaping negative values in the prelut

3 years agofate: add wav chapters test
Paul B Mahol [Fri, 4 Sep 2020 18:45:53 +0000 (20:45 +0200)]
fate: add wav chapters test

3 years agoavcodec/jpegls: Remove unused structure
Andreas Rheinhardt [Fri, 4 Sep 2020 14:17:36 +0000 (16:17 +0200)]
avcodec/jpegls: Remove unused structure

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavformat/argo_asf: fix handling of v1.1 files
Zane van Iperen [Sat, 5 Sep 2020 11:30:12 +0000 (21:30 +1000)]
avformat/argo_asf: fix handling of v1.1 files

Version 1.1 (FX Fighter) files all have a sample rate of 44100
in the header, but only play back correctly at 22050.

Force the sample rate to 22050 when reading, and restrict it
when muxing.

3 years agoavdevice/lavfi: Remove redundant av_packet_unref()
Andreas Rheinhardt [Sun, 30 Aug 2020 05:12:47 +0000 (07:12 +0200)]
avdevice/lavfi: Remove redundant av_packet_unref()

Since bae8844e35147f92e612a9e0b44e939a293e5bc9, the AVPacket that is
intended to be used to return the demuxed packet is automatically
unreferenced when the demuxer returns an error. This makes an
av_packet_unref() in the lavfi demuxer redundant.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavdevice/lavfi: Use av_packet_pack_dictionary() to pack dictionary
Andreas Rheinhardt [Sun, 30 Aug 2020 05:02:16 +0000 (07:02 +0200)]
avdevice/lavfi: Use av_packet_pack_dictionary() to pack dictionary

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agotiff: remove tiff type check for ICC profiles
Lynne [Sat, 5 Sep 2020 19:07:33 +0000 (20:07 +0100)]
tiff: remove tiff type check for ICC profiles

Although the ICC specifications say to check for this, libtiff doesn't
and neither does any other TIFF implementation, and the TIFF specs
say that Photoshop has a different way to encapsulate ICC profiles,
and are asking for advice on how to deal with it.

So basically, photoshop puts a different type than what's specified,
no other implementation checks for this, we do because we tried to
follow the specs although its harmless to not, and ran into this bug
because we didn't know about it.

3 years agoavcodec/pixlet: postprocess luma using precalculated lut
Paul B Mahol [Sun, 6 Sep 2020 11:44:52 +0000 (13:44 +0200)]
avcodec/pixlet: postprocess luma using precalculated lut

Realtime decoding speed raises from 1.08 to 1.84 for
1504x846, 25391 kb/s, 24 fps video.

3 years agoavcodec/vp9dsp_template: Fix integer overflow in iadst8_1d()
Michael Niedermayer [Sun, 21 Jun 2020 22:24:55 +0000 (00:24 +0200)]
avcodec/vp9dsp_template: Fix integer overflow in iadst8_1d()

Fixes: signed integer overflow: 998938090 + 1169275991 cannot be represented in type 'int'
Fixes: 23411/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VP9_fuzzer-4644692330545152
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/avidec: Fix io_fsize overflow
Michael Niedermayer [Sun, 21 Jun 2020 22:09:05 +0000 (00:09 +0200)]
avformat/avidec: Fix io_fsize overflow

Fixes: signed integer overflow: 7958120835074169528 * 9 cannot be represented in type 'long long'
Fixes: 23382/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6230683226996736
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/tdsc: Only reallocate deflatebuffer if its size changed
Michael Niedermayer [Thu, 18 Jun 2020 10:26:08 +0000 (12:26 +0200)]
avcodec/tdsc: Only reallocate deflatebuffer if its size changed

Fixes: Timeout (47sec -> 35msec)
Fixes: 23375/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TDSC_fuzzer-5633949497032704
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/jpeglsenc: Remove redundant av_packet_unref()
Andreas Rheinhardt [Thu, 3 Sep 2020 17:44:44 +0000 (19:44 +0200)]
avcodec/jpeglsenc: Remove redundant av_packet_unref()

If encoding fails, the AVPacket that ought to contain the encoded packet
is already unreferenced generically.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavcodec/notchlc: simplify reading le16 in lz4_decompress
Paul B Mahol [Sat, 5 Sep 2020 11:00:43 +0000 (13:00 +0200)]
avcodec/notchlc: simplify reading le16 in lz4_decompress

3 years agoavformat/dashdec: drop arbitrary DASH manifest size limit
Jan Ekström [Thu, 3 Sep 2020 16:50:08 +0000 (19:50 +0300)]
avformat/dashdec: drop arbitrary DASH manifest size limit

Currently the utilized AVBPrint API is internally limited to unsigned
integers, so if we limit the file size as well as the amount to read
to UINT_MAX - 1, we do not require additional limiting to be performed
on the values.

This change is based on the fact that initially the 8*1024 value added
in 96d70694aea64616c68db8be306c159c73fb3980 was only for the case where
the file size was not known. It was not a maximum file size limit.

In 29121188983932f79aef8501652630d322a9974c this was reworked to be
a maximum manifest file size limit, while its commit message appears
to only note that it added support for larger manifest file sizes.

This should enable various unfortunately large MPEG-DASH manifests,
such as Youtube's multi-megabyte live stream archives to load up
as well as bring back the original intent of the logic.

3 years agolavf/img2dec: Auto-detect Kodak Photo CD image files.
Carl Eugen Hoyos [Sat, 5 Sep 2020 08:45:52 +0000 (10:45 +0200)]
lavf/img2dec: Auto-detect Kodak Photo CD image files.

3 years agoavcodec/dxtory: add frame threads support
Paul B Mahol [Sat, 5 Sep 2020 08:31:03 +0000 (10:31 +0200)]
avcodec/dxtory: add frame threads support

3 years agoavcodec/dxtory: add missed rgb555/rgb565 formats for vflip case
Paul B Mahol [Thu, 3 Sep 2020 22:29:08 +0000 (00:29 +0200)]
avcodec/dxtory: add missed rgb555/rgb565 formats for vflip case

3 years agoavcodec/dxtory: support subsampled formats with non-aligned size
Paul B Mahol [Thu, 3 Sep 2020 16:59:13 +0000 (18:59 +0200)]
avcodec/dxtory: support subsampled formats with non-aligned size

Also unbreak decoding after 6e1a167c556

3 years agoavcodec/photocd: Remove set-but-unused variables
Andreas Rheinhardt [Fri, 4 Sep 2020 19:46:09 +0000 (21:46 +0200)]
avcodec/photocd: Remove set-but-unused variables

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavcodec/mobiclip: Fix mixed declarations and code
Andreas Rheinhardt [Fri, 4 Sep 2020 19:31:58 +0000 (21:31 +0200)]
avcodec/mobiclip: Fix mixed declarations and code

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavcodec/binkaudio: Avoid allocation for array
Andreas Rheinhardt [Fri, 4 Sep 2020 14:52:49 +0000 (16:52 +0200)]
avcodec/binkaudio: Avoid allocation for array

The array in question can not be too large (only 26 elements), so it can
simply be put on the context.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavcodec/binkaudio: Remove unused array from context
Andreas Rheinhardt [Fri, 4 Sep 2020 14:42:28 +0000 (16:42 +0200)]
avcodec/binkaudio: Remove unused array from context

Unused since 7bfd1766d1c18f07b0a2dd042418a874d49ea60d.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavcodec/binkaudio: Don't use static storage for context-dependent data
Andreas Rheinhardt [Fri, 4 Sep 2020 14:16:15 +0000 (16:16 +0200)]
avcodec/binkaudio: Don't use static storage for context-dependent data

Move it to the context instead.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavcodec/bink: Only keep what is used from HpelDSPContext
Andreas Rheinhardt [Fri, 4 Sep 2020 15:29:28 +0000 (17:29 +0200)]
avcodec/bink: Only keep what is used from HpelDSPContext

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavcodec/bink: Combine allocations of arrays into one
Andreas Rheinhardt [Fri, 4 Sep 2020 16:30:22 +0000 (18:30 +0200)]
avcodec/bink: Combine allocations of arrays into one

Saves allocations, checks for the allocations as well as frees.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavcodec/bink: Fix memleak upon init failure
Andreas Rheinhardt [Fri, 4 Sep 2020 15:49:16 +0000 (17:49 +0200)]
avcodec/bink: Fix memleak upon init failure

The init function first allocates an AVFrame and then some buffers; if
one of the buffers couldn't be allocated, the AVFrame leaks. Solve this
by setting the FF_CODEC_CAP_INIT_CLEANUP flag.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavfilter/asrc_anullsrc: remove not useful function
Paul B Mahol [Fri, 4 Sep 2020 17:16:57 +0000 (19:16 +0200)]
avfilter/asrc_anullsrc: remove not useful function

3 years agoavfilter/vsrc_gradients: switch to activate
Paul B Mahol [Fri, 4 Sep 2020 16:50:57 +0000 (18:50 +0200)]
avfilter/vsrc_gradients: switch to activate

Allow to set the EOF timestamp.

3 years agoavfilter/asrc_anullsrc: switch to activate
Paul B Mahol [Fri, 4 Sep 2020 16:39:27 +0000 (18:39 +0200)]
avfilter/asrc_anullsrc: switch to activate

Allow to set the EOF timestamp.

3 years agoavfilter/asrc_anullsrc: add support to set output duration
Paul B Mahol [Fri, 4 Sep 2020 16:30:46 +0000 (18:30 +0200)]
avfilter/asrc_anullsrc: add support to set output duration

3 years agoavfilter/vf_alphamerge: use framesync
Paul B Mahol [Sun, 30 Aug 2020 21:07:17 +0000 (23:07 +0200)]
avfilter/vf_alphamerge: use framesync

3 years agoavfilter/src_movie: switch to activate
Paul B Mahol [Mon, 31 Aug 2020 17:10:43 +0000 (19:10 +0200)]
avfilter/src_movie: switch to activate

Allow to set the EOF timestamp.

3 years agoavfilter/af_arnndn: reduce size of second_check[] table
Paul B Mahol [Fri, 4 Sep 2020 15:39:18 +0000 (17:39 +0200)]
avfilter/af_arnndn: reduce size of second_check[] table

3 years agoavformat/yuv4mpegenc: Add const where appropriate
Andreas Rheinhardt [Fri, 4 Sep 2020 10:46:09 +0000 (12:46 +0200)]
avformat/yuv4mpegenc: Add const where appropriate

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavformat/yuv4mpegenc: Simplify writing global and packet headers
Andreas Rheinhardt [Fri, 4 Sep 2020 10:36:41 +0000 (12:36 +0200)]
avformat/yuv4mpegenc: Simplify writing global and packet headers

YUV4MPEG writes a string as header for both the file itself as well as
for every frame; these strings contain magic strings and these were up
until now included in the string to write via %s. Yet they are compile
time constants, so one can use the compile-time string concatentation
instead of inserting these strings at runtime.
Furthermore, the global header has been written via snprintf() to
a local buffer first before writing it. This can be simplified by using
avio_printf().

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
3 years agoavcodec: add PhotoCD decoder
Paul B Mahol [Sat, 29 Aug 2020 15:03:20 +0000 (17:03 +0200)]
avcodec: add PhotoCD decoder

3 years agoavformat/yuv4mpegenc: simplify writing the header
James Almer [Thu, 3 Sep 2020 18:39:32 +0000 (15:39 -0300)]
avformat/yuv4mpegenc: simplify writing the header

Actually write it in yuv4_write_header() instead of with the first
packet.

Signed-off-by: James Almer <jamrial@gmail.com>