virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity
112,559 Commits 37 Branches 400 Tags 470 MiB
ae72412aa8
Commit Graph

1195 Commits

Author SHA1 Message Date
Anton Khirnov
8f2e7e9dcf fftools/ffmpeg: stop explicitly closing output streams on input EOF 
Sending an empty packet already does that implicitly.
 2023-08-30 11:51:42 +02:00
Andreas Rheinhardt
9583a2c8eb fftools/ffprobe: Use proper enum type 
This is a bit cleaner as int need not be the underlying type
of an enum if a smaller type can hold all its values.
Also declare the children_ids array as const as it never changes.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
 2023-08-08 20:20:36 +02:00
Andreas Rheinhardt
739f24d833 fftools/opt_common: Don't add unnecessary " " 
Before:
D.AIL. smackaudio           Smacker audio (decoders: smackaud )
After:
D.AIL. smackaudio           Smacker audio (decoders: smackaud)

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
 2023-08-02 18:15:34 +02:00
Andreas Rheinhardt
41409405d4 fftools/opt_common: Use %c instead of %s to write single char 
Also combine multiple printfs.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
 2023-08-02 18:15:34 +02:00
Andreas Rheinhardt
0e9956a06e fftools/ffprobe: Fix memleak 
Fixes Coverity issue #1524491.
Regression since e6126abc69.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
 2023-08-01 16:31:13 +02:00
Anton Khirnov
e8777221f2 fftools/ffprobe: fix handling parse_options() return value 
Reviewed-by: James Almer <jamrial@gmail.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: James Almer <jamrial@gmail.com>
 2023-07-28 09:11:26 -03:00
Andreas Rheinhardt
071c625ad7 fftools/ffmpeg_opt: Reduce scope of variables for deprecated code 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
 2023-07-23 17:55:38 +02:00
Andreas Rheinhardt
8bb1bcf47d fftools/ffmpeg_opt: Fix leak on error 
Fixes Coverity id #1539096.

Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
 2023-07-23 17:55:38 +02:00
Andreas Rheinhardt
0368ded1a9 fftools/opt_common: Fix leak on error 
Fixes Coverity issue #743443.

Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
 2023-07-23 17:55:38 +02:00
Andreas Rheinhardt
2654347d7a fftools/ffmpeg_opt: Fix leak on error 
Fixes Coverity issue #1539097.

Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
 2023-07-23 17:55:38 +02:00
Andreas Rheinhardt
2a44c4bc9e fftools/ffmpeg_mux_init: Fix leak on error 
Fixes Coverity issue #1539098.

Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
 2023-07-23 17:55:38 +02:00
Anton Khirnov
ccc6849932 fftools/ffmpeg: stop calling exit_program() 
Remove exit_program() and register_exit(), as they are no longer used.
 2023-07-20 20:47:46 +02:00
Anton Khirnov
a81d9231b9 fftools/ffprobe: stop calling exit_program() 
Inline the relevant part of ffprobe_cleanup() into main() and drop the
rest.
 2023-07-20 20:47:46 +02:00
Anton Khirnov
be49c48282 fftools/ffprobe: inline opt_output_file() into its only caller 
There is no reason to keep them separate.

Also, replace exit_program() with returning an error code.
 2023-07-20 20:47:46 +02:00
Anton Khirnov
411e183360 fftools/opt_common: replace report_and_exit() with returning an error code 
Remove report_and_exit(), as it has no more users.
 2023-07-20 20:47:46 +02:00
Anton Khirnov
78699923ac fftools/ffplay: replace report_and_exit() with returning an error code 2023-07-20 20:47:46 +02:00
Anton Khirnov
140cb5a742 fftools/ffprobe: replace report_and_exit() with returning error codes 2023-07-20 20:47:46 +02:00
Anton Khirnov
83ace80bfd fftools/ffmpeg: return an error from MATCH_PER_STREAM_OPT() instead of aborting 2023-07-20 20:47:46 +02:00
Anton Khirnov
2f155b18a1 fftools/ffmpeg: return an error from assert_avoptions() instead of aborting 
Rename it to check_avoptions().
 2023-07-20 20:47:46 +02:00
