From: Niklas Haas <g...@haasn.dev> I preserved the no-op condition on `!ch_layouts`, even though I suspect it's not actually needed. --- fftools/ffmpeg_filter.c | 59 ++++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 13 deletions(-)
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index ac04841a16c..e617b9da289 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -724,7 +724,7 @@ static int ifilter_bind_dec(InputFilterPriv *ifp, Decoder *dec) static int set_channel_layout(OutputFilterPriv *f, OutputStream *ost) { - const AVCodec *c = ost->enc_ctx->codec; + const AVChannelLayout *ch_layouts; int i, err; if (ost->enc_ctx->ch_layout.order != AV_CHANNEL_ORDER_UNSPEC) { @@ -735,8 +735,14 @@ static int set_channel_layout(OutputFilterPriv *f, OutputStream *ost) return 0; } + err = avcodec_get_supported_config(ost->enc_ctx, NULL, + AV_CODEC_CONFIG_CHANNEL_LAYOUT, 0, + (const void **) &ch_layouts); + if (err < 0) + return err; + /* Requested layout is of order UNSPEC */ - if (!c->ch_layouts) { + if (!ch_layouts) { /* Use the default native layout for the requested amount of channels when the encoder doesn't have a list of supported layouts */ av_channel_layout_default(&f->ch_layout, ost->enc_ctx->ch_layout.nb_channels); @@ -744,13 +750,13 @@ static int set_channel_layout(OutputFilterPriv *f, OutputStream *ost) } /* Encoder has a list of supported layouts. Pick the first layout in it with the same amount of channels as the requested layout */ - for (i = 0; c->ch_layouts[i].nb_channels; i++) { - if (c->ch_layouts[i].nb_channels == ost->enc_ctx->ch_layout.nb_channels) + for (i = 0; ch_layouts[i].nb_channels; i++) { + if (ch_layouts[i].nb_channels == ost->enc_ctx->ch_layout.nb_channels) break; } - if (c->ch_layouts[i].nb_channels) { + if (ch_layouts[i].nb_channels) { /* Use it if one is found */ - err = av_channel_layout_copy(&f->ch_layout, &c->ch_layouts[i]); + err = av_channel_layout_copy(&f->ch_layout, &ch_layouts[i]); if (err < 0) return err; return 0; @@ -787,7 +793,11 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost, if (ost->enc_ctx->pix_fmt != AV_PIX_FMT_NONE) { ofp->format = ost->enc_ctx->pix_fmt; } else { - ofp->formats = c->pix_fmts; + ret = avcodec_get_supported_config(ost->enc_ctx, NULL, + AV_CODEC_CONFIG_PIX_FORMAT, 0, + (const void **) &ofp->formats); + if (ret < 0) + return ret; // MJPEG encoder exports a full list of supported pixel formats, // but the full-range ones are experimental-only. @@ -822,8 +832,16 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost, ofp->fps.framerate = ost->frame_rate; ofp->fps.framerate_max = ost->max_frame_rate; - ofp->fps.framerate_supported = ost->force_fps ? - NULL : c->supported_framerates; + + if (ost->force_fps) { + ofp->fps.framerate_supported = NULL; + } else { + ret = avcodec_get_supported_config(ost->enc_ctx, NULL, + AV_CODEC_CONFIG_FRAME_RATE, 0, + (const void **) &ofp->fps.framerate_supported); + if (ret < 0) + return ret; + } // reduce frame rate for mpeg4 to be within the spec limits if (c->id == AV_CODEC_ID_MPEG4) @@ -836,19 +854,34 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost, if (ost->enc_ctx->sample_fmt != AV_SAMPLE_FMT_NONE) { ofp->format = ost->enc_ctx->sample_fmt; } else { - ofp->formats = c->sample_fmts; + ret = avcodec_get_supported_config(ost->enc_ctx, NULL, + AV_CODEC_CONFIG_SAMPLE_FORMAT, 0, + (const void **) &ofp->formats); + if (ret < 0) + return ret; } if (ost->enc_ctx->sample_rate) { ofp->sample_rate = ost->enc_ctx->sample_rate; } else { - ofp->sample_rates = c->supported_samplerates; + ret = avcodec_get_supported_config(ost->enc_ctx, NULL, + AV_CODEC_CONFIG_SAMPLE_RATE, 0, + (const void **) &ofp->sample_rates); + if (ret < 0) + return ret; } if (ost->enc_ctx->ch_layout.nb_channels) { int ret = set_channel_layout(ofp, ost); if (ret < 0) return ret; - } else if (c->ch_layouts) { - ofp->ch_layouts = c->ch_layouts; + } else { + const AVChannelLayout *ch_layouts; + ret = avcodec_get_supported_config(ost->enc_ctx, NULL, + AV_CODEC_CONFIG_CHANNEL_LAYOUT, 0, + (const void **) &ch_layouts); + if (ret < 0) + return ret; + if (ch_layouts) + ofp->ch_layouts = ch_layouts; } break; } -- 2.44.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".