virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
113,960 Commits 39 Branches 425 Tags
b47b2c5b912558b639c8542993e1256f9c69e675
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Khirnov e2e2ee7711 fftools/ffplay: stop printing non-public AVCodecContext fields 
They are documented as not intended for caller use.
 2024-03-04 15:56:48 +01:00
Anton Khirnov 200f82e3f8 lavu/opt: get rid of useless read_number() calls 
The option type is known and fixed for all these, so reading the value
directly is simpler and more clear.
 2024-03-01 16:57:24 +01:00
Anton Khirnov 1ffa657a03 lavu/opt: simplify error handling in get_number() 2024-03-01 16:57:24 +01:00
Anton Khirnov 84ba46fa5e lavu/opt: drop an always-NULL argument to get_number() 2024-03-01 16:57:24 +01:00
Anton Khirnov 9fabdd64b2 lavu/opt: drop useless handling of NULL return from get_bool_name() 
That function always returns an actual string.
 2024-03-01 16:57:24 +01:00
Anton Khirnov 333cc9bff8 lavu/opt: factor out printing option default from opt_list() 2024-03-01 16:57:24 +01:00
Anton Khirnov 8904f35133 lavu/opt: simplify printing option type in opt_list() 2024-03-01 16:57:24 +01:00
Anton Khirnov 6456dd50a6 lavu/opt: cosmetics, group option reading function together 2024-03-01 16:57:24 +01:00
Anton Khirnov 2a3a33d04b lavu/opt: cosmetics, group option setting function together 2024-03-01 16:57:24 +01:00
Anton Khirnov cc0bd9da70 lavu/opt: cosmetics, group (un)init and management functions together 2024-03-01 16:57:24 +01:00
Anton Khirnov 067fde4966 lavu/opt: document AVOption.flags 2024-03-01 16:57:24 +01:00
Anton Khirnov 39a3a1c69b lavu/opt: cosmetics, move AV_OPT_FLAG_* out of AVOption 
Also drop an obsolete FIXME.
 2024-03-01 16:57:24 +01:00
Anton Khirnov 105a1bc150 lavu/opt: cosmetics, change option flags to (1 << N) style 
It is easier to read. Also, change their doxy comments to use the same
style.
 2024-03-01 16:57:24 +01:00
Anton Khirnov e48055fdce fftools/ffmpeg: remove options deprecated before 6.0 2024-03-01 16:51:11 +01:00
Anton Khirnov c19c2078f3 fftools/ffmpeg_sched: remove a triggerable assert in send_to_enc_sq() 
It can be triggered when send_to_enc_thread() returns AVERROR(ENOMEM).
Propagate the error to the caller instead.

Reported-by: Andreas Rheinhardt
 2024-02-24 11:51:41 +01:00
Anton Khirnov a00765fcbe fftools/ffmpeg_sched: simplify failure path in sch_dec_send() 2024-02-24 11:51:41 +01:00
Anton Khirnov a2fc86378a fftools/ffmpeg: declare loop indices inside loops 2024-02-24 11:51:41 +01:00
Anton Khirnov 29e1b9d90c fftools/cmdutils: remove harmful variable shadowing 
It causes write_option() to return 0 when calling func_arg() fails.
 2024-02-24 11:51:21 +01:00
Anton Khirnov a3f69cdec7 fftools/ffmpeg: cosmetics, vertically align structs 2024-02-21 10:33:20 +01:00
Anton Khirnov 6b6815b1c8 fftools/ffmpeg: move subtitle helpers to ffmpeg_dec, their only user 2024-02-21 10:31:27 +01:00
Anton Khirnov 826cfd9997 fftools/ffmpeg_filter: pass framerate through InputFilterOptions 
Rather than read it directly from InputStream.

This is a step towards avoiding the assumption that filtergraph inputs
are always fed by demuxers.
 2024-02-21 10:27:20 +01:00
Anton Khirnov fef3052df3 fftools/ffmpeg_filter: pass autorotate/reinit flags through InputFilterOptions 
Rather than read them directly from InputStream.

This is a step towards avoiding the assumption that filtergraph inputs
are always fed by demuxers.
 2024-02-21 10:27:20 +01:00
Anton Khirnov 6315f78e0c fftools/ffmpeg_filter: pass sub2video canvas size through InputFilterOptions 
Rather than read them directly from InputStream.

This is a step towards avoiding the assumption that filtergraph inputs
are always fed by demuxers.
 2024-02-21 10:27:20 +01:00
Anton Khirnov bd3c1c194b fftools/ffmpeg_filter: accept a name from its upstream input 
Do not construct the name manually from input file/stream indices.