Anton Khirnov
eda1fac27a fftools/cmdutils: return AVERROR_EXIT for OPT_EXIT options instead of aborting() 2023-07-20 20:47:46 +02:00
Anton Khirnov
8173623e39 fftools/ffmpeg: consolidate exiting from main() on error 2023-07-20 20:47:46 +02:00
Anton Khirnov
c56fabde27 fftools/ffmpeg_opt: consolidate printing errors in ffmpeg_parse_options() 2023-07-20 20:47:46 +02:00
Anton Khirnov
87f0333af1 fftools/cmdutils: add error handling to filter_codec_opts() 2023-07-20 20:47:46 +02:00
Anton Khirnov
6b8cf2505a fftools/cmdutils: constify the first parameter of filter_codec_opts() 2023-07-20 20:47:46 +02:00
Anton Khirnov
39d5104332 fftools: handle errors in parse_options() 2023-07-20 20:47:46 +02:00
Anton Khirnov
49ac7fc485 fftools: remove parse_time_or_die() 
Replace it with calling av_parse_time() directly, which provides
graceful error handling and more accurate error messages.
 2023-07-20 20:47:46 +02:00
Anton Khirnov
9cb47c78d6 fftools: return errors from parse_number_or_die() instead of aborting 
Rename the function to just parse_number().
 2023-07-20 20:47:40 +02:00
Anton Khirnov
4adbe2d219 fftools/opt_common: replace exit_program() with returning error codes 2023-07-20 20:40:26 +02:00
Anton Khirnov
a50f90f1c2 fftools/ffmpeg_opt: replace exit_program() with returning error codes 2023-07-20 20:40:26 +02:00
Anton Khirnov
6c6f13baf3 fftools/ffmpeg: return errors from find_codec_or_die() instead of aborting 
Rename the function to just find_codec().
 2023-07-20 20:40:26 +02:00
Anton Khirnov
2e6afa799e fftools/cmdutils: add error handling to GROW_ARRAY() 2023-07-20 20:40:26 +02:00
Anton Khirnov
b23abb7c48 fftools/cmdutils: add error handling to grow_array() 2023-07-20 20:40:26 +02:00
Anton Khirnov
6be4a29397 fftools/cmdutils: add error handling to allocate_array_elem() 2023-07-20 20:40:26 +02:00
Anton Khirnov
8eb5adeab8 fftools/cmdutils: drop unused ALLOC_ARRAY_ELEM() 2023-07-20 20:40:26 +02:00
Anton Khirnov
26e1e80152 fftools/ffmpeg_opt: reimplement -streamid using a dictionary 
This does not require an arbitrary limit on the number of streams.

Also, return error codes from opt_streamid() instead of aborting.
 2023-07-20 20:40:26 +02:00
Anton Khirnov
37abb3a419 fftools/cmdutils: return error codes from setup_find_stream_info_opts() instead of aborting 2023-07-20 20:40:26 +02:00
Anton Khirnov
13ebc9a0a9 fftools/ffmpeg_filter: replace remaining report_and_exit() with error codes 2023-07-20 20:40:26 +02:00
Anton Khirnov
cb8242db8d fftools/ffmpeg_filter: return error codes from set_channel_layout() instead of aborting 2023-07-20 20:40:26 +02:00
Anton Khirnov
5ba7aa2ce8 fftools/ffmpeg_filter: return error codes from fg_create() instead of aborting 2023-07-20 20:40:26 +02:00
Anton Khirnov
8db96808bc fftools/ffmpeg_filter: return error codes from choose_pix_fmts() instead of aborting 2023-07-20 20:40:26 +02:00
Anton Khirnov
8815adfe75 fftools/ffmpeg_filter: replace remaining exit_program() with error codes 2023-07-20 20:39:42 +02:00
Anton Khirnov
a52ee1aa47 fftools/ffmpeg_filter: return error codes from init_input_filter() instead of aborting 2023-07-20 20:30:13 +02:00
Anton Khirnov
ab16e324ea fftools/ffmpeg_filter: return error codes from ofilter_bind_ost() instead of aborting 2023-07-20 20:30:13 +02:00
Anton Khirnov
6298dd683b fftools/ffmpeg_dec: drop redundant handling of AVERROR_EXPERIMENTAL 
Normal error handling does the job just as well.
 2023-07-20 20:30:13 +02:00
