virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

fftools/ffmpeg_opt: factor auto-mapping data streams out of open_output_file()

Browse Source
This commit is contained in:
Anton Khirnov 2022-06-20 14:13:43 +02:00
parent 6bd98d9ed8
commit 85692aeecb
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fftools/ffmpeg_opt.c
View File

@ -2618,6 +2618,20 @@ static void map_auto_subtitle(OutputFile *of, AVFormatContext *oc,
} }
} }
static void map_auto_data(OutputFile *of, AVFormatContext *oc,
OptionsContext *o)
{
/* Data only if codec id match */
enum AVCodecID codec_id = av_guess_codec(oc->oformat, NULL, oc->url, NULL, AVMEDIA_TYPE_DATA);
for (int i = 0; codec_id != AV_CODEC_ID_NONE && i < nb_input_streams; i++) {
if (input_streams[i]->user_set_discard == AVDISCARD_ALL)
continue;
if (input_streams[i]->st->codecpar->codec_type == AVMEDIA_TYPE_DATA
&& input_streams[i]->st->codecpar->codec_id == codec_id )
new_data_stream(o, oc, i);
}
}
static int open_output_file(OptionsContext *o, const char *filename) static int open_output_file(OptionsContext *o, const char *filename)
{ {
AVFormatContext *oc; AVFormatContext *oc;
@ -2701,18 +2715,8 @@ static int open_output_file(OptionsContext *o, const char *filename)
map_auto_audio(of, oc, o); map_auto_audio(of, oc, o);
if (!o->subtitle_disable) if (!o->subtitle_disable)
map_auto_subtitle(of, oc, o); map_auto_subtitle(of, oc, o);
if (!o->data_disable)
/* Data only if codec id match */ map_auto_data(of, oc, o);
if (!o->data_disable ) {
enum AVCodecID codec_id = av_guess_codec(oc->oformat, NULL, filename, NULL, AVMEDIA_TYPE_DATA);
for (i = 0; codec_id != AV_CODEC_ID_NONE && i < nb_input_streams; i++) {
if (input_streams[i]->user_set_discard == AVDISCARD_ALL)
continue;
if (input_streams[i]->st->codecpar->codec_type == AVMEDIA_TYPE_DATA
&& input_streams[i]->st->codecpar->codec_id == codec_id )
new_data_stream(o, oc, i);
}
}
} else { } else {
for (i = 0; i < o->nb_stream_maps; i++) { for (i = 0; i < o->nb_stream_maps; i++) {
StreamMap *map = &o->stream_maps[i]; StreamMap *map = &o->stream_maps[i];