This is a step towards avoiding the assumption that filtergraph inputs
are always fed by demuxers.
 2024-02-21 10:27:20 +01:00
Anton Khirnov 8f592eb35f fftools/ffmpeg_filter: compute input trim start/end in demuxer 
The computation is based on demuxer properties, so that is the more
appropriate place for it. Filter code just receives the desired
start time/duration.
 2024-02-21 10:27:20 +01:00
Anton Khirnov 09438d6529 fftools/ffmpeg_filter: stop taking display matrix from global side data 
It should never be necessary now that decoders propagate global side
data to frames.
 2024-02-21 10:27:20 +01:00
Anton Khirnov 75697836b1 Require compilers to support C11. 
It should be available in all relevant modern compilers and will allow
us to use features like anonymous unions.

Note that stdatomic.h is still emulated on MSVC, as current versions
require the /experimental:c11atomics, and do not support
ATOMIC_VAR_INIT() anyway.
 2024-02-18 07:38:28 +01:00
Anton Khirnov 86417b759f lavfi: get rid of FF_INTERNAL_FIELDS 
This hack is used to limit the visibility of some AVFilterLink fields to
only certain files. Replace it with the same pattern that is used e.g.
in lavf AVStream/FFStream and avoid exposing these internal fields in a
public header completely.
 2024-02-14 15:08:49 +01:00
Anton Khirnov 1e7d2007c3 all: use designated initializers for AVOption.unit 
Makes it robust against adding fields before it, which will be useful in
following commits.

Majority of the patch generated by the following Coccinelle script:

@@
typedef AVOption;
identifier arr_name;
initializer list il;
initializer list[8] il1;
expression tail;
@@
AVOption arr_name[] = { il, { il1,
- tail
+ .unit = tail
}, ...  };

with some manual changes, as the script:
* has trouble with options defined inside macros
* sometimes does not handle options under an #else branch
* sometimes swallows whitespace
 2024-02-14 14:53:41 +01:00
Anton Khirnov 1cc24d7495 lavc: deprecate avcodec_close() 
Its use has been discouraged since 2016, but now is no longer used in
avformat, so there is no reason to keep it public.
 2024-02-09 16:14:56 +01:00
Anton Khirnov ca18bb5972 lavf/demux: stop calling avcodec_close() 
Replace it with recreating the codec context.

This is the last remaining blocker for deprecating avcodec_close().
 2024-02-09 16:14:56 +01:00
Anton Khirnov 88ba22009e lavf/flacdec: stop accessing FFStream.avctx 
The demuxer opens an internal parser instance in read_timestamp(), which
requires a codec context. There is no need for it to access the FFStream
one which is used for other purposes, it can allocate its own internal
one.
 2024-02-09 16:14:56 +01:00
Anton Khirnov 0d54ae4012 lavf/mpegts: drop a cargo-culted check 
This check has survived the transition to AVCodecParameters, but is no
longer relevant after it, since the codec context is no longer updated
or accessed at all from the demuxer.
 2024-02-09 16:14:56 +01:00
Anton Khirnov 05fc6d3ce7 fftools/ffmpeg_demux: set stream index right before sending packet to scheduler 
This avoids assuming that it survives unchanged through bitstream
filters, if present.
 2024-02-09 16:14:24 +01:00
Anton Khirnov f80d91c051 tests/fate/ffmpeg: add a test for the issue fixed in previous commit 2024-02-05 11:55:12 +01:00
Anton Khirnov 931192226b fftools/ffmpeg_mux: fix terminating muxer on streamcopy with -t 
Reported-by: Andreas Rheinhardt
 2024-02-05 11:55:12 +01:00
Anton Khirnov aa3cfd4b5a lavc/bsf: add a showinfo filter 
Analogous to the (a)showinfo lavfi filters, logs basic packet
information. Mainly useful for debugging/testing/development.
 2024-02-02 15:41:54 +01:00
Anton Khirnov 70ecb8238c lavd: deprecate the bktr device 
It implements BSD-specific support for very old analog capture cards,
which are highly unlikely to be useful today. After being added in 2005,
there were never any commits to it beyond compilation fixes and generic
maintenance. There have also been zero trac tickets for this device, and
the only related web search result I found concludes that it does not
work.

The code also does some unacceptable things, like messing with signal
handlers and storing its state in global variables.
 2024-02-02 15:40:35 +01:00
Anton Khirnov 093be1fb06 fftools/ffmpeg: cosmetics, vertically align Input{File,Stream} 2024-01-30 09:52:00 +01:00
Anton Khirnov f4b76a1d6a fftools/ffmpeg: make InputStream.decoder_opts private to demuxer 
It is no longer used outside of ffmpeg_demux.
 2024-01-30 09:52:00 +01:00