Anton Khirnov
518b49a735 fftools/ffmpeg_dec: return error codes from dec_packet() instead of aborting 2023-07-20 20:30:13 +02:00
Anton Khirnov
e0f4259689 fftools/ffmpeg_mux: return errors from of_output_packet() instead of aborting 2023-07-20 20:30:13 +02:00
Anton Khirnov
2b4afe8169 fftools/ffmpeg_enc: return errors from encode_frame() instead of aborting 2023-07-20 20:30:13 +02:00
Anton Khirnov
43bcf631d0 fftools/ffmpeg_enc: return errors from enc_flush() instead of aborting 2023-07-20 20:30:13 +02:00
Anton Khirnov
dde3de0170 fftools/ffmpeg_enc: return errors from do_*_out() instead of aborting 2023-07-20 20:30:13 +02:00
Anton Khirnov
aa1173feee fftools/ffmpeg_enc: return errors from enc_open() instead of aborting 2023-07-20 20:30:13 +02:00
Anton Khirnov
80a64800ea fftools/ffmpeg_enc: return errors from enc_frame() instead of aborting 2023-07-20 20:30:13 +02:00
Anton Khirnov
c4b074676a fftools/ffmpeg_mux_init: avoid invalid memory access in set_dispositions() 
This function assumes AVMEDIA_* are always positive, while in fact it
can also handle AVMEDIA_TYPE_UNKNOWN, which is -1.
 2023-07-20 20:30:13 +02:00
Anton Khirnov
3a89e6d352 fftools/ffmpeg_filter: restrict reap_filters() to a single filtergraph 
This is more natural, as all except one of its callers require
processing only one filtergraph.
 2023-07-20 20:30:13 +02:00
Anton Khirnov
9d44eb8af5 fftools/ffmpeg_filter: stop accessing encoder from pixfmt selection 
ffmpeg CLI pixel format selection for filtering currently special-cases
MJPEG encoding, where it will restrict the supported list of pixel
formats depending on the value of the -strict option. In order to get
that value it will apply it from the options dict into the encoder
context, which is a highly invasive action even now, and would become a
race once encoding is moved to its own thread.

The ugliness of this code can be much reduced by moving the special
handling of MJPEG into ofilter_bind_ost(), which is called from encoder
init and is thus synchronized with it. There is also no need to write
anything to the encoder context, we can evaluate the option into our
stack variable.

There is also no need to access AVCodec at all during pixel format
selection, as the pixel formats array is already stored in
OutputFilterPriv.
 2023-07-20 20:30:13 +02:00
Anton Khirnov
037d364797 fftools/ffmpeg_filter: move "smart" pixfmt selection to ffmpeg_mux_init 
This code works on encoder information and has no interaction with
filtering, so it does not belong in ffmpeg_filter.
 2023-07-20 20:30:04 +02:00
Anton Khirnov
249bca763d fftools/ffmpeg_mux_init: handle pixel format endianness 
When -pix_fmt designates a BE/LE pixel format, it gets translated into
the native one by av_get_pix_fmt(). This may not always be the best
choice, as the encoder might only support one endianness. In such a
case, explicitly choose the endianness supported by the encoder.

While this is currently redundant with choose_pixel_fmt() in
ffmpeg_filter.c, the latter code will be deprecated in following commits.
 2023-07-20 20:30:04 +02:00
Andreas Rheinhardt
463a472426 fftools/ffmpeg_enc: Reindentate after the last commit 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
 2023-07-17 16:18:12 +02:00
Andreas Rheinhardt
bfe15b81b3 fftools/ffmpeg_enc: Remove always-true checks 
frame is always != NULL for audio and video here
(this is checked by an assert and the frame is already dereferenced
before it reaches this code here).
Fixes Coverity issue #1538858.

Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
 2023-07-17 16:14:41 +02:00
Anton Khirnov
153cf85b24 fftools/ffmpeg_mux_init: fix an array declaration 
map_func is supposed to be an array of const pointer to function
returning int, not an array of pointer to function returning const int.

Reported-By: Martin Storsjö
 2023-07-16 11:10:00 +02:00
Anton Khirnov
dff3a283cd fftools/ffmpeg: rework -enc_time_base handling 
Read the timebase from FrameData rather than the input stream. This
should fix #10393 and generally be more reliable.

Replace the use of '-1' to indicate demuxing timebase with the string
'demux'. Also allow to request filter timebase with
'-enc_time_base filter'.
 2023-07-15 11:02:11 +02:00
Anton Khirnov
4d06742b93 fftools/ffmpeg: add more structure to FrameData 
It now contains data from multiple sources, so group those items that
always come from the decoder. Also, initialize them to invalid values,
so that frames that did not originate from a decoder can be
distinguished.
 2023-07-15 11:02:11 +02:00
Anton Khirnov
75d0af388f fftools/ffmpeg_filter: make OutputFilter.filter private 
It should not be accessed from outside of filtering code.
 2023-07-15 11:02:11 +02:00
