Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

fftools/ffmpeg_mux_init: consolidate connecting source to mux stream

Browse source
This commit is contained in:
Anton Khirnov 2024-09-24 12:31:12 +02:00
parent ba06c7b08f
commit faa366003b
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
fftools/ffmpeg_mux_init.c
View file

@ -899,7 +899,8 @@ ost_bind_filter(const Muxer *mux, MuxStream *ms, OutputFilter *ofilter,
const OptionsContext *o, const OptionsContext *o,
AVRational enc_tb, enum VideoSyncMethod vsync_method, AVRational enc_tb, enum VideoSyncMethod vsync_method,
int keep_pix_fmt, int autoscale, int threads_manual, int keep_pix_fmt, int autoscale, int threads_manual,
const ViewSpecifier *vs) const ViewSpecifier *vs,
SchedulerNode *src)
{ {
OutputStream *ost = &ms->ost; OutputStream *ost = &ms->ost;
AVCodecContext *enc_ctx = ost->enc->enc_ctx; AVCodecContext *enc_ctx = ost->enc->enc_ctx;
@ -1005,12 +1006,9 @@ ost_bind_filter(const Muxer *mux, MuxStream *ms, OutputFilter *ofilter,
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = sch_connect(mux->sch, SCH_ENC(ms->sch_idx_enc), *src = SCH_ENC(ms->sch_idx_enc);
SCH_MSTREAM(mux->sch_idx, ms->sch_idx));
if (ret < 0)
return ret;
return ret; return 0;
} }
static int streamcopy_init(const OptionsContext *o, const Muxer *mux, static int streamcopy_init(const OptionsContext *o, const Muxer *mux,
@ -1188,6 +1186,7 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type,
OutputStream *ost; OutputStream *ost;
const AVCodec *enc; const AVCodec *enc;
AVStream *st; AVStream *st;
SchedulerNode src = { .type = SCH_NODE_TYPE_NONE };
AVDictionary *encoder_opts = NULL; AVDictionary *encoder_opts = NULL;
int ret = 0, keep_pix_fmt = 0, autoscale = 1; int ret = 0, keep_pix_fmt = 0, autoscale = 1;
int threads_manual = 0; int threads_manual = 0;
@ -1535,12 +1534,10 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type,
if (ost->enc && if (ost->enc &&
(type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)) { (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)) {
ret = ost_bind_filter(mux, ms, ofilter, o, enc_tb, vsync_method, ret = ost_bind_filter(mux, ms, ofilter, o, enc_tb, vsync_method,
keep_pix_fmt, autoscale, threads_manual, vs); keep_pix_fmt, autoscale, threads_manual, vs, &src);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
} else if (ost->ist) { } else if (ost->ist) {
SchedulerNode src;
ret = ist_use(ost->ist, !!ost->enc, NULL, &src); ret = ist_use(ost->ist, !!ost->enc, NULL, &src);
if (ret < 0) { if (ret < 0) {
av_log(ost, AV_LOG_ERROR, av_log(ost, AV_LOG_ERROR,
@ -1549,24 +1546,26 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type,
} }
ms->sch_idx_src = src.idx; ms->sch_idx_src = src.idx;
// src refers to a decoder for transcoding, demux stream otherwise
if (ost->enc) { if (ost->enc) {
ret = sch_connect(mux->sch, ret = sch_connect(mux->sch,
src, SCH_ENC(ms->sch_idx_enc)); src, SCH_ENC(ms->sch_idx_enc));
if (ret < 0) if (ret < 0)
goto fail; goto fail;
src = SCH_ENC(ms->sch_idx_enc);
ret = sch_connect(mux->sch, SCH_ENC(ms->sch_idx_enc),
SCH_MSTREAM(mux->sch_idx, ms->sch_idx));
if (ret < 0)
goto fail;
} else {
ret = sch_connect(mux->sch,
src, SCH_MSTREAM(ost->file->index, ms->sch_idx));
if (ret < 0)
goto fail;
} }
} }
if (src.type != SCH_NODE_TYPE_NONE) {
ret = sch_connect(mux->sch,
src, SCH_MSTREAM(mux->sch_idx, ms->sch_idx));
if (ret < 0)
goto fail;
} else {
// only attachment streams don't have a source
av_assert0(type == AVMEDIA_TYPE_ATTACHMENT && ms->sch_idx < 0);
}
if (ost->ist && !ost->enc) { if (ost->ist && !ost->enc) {
ret = streamcopy_init(o, mux, ost, &encoder_opts); ret = streamcopy_init(o, mux, ost, &encoder_opts);
if (ret < 0) if (ret < 0)