Anton Khirnov 01c71b78eb fftools/ffmpeg: make InputStream.decoding_needed private to demuxer 
It is no longer used outside of ffmpeg_demux.
 2024-01-30 09:52:00 +01:00
Anton Khirnov 0d00e2e2f7 fftools/ffmpeg_dec: eliminate all remaining InputStream uses 
Previously, the demuxer would register decoder with the scheduler, using
InputStream as opaque, and pass the scheduling index to the decoder.

Now the registration is done by the decoder itself, using DecoderPriv as
opaque, and the scheduling index is returned to demuxer from dec_open().

decoder_thread() then no longer needs to be accessed from outside of
ffmpeg_dec and can be made static.
 2024-01-30 09:52:00 +01:00
Anton Khirnov fe3be6f78f fftools/ffmpeg_dec: stop passing InputStream to dec_open() 2024-01-30 09:52:00 +01:00
Anton Khirnov a0ca99ccb7 fftools/ffmpeg_dec: remove unnecessary InputStream arguments 2024-01-30 09:52:00 +01:00
Anton Khirnov 1b2c539a0f fftools/ffmpeg_dec: pass AVCodecParameters through DecoderOpts 
Do not retrieve it from InputStream directly.

This is a step towards decoupling Decoder and InputStream.
 2024-01-30 09:52:00 +01:00
Anton Khirnov b3d1916ba0 fftools/ffmpeg_dec: pass AVCodec through DecoderOpts 
Do not retrieve it from InputStream directly.

This is a step towards decoupling Decoder and InputStream.
 2024-01-30 09:52:00 +01:00
Anton Khirnov d5f9ef766b fftools/ffmpeg_dec: eliminate InputStream use in hw_device_setup_for_decode() 
The same information can also be obtained from the decoder itself.

This is a step towards decoupling Decoder and InputStream.
 2024-01-30 09:52:00 +01:00
Anton Khirnov 097f9ddbe9 fftools/ffmpeg_dec: pass decoder name through DecoderOpts 
Do not build it from InputStream values.

This is a step towards decoupling Decoder and InputStream.
 2024-01-30 09:52:00 +01:00
Anton Khirnov 9ba4bc87e6 fftools/ffmpeg_dec: pass top_field_first through DecoderOpts 
Do not read it from InputStream directly.

This is a step towards decoupling Decoder and InputStream.
 2024-01-30 09:52:00 +01:00
Anton Khirnov 9702817662 fftools/ffmpeg_dec: pass input timebase through DecoderOpts 
Do not read it from AVStream directly.

This is a step towards decoupling Decoder and InputStream.
 2024-01-30 09:52:00 +01:00
Anton Khirnov b27de18e4f fftools/ffmpeg_dec: move setting compute_edt to demuxer 
It is done based on demuxer information, so that is the more appropriate
place for this code.

This is a step towards decoupling Decoder and InputStream.
 2024-01-30 09:52:00 +01:00
Anton Khirnov 052c83e356 fftools/ffmpeg_dec: pass forced/estimated framerate though DecoderOpts 
Stop reading them from InputStream.

This is a step towards decoupling Decoder and InputStream.
 2024-01-30 09:52:00 +01:00
Anton Khirnov e0a6cb07b2 fftools/ffmpeg_dec: move flags to DecoderOpts 
Will be useful in the following commit.
 2024-01-30 09:52:00 +01:00
Anton Khirnov 4bdffec814 fftools/ffmpeg_dec: pass hwaccel options to the decoder in a separate struct 
Stop reading them from InputStream.

This is a step towards decoupling Decoder and InputStream.
 2024-01-30 09:52:00 +01:00
Anton Khirnov a3a9c4ae66 fftools/ffmpeg: move hwaccel_retrieve_data() from ffmpeg_hw to ffmpeg_dec 
This function is decoding-only and has no interaction with the rest of
ffmpeg_hw. It thus belongs more properly in ffmpeg_dec.
 2024-01-30 09:52:00 +01:00
Anton Khirnov ebb8a58c8f fftools/ffmpeg_dec: replace InputFile.format_nots with a decoder flag 
Reduces the need to access InputFile from decoding.

This is a step towards decoupling Decoder and InputStream.
 2024-01-30 09:52:00 +01:00
Anton Khirnov a938f47916 fftools/ffmpeg: refactor disabling decoder threading for attached pictures 
* as this decision is based on demuxing information, move it from the
  decoder to the demuxer
* as the issue being addressed is latency added by frame threading, we
  only need to disable frame threading, not all threading
 2024-01-30 09:52:00 +01:00