Anton Khirnov
9a97f9cf3a fftools/ffmpeg_enc: initialize audio/video encoders from frame parameters 
This is possible now that enc_open() is always called with a non-NULL
frame for audio/video.

Previously the code would directly reach into the buffersink, which is a
layering violation.
 2023-07-15 11:02:11 +02:00
Anton Khirnov
b295ec31f3 fftools/ffmpeg_filter: only flush vsync code if encoding actually started 
Otherwise this has no effect.

Will be useful in following commits.
 2023-07-15 11:02:11 +02:00
Anton Khirnov
0a6751a78a fftools/ffmpeg: rework initializing encoders with no frames 
When no frames were passed from a filtergraph to an encoder, but the
filtergraph is configured (i.e. has output parameters), encoder flush
code will use those parameters to initialize the encoder in a last-ditch
effort to produce some useful output.

Rework this process so that it is triggered by the filtergraph, which
now sends a dummy frame with parameters, but no data, to the encoder,
rather than the encoder reaching backwards into the filter.

This approach is more in line with the natural data flow from filters to
encoders and will allow to reduce encoder-filter interactions in
following commits.

This code is tested by fate-adpcm-ima-cunning-trunc-t2-track1, which (as
confirmed by Zane) is supposed to produce empty output.
 2023-07-15 11:02:11 +02:00
Anton Khirnov
20c42213ea fftools/ffmpeg_mux_init: drop an obsolete assignment 
This line was added in c30a4489b4 along with
AVStream.sample_aspect_ratio. However, configuring SAR for video
encoding is now done after this code (specifically in enc_open(), which
is called when the first video frame to be encoded is obtained), so this
line cannot have any meaningful effect.
 2023-07-15 11:02:11 +02:00
Anton Khirnov
c328bff4da fftools/ffmpeg_enc: return errors from enc_subtitle() instead of aborting 2023-07-15 11:02:11 +02:00
Anton Khirnov
2e742a2c3c fftools/ffmpeg_mux: return errors from of_streamcopy() instead of aborting 2023-07-15 11:02:11 +02:00
Anton Khirnov
464a5e8e76 fftools/ffmpeg: handle error codes from process_input_packet() 
None are returned for now, but that will change in future commits.
 2023-07-15 11:02:11 +02:00
Anton Khirnov
5fe3914c39 fftools/ffmpeg: return an error instead of aborting 2023-07-15 11:02:11 +02:00
Anton Khirnov
858b635613 fftools/ffmpeg_mux_init: replace all remaining aborts with returning error codes 
Mainly concerns new_stream_*() and their callees.
 2023-07-15 11:02:11 +02:00
Anton Khirnov
45473258ff fftools/ffmpeg_mux_init: return error codes from metadata processing instead of aborting 2023-07-15 11:02:11 +02:00
Anton Khirnov
dd44871eb9 fftools/ffmpeg_mux_init: improve of_add_programs() 
Replace duplicated(!) and broken* custom string parsing with
av_dict_parse_string(). Return error codes instead of aborting.

* e.g. it treats NULL returned from av_get_token() as "separator not
  found", when in fact av_get_token() only returns NULL on memory
  allocation failure
 2023-07-15 11:02:11 +02:00
Anton Khirnov
fd40197170 fftools/ffmpeg_mux_init: return error codes from validate_enc_avopt() instead of aborting 2023-07-15 11:02:11 +02:00
Anton Khirnov
4e3557aadb fftools/ffmpeg_mux_init: return error codes from parse_forced_key_frames() instead of aborting 2023-07-15 11:02:11 +02:00
Anton Khirnov
6691d131d8 fftools/ffmpeg_mux_init: return error codes from copy_meta() instead of aborting 2023-07-15 11:02:11 +02:00
Anton Khirnov
54cbe6f57d fftools/ffmpeg_mux_init: return error codes from ost_add() instead of aborting 2023-07-15 11:02:11 +02:00
Anton Khirnov
38a2fc2c29 fftools/ffmpeg_mux_init: move allocation out of prologue 
ost_add() has a very large variable declaration prologue, performing
"active" actions that can fail in there is confusing.
 2023-07-15 11:02:11 +02:00
Anton Khirnov
4e366100e9 fftools/ffmpeg_mux_init: return error codes from map_*() instead of aborting 2023-07-15 11:02:11 +02:00
Anton Khirnov
eee09cdf39 fftools/ffmpeg_mux_init: improve error handling in of_add_attachments() 
* return error codes instead of aborting
* avoid leaking the AVIOContext on failure
* check the return code of avio_read()
 2023-07-15 11:02:11 +02:00
