On Thu, May 21, 2020 at 4:09 AM Martin Storsjö <[email protected]> wrote: > > The framerate field is the one users are supposed to set, but not > all users might be setting it, so it might be good to fall back > time_base in that case. > --- > libavcodec/mfenc.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c > index 5f84f30987..dd8188dae3 100644 > --- a/libavcodec/mfenc.c > +++ b/libavcodec/mfenc.c > @@ -666,11 +666,19 @@ static int64_t mf_encv_output_score(AVCodecContext > *avctx, IMFMediaType *type) > static int mf_encv_output_adjust(AVCodecContext *avctx, IMFMediaType *type) > { > MFContext *c = avctx->priv_data; > + AVRational framerate; > > ff_MFSetAttributeSize((IMFAttributes *)type, &MF_MT_FRAME_SIZE, > avctx->width, avctx->height); > IMFAttributes_SetUINT32(type, &MF_MT_INTERLACE_MODE, > MFVideoInterlace_Progressive); > > - ff_MFSetAttributeRatio((IMFAttributes *)type, &MF_MT_FRAME_RATE, > avctx->framerate.num, avctx->framerate.den); > + if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { > + framerate = avctx->framerate; > + } else { > + framerate = av_inv_q(avctx->time_base); > + framerate.den *= avctx->ticks_per_frame; > + } > + > + ff_MFSetAttributeRatio((IMFAttributes *)type, &MF_MT_FRAME_RATE, > framerate.num, framerate.den); > > // (MS HEVC supports eAVEncH265VProfile_Main_420_8 only.) > if (avctx->codec_id == AV_CODEC_ID_H264) { > --
LGTM _______________________________________________ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