Anton Khirnov 474ca6c71e fftools/ffmpeg_dec: stop accesing InputStream.fix_sub_duration 
Pass this information to dec_open() instead.

This is a step towards decoupling Decoder and InputStream.
 2024-01-30 09:52:00 +01:00
Anton Khirnov 924a6f3cc7 fftools/ffmpeg_dec: override video SAR with AVCodecParameters value 
Rather than access the AVStream one.

This is a step towards decoupling Decoder and InputStream.
 2024-01-30 09:52:00 +01:00
Anton Khirnov b2a0a2e6f5 fftools/ffmpeg: move decoder existence check to a more appropriate place 2024-01-30 09:52:00 +01:00
Anton Khirnov 217b8757db fftools/ffmpeg_dec: drop a useless log message 2024-01-30 09:52:00 +01:00
Anton Khirnov 27de2aacd1 fftools/ffmpeg_dec: drop useless and racy code 
Setting demuxer's video_delay from the decoder cannot accomplish
anything meaningful and is racy, as they run in different threads.
 2024-01-30 09:52:00 +01:00
Anton Khirnov 9be3f80527 fftools/ffmpeg_dec: move decoding counters from InputStream to Decoder 
This is a step towards decoupling Decoder and InputStream.
 2024-01-30 09:52:00 +01:00
Anton Khirnov 5b0e4f945e fftools/ffmpeg_dec: pass decoder options as an argument to dec_open() 
Rather than access the dictionary in InputStream.

This is a step towards decoupling Decoder and InputStream.
 2024-01-30 09:52:00 +01:00
Anton Khirnov 7ecd45587f fftools/ffmpeg_dec: add an AVClass to Decoder 
Log decoder messages to the decoder rather than InputStream.

This is a step towards decoupling Decoder and InputStream.
 2024-01-30 09:52:00 +01:00
Anton Khirnov f2a2094c47 fftools/ffmpeg: make decoding AVCodecContext private to the decoder 2024-01-30 09:52:00 +01:00
Anton Khirnov d47bb91f8b fftools/ffmpeg_filter: consolidate decoder/filter type checks 
Also perform them earlier.
 2024-01-30 09:52:00 +01:00
Anton Khirnov b43d4a0692 fftools/ffmpeg_dec: export subtitle_header in Decoder 
This way the encoder does not need to access the decoder AVCodecContext,
which will allow to make it private in future commits.
 2024-01-30 09:52:00 +01:00
Anton Khirnov 3b84140a1b fftools/ffmpeg_dec: split Decoder into a private and public part 
Similar to what is currently done for other components, e.g. (de)muxers.
There is nothing in the public part currently, but that will change in
future commits.
 2024-01-30 09:51:57 +01:00
Anton Khirnov 0291b6f824 lavfi/vsrc_ddagrab: add an option to avoid duplicating frames 
Tested-by: Jiří Eliášek, Misha Aizatulin
 2024-01-30 09:32:39 +01:00
Anton Khirnov 887a7817b6 lavc: move bitstream filters into bsf/ subdir 2024-01-29 18:40:14 +01:00
Anton Khirnov e0da916b8f fftools/ffmpeg: optimize inter-thread queue sizes 
Use 8 packets/frames by default rather than 1, which seems to provide
better throughput.

Allow -thread_queue_size to set the muxer queue size manually again.
 2024-01-28 13:34:56 +01:00
Anton Khirnov bab7f91c36 tests/fate/ffmpeg: add a test for the issue fixed in previous commit 2024-01-27 09:24:29 +01:00
Anton Khirnov 1ea2e757f7 fftools/ffmpeg_filter: do not end filtering when a graph input EOFs 
There may be other inputs or sources in the filtergraph. Propagate the
EOF to the scheduler and continue filtering.

Fixes #10803
 2024-01-27 09:24:29 +01:00
Anton Khirnov 00013341df fftools/ffmpeg_sched: add filter API to signal EOF on input 2024-01-27 09:24:29 +01:00
Anton Khirnov 344d3a7d45 fftools/ffmpeg_opt: improve wording in option descriptions 2024-01-20 10:37:32 +01:00
Anton Khirnov 9cb52927b9 fftools/cmdutils: surround option arguments by <> in help output 
Makes it more clear that they are placeholders for actual values.
 2024-01-20 10:37:32 +01:00