Anton Khirnov
b3eedca5e5 fftools/ffmpeg_mux_init: return errors from create_streams() instead of aborting 2023-07-15 11:02:11 +02:00
Anton Khirnov
c23cff5a8a fftools/ffmpeg_demux: return errors from ist_add() instead of aborting 2023-07-15 11:02:11 +02:00
Anton Khirnov
cce294638b fftools/ffmpeg: return errors from assert_file_overwrite() instead of aborting 2023-07-15 11:02:11 +02:00
Anton Khirnov
2d59873fc1 fftools/ffmpeg_demux: add logging for -dump_attachment 
Makes it more clear what was written where.
 2023-07-15 11:02:11 +02:00
Anton Khirnov
63e4e8e4f4 fftools/ffmpeg_demux: forward errors from dump_attachment() instead of aborting 
Also, check the return code of avio_close().
 2023-07-15 11:02:11 +02:00
Anton Khirnov
ff0160cb37 fftools/ffmpeg_demux: drop a redundant avio_flush() 
It is immediately followed by avio_close(), which is documented to flush
the buffers.
 2023-07-15 11:02:11 +02:00
Anton Khirnov
ad80857a97 fftools/ffmpeg_demux: return errors from ifile_open() instead of aborting 2023-07-15 11:02:11 +02:00
Anton Khirnov
c313cdd70c fftools/ffmpeg_mux_init: return errors from of_open() instead of aborting 2023-07-15 11:02:11 +02:00
Anton Khirnov
9a2335444b fftools/ffmpeg_mux: forward EOF from the sync queue 
EOF from sq_receive() means no packets will ever be output by the sync
queue. Since the muxing sync queue is always used by all interleaved
(i.e. non-attachment) streams, this means no further packets can make
it to the muxer and we can terminate muxing now.
 2023-07-13 13:08:56 +02:00
Anton Khirnov
6a9d3f46c7 fftools/ffmpeg: drop an obsolete debug log 
The value it prints has not been cur_dts from lavf for a very long time,
so it's misleading.
 2023-07-11 19:28:18 +02:00
Anton Khirnov
57a42a714b fftools/ffmpeg_filter: consolidate calling avfilter_graph_set_auto_convert() 
Do not call it from choose_pix_fmts(), as that function is not supposed
to modify random filtergraph properties.
 2023-07-11 19:28:18 +02:00
Anton Khirnov
432399780a fftools/ffmpeg_filter: make OutputFile.{formats,ch_layouts,sample_rates} private 
They are not used outside of the filtering code.
 2023-07-11 19:28:18 +02:00
Anton Khirnov
a3ab5bf80d fftools/ffmpeg_filter: make OutputFile.width,height private 
They are not used outside of the filtering code.
 2023-07-11 19:28:18 +02:00
Anton Khirnov
c19aa9c28f fftools/ffmpeg_filter: make OutputFile.ch_layout private 
It is not used outside of the filtering code.
 2023-07-11 19:28:18 +02:00
Anton Khirnov
42f3f54cf4 fftools/ffmpeg_filter: make OutputFile.format/sample_rate private 
They are not used outside of the filtering code.
 2023-07-11 19:28:18 +02:00
Anton Khirnov
c9a99ffe51 fftools/ffmpeg_filter: make sure no input or output is bound twice 2023-07-11 19:28:18 +02:00
Marton Balint
7357012bb5 fftools/ffmpeg: fix negative timestamps at the beginning of the encoding 
Also fix a couple of possible overflows while at it.

Fixes the negative initial timestamps in ticket #10358.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2023-07-09 19:50:15 +02:00
QiTong Li
79f41a0760 fftools/ffplay: fix typo in frame_queue_destory 
Not sure if the function naming frame_queue_destory is intended because
"destory" is not really a word. Changing it to "destroy" makes more sense.

Signed-off-by: QiTong Li <liqitong@163.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2023-07-06 21:24:47 +02:00
James Almer
50f34172e0 fftools/ffplay: remove usage of internal AVInputFormat.read_seek field 
It's an internal field, so it should not be touched.

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: James Almer <jamrial@gmail.com>
 2023-07-02 19:04:25 -03:00
Anton Khirnov
1617d1a752 fftools/ffmpeg: pass subtitle decoder dimensions to sub2video 
Restores behavior from before 20cacfe493.
Eventually this should be handled similarly to audio/video - with a
filtergraph reset or a manual scaler.
 2023-06-19 09:48:56 +02:00