[FFmpeg-devel] [PATCH 02/25] fftools/ffmpeg_mux_init: restructure output stream creation
Anton Khirnov
anton at khirnov.net
Thu Apr 13 17:12:00 EEST 2023
Creating a new output stream of a given type is currently done by
calling new_<type>_stream(), which all start by calling
new_output_stream() to allocate the stream and do common init, followed
by type-specific init.
Reverse this structure - the caller now calls the common function
ost_add() with the type as a parameter, which then calls the
type-specific function internally. This will allow adding common code
that runs after type-specific code in future commits.
---
fftools/ffmpeg_mux_init.c | 89 +++++++++++++++------------------------
1 file changed, 35 insertions(+), 54 deletions(-)
diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index 69c1532b9e..714315cfd0 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -418,9 +418,6 @@ static MuxStream *mux_stream_alloc(Muxer *mux, enum AVMediaType type)
return ms;
}
-static OutputStream *new_output_stream(Muxer *mux, const OptionsContext *o,
- enum AVMediaType type, InputStream *ist);
-
static char *get_ost_filters(const OptionsContext *o, AVFormatContext *oc,
OutputStream *ost)
{
@@ -471,14 +468,13 @@ static void parse_matrix_coeffs(void *logctx, uint16_t *dest, const char *str)
}
}
-static OutputStream *new_video_stream(Muxer *mux, const OptionsContext *o, InputStream *ist)
+static void new_stream_video(Muxer *mux, const OptionsContext *o,
+ OutputStream *ost)
{
AVFormatContext *oc = mux->fc;
AVStream *st;
- OutputStream *ost;
char *frame_rate = NULL, *max_frame_rate = NULL, *frame_aspect_ratio = NULL;
- ost = new_output_stream(mux, o, AVMEDIA_TYPE_VIDEO, ist);
st = ost->st;
MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st);
@@ -703,17 +699,14 @@ static OutputStream *new_video_stream(Muxer *mux, const OptionsContext *o, Input
exit_program(1);
} else
check_streamcopy_filters(o, oc, ost, AVMEDIA_TYPE_VIDEO);
-
- return ost;
}
-static OutputStream *new_audio_stream(Muxer *mux, const OptionsContext *o, InputStream *ist)
+static void new_stream_audio(Muxer *mux, const OptionsContext *o,
+ OutputStream *ost)
{
AVFormatContext *oc = mux->fc;
AVStream *st;
- OutputStream *ost;
- ost = new_output_stream(mux, o, AVMEDIA_TYPE_AUDIO, ist);
st = ost->st;
@@ -801,49 +794,37 @@ static OutputStream *new_audio_stream(Muxer *mux, const OptionsContext *o, Input
#endif
} else
check_streamcopy_filters(o, oc, ost, AVMEDIA_TYPE_AUDIO);
-
- return ost;
}
-static OutputStream *new_data_stream(Muxer *mux, const OptionsContext *o, InputStream *ist)
+static void new_stream_data(Muxer *mux, const OptionsContext *o,
+ OutputStream *ost)
{
- OutputStream *ost;
-
- ost = new_output_stream(mux, o, AVMEDIA_TYPE_DATA, ist);
if (ost->enc_ctx) {
av_log(ost, AV_LOG_FATAL, "Data stream encoding not supported yet (only streamcopy)\n");
exit_program(1);
}
-
- return ost;
}
-static OutputStream *new_unknown_stream(Muxer *mux, const OptionsContext *o, InputStream *ist)
+static void new_stream_unknown(Muxer *mux, const OptionsContext *o,
+ OutputStream *ost)
{
- OutputStream *ost;
-
- ost = new_output_stream(mux, o, AVMEDIA_TYPE_UNKNOWN, ist);
if (ost->enc_ctx) {
av_log(ost, AV_LOG_FATAL, "Unknown stream encoding not supported yet (only streamcopy)\n");
exit_program(1);
}
-
- return ost;
}
-static OutputStream *new_attachment_stream(Muxer *mux, const OptionsContext *o, InputStream *ist)
+static void new_stream_attachment(Muxer *mux, const OptionsContext *o,
+ OutputStream *ost)
{
- OutputStream *ost = new_output_stream(mux, o, AVMEDIA_TYPE_ATTACHMENT, ist);
ost->finished = 1;
- return ost;
}
-static OutputStream *new_subtitle_stream(Muxer *mux, const OptionsContext *o, InputStream *ist)
+static void new_stream_subtitle(Muxer *mux, const OptionsContext *o,
+ OutputStream *ost)
{
AVStream *st;
- OutputStream *ost;
- ost = new_output_stream(mux, o, AVMEDIA_TYPE_SUBTITLE, ist);
st = ost->st;
if (ost->enc_ctx) {
@@ -856,12 +837,10 @@ static OutputStream *new_subtitle_stream(Muxer *mux, const OptionsContext *o, In
exit_program(1);
}
}
-
- return ost;
}
-static OutputStream *new_output_stream(Muxer *mux, const OptionsContext *o,
- enum AVMediaType type, InputStream *ist)
+static OutputStream *ost_add(Muxer *mux, const OptionsContext *o,
+ enum AVMediaType type, InputStream *ist)
{
AVFormatContext *oc = mux->fc;
MuxStream *ms;
@@ -1098,6 +1077,15 @@ static OutputStream *new_output_stream(Muxer *mux, const OptionsContext *o,
MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i,
ost->copy_initial_nonkeyframes, oc, st);
+ switch (type) {
+ case AVMEDIA_TYPE_VIDEO: new_stream_video (mux, o, ost); break;
+ case AVMEDIA_TYPE_AUDIO: new_stream_audio (mux, o, ost); break;
+ case AVMEDIA_TYPE_SUBTITLE: new_stream_subtitle (mux, o, ost); break;
+ case AVMEDIA_TYPE_DATA: new_stream_data (mux, o, ost); break;
+ case AVMEDIA_TYPE_ATTACHMENT: new_stream_attachment(mux, o, ost); break;
+ default: new_stream_unknown (mux, o, ost); break;
+ }
+
return ost;
}
@@ -1107,8 +1095,8 @@ static void init_output_filter(OutputFilter *ofilter, const OptionsContext *o,
OutputStream *ost;
switch (ofilter->type) {
- case AVMEDIA_TYPE_VIDEO: ost = new_video_stream(mux, o, NULL); break;
- case AVMEDIA_TYPE_AUDIO: ost = new_audio_stream(mux, o, NULL); break;
+ case AVMEDIA_TYPE_VIDEO: ost = ost_add(mux, o, AVMEDIA_TYPE_VIDEO, NULL); break;
+ case AVMEDIA_TYPE_AUDIO: ost = ost_add(mux, o, AVMEDIA_TYPE_AUDIO, NULL); break;
default:
av_log(mux, AV_LOG_FATAL, "Only video and audio filters are supported "
"currently.\n");
@@ -1190,7 +1178,7 @@ static void map_auto_video(Muxer *mux, const OptionsContext *o)
}
}
if (best_ist)
- new_video_stream(mux, o, best_ist);
+ ost_add(mux, o, AVMEDIA_TYPE_VIDEO, best_ist);
}
static void map_auto_audio(Muxer *mux, const OptionsContext *o)
@@ -1232,7 +1220,7 @@ static void map_auto_audio(Muxer *mux, const OptionsContext *o)
}
}
if (best_ist)
- new_audio_stream(mux, o, best_ist);
+ ost_add(mux, o, AVMEDIA_TYPE_AUDIO, best_ist);
}
static void map_auto_subtitle(Muxer *mux, const OptionsContext *o)
@@ -1267,7 +1255,7 @@ static void map_auto_subtitle(Muxer *mux, const OptionsContext *o)
input_descriptor && output_descriptor &&
(!input_descriptor->props ||
!output_descriptor->props)) {
- new_subtitle_stream(mux, o, ist);
+ ost_add(mux, o, AVMEDIA_TYPE_SUBTITLE, ist);
break;
}
}
@@ -1287,7 +1275,7 @@ static void map_auto_data(Muxer *mux, const OptionsContext *o)
continue;
if (ist->st->codecpar->codec_type == AVMEDIA_TYPE_DATA &&
ist->st->codecpar->codec_id == codec_id )
- new_data_stream(mux, o, ist);
+ ost_add(mux, o, AVMEDIA_TYPE_DATA, ist);
}
}
@@ -1336,18 +1324,8 @@ loop_end:
if(o-> data_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_DATA)
return;
- switch (ist->st->codecpar->codec_type) {
- case AVMEDIA_TYPE_VIDEO: new_video_stream (mux, o, ist); break;
- case AVMEDIA_TYPE_AUDIO: new_audio_stream (mux, o, ist); break;
- case AVMEDIA_TYPE_SUBTITLE: new_subtitle_stream (mux, o, ist); break;
- case AVMEDIA_TYPE_DATA: new_data_stream (mux, o, ist); break;
- case AVMEDIA_TYPE_ATTACHMENT: new_attachment_stream(mux, o, ist); break;
- case AVMEDIA_TYPE_UNKNOWN:
- if (copy_unknown_streams) {
- new_unknown_stream (mux, o, ist);
- break;
- }
- default:
+ if (ist->st->codecpar->codec_type == AVMEDIA_TYPE_UNKNOWN &&
+ !copy_unknown_streams) {
av_log(mux, ignore_unknown_streams ? AV_LOG_WARNING : AV_LOG_FATAL,
"Cannot map stream #%d:%d - unsupported type.\n",
map->file_index, map->stream_index);
@@ -1358,7 +1336,10 @@ loop_end:
"If you want them copied, please use -copy_unknown\n");
exit_program(1);
}
+ return;
}
+
+ ost_add(mux, o, ist->st->codecpar->codec_type, ist);
}
}
@@ -1392,7 +1373,7 @@ static void of_add_attachments(Muxer *mux, const OptionsContext *o)
avio_read(pb, attachment, len);
memset(attachment + len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- ost = new_attachment_stream(mux, o, NULL);
+ ost = ost_add(mux, o, AVMEDIA_TYPE_ATTACHMENT, NULL);
ost->attachment_filename = o->attachments[i];
ost->st->codecpar->extradata = attachment;
ost->st->codecpar->extradata_size = len;
--
2.39.1
More information about the ffmpeg-devel
mailing list