Anton Khirnov 0b95e71aa0 fftools/ffmpeg_opt: briefly mention stream specifier syntax in help output 2024-01-20 10:37:32 +01:00
Anton Khirnov 68af3e37cc fftools/cmdutils: indicate specifiers in option syntax in help output 2024-01-20 10:37:32 +01:00
Anton Khirnov 43323c3802 fftools/ffmpeg_opt: add more structure to long help output 
Split the "Per-file main options" section into
* per-file input and output
* per-file input-only
* per-file output-only
* per-stream
 2024-01-20 10:37:32 +01:00
Anton Khirnov 67529ad8a4 fftools/cmdutils: drop alt_flags parameter from show_help_options() 
No user sets it to more than one flag, so it is redundant with
req_flags.
 2024-01-20 10:37:32 +01:00
Anton Khirnov 03aedbdd40 fftools/cmdutils: add a flag for per-stream options 
Not all OPT_SPEC options are per-stream, this will allow identifying
those that are, which will be useful in following commits.
 2024-01-20 10:37:32 +01:00
Anton Khirnov d8173cfcaf fftools/cmdutils: hide some information listing options from basic help 
They are for advanced usage only and should not clutter basic output.
 2024-01-20 10:37:32 +01:00
Anton Khirnov 08bebeb1be Revert "all: Don't set AVClass.item_name to its default value" 
Some callers assume that item_name is always set, so this may be
considered an API break.

This reverts commit 0c6203c97a.
 2024-01-20 10:34:48 +01:00
Anton Khirnov a8bc79c3fd fftools/ffmpeg: deprecate -filter_script 
It is equivalent to -/filter.
 2024-01-20 10:23:24 +01:00
Anton Khirnov c316c4c77b fftools/ffmpeg: deprecate -filter_complex_script 
It is equivalent to -/filter_complex.
 2024-01-20 10:23:24 +01:00
Anton Khirnov 6d17991b7e fftools/cmdutils: add option syntax for loading arbitrary arguments from a file 
Aligned with analogous feature for filter options in ffmpeg CLI.
 2024-01-20 10:23:24 +01:00
Anton Khirnov 8aed3911fc fftools/ffmpeg: make attachment filenames dynamically allocated 
Do not store the supplied arg pointer directly. While that is valid for
now, it will become ephemeral in the future commits.
 2024-01-20 10:23:24 +01:00
Anton Khirnov fcddd233fe fftools/ffplay: make option strings dynamically allocated 
Do not store the supplied arg pointer directly. While that is valid for
now, it will become ephemeral in the future commits.
 2024-01-20 10:23:24 +01:00
Anton Khirnov 4ce1987abc fftools/ffprobe: make option strings dynamically allocated 
Do not store the supplied arg pointer directly. While that is valid for
now, arg will become ephemeral in the future commits.
 2024-01-20 10:23:24 +01:00
Anton Khirnov 568dfed06f fftools/ffmpeg_opt: mark -stream_group as expert option 2024-01-19 17:54:10 +01:00
Anton Khirnov ae06111d74 fftools/ffmpeg_demux: implement -bsf for input 
Previously bitstream filters could only be applied right before muxing,
this allows to apply them right after demuxing.
 2024-01-19 17:54:10 +01:00
Anton Khirnov 6cb7295abf fftools/ffmpeg_demux: add demuxing thread private data 
To be used for data that never needs to be visible outside of the
demuxer thread, similarly as was previously done for other components.
 2024-01-19 17:54:10 +01:00
Anton Khirnov 50448ca290 fftools/ffmpeg_demux: only allocate the decoder when actually decoding 
It is not needed otherwise.
 2024-01-19 17:54:10 +01:00
Anton Khirnov 2ee1c6ffb2 fftools/ffmpeg_demux: set options on codec parameters rather than decoder 
This avoids the requirement to always have a decoder context.
 2024-01-19 17:54:10 +01:00
Anton Khirnov 7e33534506 fftools/ffmpeg_demux: do not set bitexact directly on the decoder 
Add it to decoder options instead, to be processed when opening the
decoder. This way it won't be overridden by flags the user might be
setting otherwise.
 2024-01-19 17:54:10 +01:00
Anton Khirnov cdb65857c3 doc/ffmpeg: drop documentation for non-existent -sbsf 2024-01-19 17:54:10 +01:00
Anton Khirnov f8939bad1e fftools/ffmpeg_demux: replace abort() by av_assert0(0) 
This is the standard way to mark unreachable cases in a switch
 2024-01-19 17:54:10 +01:00
Anton Khirnov 6325aede08 fftools/ffmpeg: remove deprecated -[av]bsf 
They were marked as deprecated over 10 years ago.
 2023-12-22 11:39:57 +01:00
Anton Khirnov 7f982065a8 fftools/ffmpeg: mark -vsync for future removal 
It has already been deprecated over a year ago.
 2023-12-22 11:39:57 +01:00