virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
113,446 Commits 37 Branches 400 Tags 460 MiB
e0da916b8f
Commit Graph

1303 Commits

Author SHA1 Message Date
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
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
James Almer
d2eb6f4d44 fftools/ffmpeg_mux_init: don't free the AVDictionaryEntry until after it's been used 
Signed-off-by: James Almer <jamrial@gmail.com>
 2024-01-22 13:46:57 -03:00
James Almer
04a37e238f fftools/ffmpeg_mux_init: remove whitespaces from input arguments when parsing stream groups 
If the arguments are read from a file, things like line breaks could be present

Signed-off-by: James Almer <jamrial@gmail.com>
 2024-01-22 10:58:12 -03: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
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
Zhao Zhili
564a15b2ee fftools/ffplay_renderer: Add device selection support 
The device can be selected by GPU name or index. For example,

ffplay -hwaccel cuda \
	-vulkan_params device="NVIDIA GeForce RTX 3060" \
	foo.mp4

ffplay -hwaccel cuda -vulkan_params device="0" foo.mp4

Please note that select device by index only supported by hwcontext,
not by libplacebo.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
 2024-01-12 10:49:54 +08:00
Zhao Zhili
38aca1dc9a fftools/ffplay: fix missing hw_frames_ctx when config avfilter 
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
 2024-01-12 10:49:46 +08:00
Marton Balint
90bef6390f fftools/ffmpeg_filter: log an information message about filter graph reconfigurations 
Filter graph reconfigurations can cause nontrivial issues, e.g. PTS
discontinuities, so it is better to warn the user about them.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2024-01-07 22:47:22 +01:00
Marton Balint
324be730fc fftools/ffmpeg_filter: honor -reinit_filters 0 even on changed display matrix 
Not sure about honoring it also in case of a hwaccel change, so left that as is
for now.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2024-01-07 22:47:22 +01:00
xufuji456
6caf34dbe0 fftool/ffplay: avoid same name in local variable 
There is a warning in XCode:"Declaration shadows a local variable"

Signed-off-by: xufuji456 <839789740@qq.com>
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
 2024-01-05 02:11:21 +08:00
Niklas Haas
9613ba95c1 fftools/ffmpeg_filter: configure buffersrc with csp/range 
Propagates input metadata to the input filter graph.
 2023-12-31 13:35:35 -08:00
Niklas Haas
9d0f361f7f fftools/ffmpeg_filter: don't clear buffersrc params 
This memset is bogus, it accomplishes nothing in the best case and
regresses future additions to AVBufferSrcParameters in the worst case.
 2023-12-31 13:35:17 -08:00
Andreas Rheinhardt
0c6203c97a all: Don't set AVClass.item_name to its default value 
Unnecessary since acf63d5350adeae551d412db699f8ca03f7e76b9;
also avoids relocations.

Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
 2023-12-22 15:12:33 +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
Anton Khirnov
8d8c2b410f fftools/ffmpeg_opt: fix -dn flags 
It's a data, not video option.
 2023-12-22 11:39:57 +01:00
Anton Khirnov
84352c9891 fftools/ffmpeg_opt: print a section for data-stream options 
Only show it with show_advanced (triggered by -h long), since data
streams themselves are an advanced topic.
 2023-12-22 11:39:57 +01:00
Anton Khirnov
74df1b73d4 fftools/ffmpeg_opt: refine printing type-specific options 
* filter subtitle/data options out of main, video and audio sections
* add filters that were missing entirely from the subtitle section
* add a missing section for advanced subtitle options
 2023-12-22 11:39:57 +01:00
Anton Khirnov
0125cab385 fftools/ffmpeg_opt: mark more options as OPT_EXPERT 
Reduces the basic help output to a reasonable size and stops confusing
users with options the vast majority will not need.
 2023-12-22 11:39:57 +01:00
Anton Khirnov
c5a87d8bdb fftools/opt_common: mark some options as OPT_EXPERT 
So they don't clutter the standard help output.

-loglevel is marked because there is no need to show two options (-v and
-loglevel) that do the same thing.
 2023-12-22 11:39:57 +01:00
Anton Khirnov
86e8439994 fftools/ffmpeg_opt: update program description to match manpage 
Cf. 2244722f1f
 2023-12-22 11:39:57 +01:00
Anton Khirnov
41716214c2 fftools/ffmpeg: improve WARN_MULTIPLE_OPT_USAGE() 
Currently it requires every single OPT_SPEC option to be accompanied by
an array of alternate names for this option. The vast majority of
options have no alternate names, resulting in a large numbers of
unnecessary single-element arrays that merely contain the option name.

Extend the option parsing API to allow marking options as having
alternate names, or as being the canonical name for some existing
alternatives. Use this new information to avoid the need for
abovementioned unnecessary single-element arrays.
 2023-12-22 11:39:57 +01:00
Anton Khirnov
148fac277a fftools/ffmpeg: change the MATCH_PER_TYPE_OPT macro into a function 
There is no reason for it to be a macro anymore, this makes the code
using it cleaner and simpler.
 2023-12-22 11:39:57 +01:00
Anton Khirnov
0ba70a6792 fftools/cmdutils: add a struct for a list of SpecifierOpt 
Significantly simplifies the code dealing with OPT_SPEC.
 2023-12-22 11:39:57 +01:00
Anton Khirnov
5792382269 fftools/cmdutils: check valid flags for OPT_TYPE_FUNC 
SPEC and OFFSET do not make sense for functions.
 2023-12-22 11:39:57 +01:00
Anton Khirnov
2f1bc3b424 fftools/cmdutils: include OPT_PERFILE in OPT_OFFSET 
And analogously OPT_OFFSET in OPT_SPEC. Previously the inclusion would
be implicit and required all code to remember this.
 2023-12-22 11:39:57 +01:00
Anton Khirnov
66fcfc0009 fftools/cmdutils: renumber option flags sequentially 
Also, document them.
 2023-12-22 11:39:57 +01:00
Anton Khirnov
5b1b132072 fftools/cmdutils: rename HAS_ARG to OPT_FUNC_ARG 
For consistent namespacing with other option flags. Also, document and
enforce that it can only be set for func-type options.
 2023-12-22 11:39:57 +01:00