February 2020 - ffmpeg-cvslog

avfilter/vf_ssim: fix logic failure when comparing time bases
by Paul B Mahol 01 Feb '20

01 Feb '20

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Feb 1 21:09:32 2020 +0100| [89eee09739e02a73d7f247d0de4a403fecf64b01] | committer: Paul B Mahol avfilter/vf_ssim: fix logic failure when comparing time bases > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89eee09739e02a73d… --- libavfilter/vf_ssim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index c08fbcdcc2..7f10c52ca9 100644 --- a/libavfilter/vf_ssim.c +++ b/libavfilter/vf_ssim.c @@ -445,7 +445,7 @@ static int config_output(AVFilterLink *outlink) outlink->time_base = s->fs.time_base; - if (av_cmp_q(mainlink->time_base, outlink->time_base) && + if (av_cmp_q(mainlink->time_base, outlink->time_base) || av_cmp_q(ctx->inputs[1]->time_base, outlink->time_base)) av_log(ctx, AV_LOG_WARNING, "not matching timebases found between first input: %d/%d and second input %d/%d, results may be incorrect!\n", mainlink->time_base.num, mainlink->time_base.den,

1 0

avcodec/utils: remove extra brackets
by leozhang 01 Feb '20

01 Feb '20

ffmpeg | branch: master | leozhang <leozhang(a)qiyi.com> | Sat Feb 1 17:12:13 2020 +0800| [81d25e5bfc4be0c82cf2f9aec28d4ef6e3a5d270] | committer: Michael Niedermayer avcodec/utils: remove extra brackets Signed-off-by: leozhang <leozhang(a)qiyi.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81d25e5bfc4be0c82… --- libavcodec/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index ab48754a64..c685b9c9d7 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -556,11 +556,11 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code if (avcodec_is_open(avctx)) return 0; - if ((!codec && !avctx->codec)) { + if (!codec && !avctx->codec) { av_log(avctx, AV_LOG_ERROR, "No codec provided to avcodec_open2()\n"); return AVERROR(EINVAL); } - if ((codec && avctx->codec && codec != avctx->codec)) { + if (codec && avctx->codec && codec != avctx->codec) { av_log(avctx, AV_LOG_ERROR, "This AVCodecContext was allocated for %s, " "but %s passed to avcodec_open2()\n", avctx->codec->name, codec->name); return AVERROR(EINVAL);

1 0

libavcodec/amfenc_hevc.c: Fix constant QP settings for I, P
by OvchinnikovDmitrii 01 Feb '20

01 Feb '20

ffmpeg | branch: master | OvchinnikovDmitrii <ovchinnikov.dmitrii(a)gmail.com> | Tue Jan 28 19:23:43 2020 +0300| [843c24a400fa933cdb436eee113a6f501a0c3dd3] | committer: Mark Thompson libavcodec/amfenc_hevc.c: Fix constant QP settings for I, P > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=843c24a400fa933cd… --- libavcodec/amfenc_hevc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c index 7c9a33ab33..8b4d289fac 100644 --- a/libavcodec/amfenc_hevc.c +++ b/libavcodec/amfenc_hevc.c @@ -254,10 +254,10 @@ static av_cold int amf_encode_init_hevc(AVCodecContext *avctx) } if (ctx->qp_p != -1) { - AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_QP_I, ctx->qp_p); + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_QP_P, ctx->qp_p); } if (ctx->qp_i != -1) { - AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_QP_P, ctx->qp_i); + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_QP_I, ctx->qp_i); } AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_SKIP_FRAME_ENABLE, ctx->skip_frame);

1 0

lavc/h265_profile_level: Fix the default profile in ff_h265_guess_level
by Linjie Fu 01 Feb '20

01 Feb '20

ffmpeg | branch: master | Linjie Fu <linjie.fu(a)intel.com> | Wed Jan 15 14:54:43 2020 +0800| [f0287e120a1a3eb6a1ccd8aca0b980f567a62d72] | committer: Mark Thompson lavc/h265_profile_level: Fix the default profile in ff_h265_guess_level Default to using multiplication factors for Main profile. Introduced since cd3578a8e4e11e0ba021e621367a7974d6de5da0. Signed-off-by: Linjie Fu <linjie.fu(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0287e120a1a3eb6a… --- libavcodec/h265_profile_level.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h265_profile_level.c b/libavcodec/h265_profile_level.c index 70db1a52f6..d79c1ab204 100644 --- a/libavcodec/h265_profile_level.c +++ b/libavcodec/h265_profile_level.c @@ -188,7 +188,7 @@ const H265LevelDescriptor *ff_h265_guess_level(const H265RawProfileTierLevel *pt profile = NULL; if (!profile) { // Default to using multiplication factors for Main profile. - profile = &h265_profiles[3]; + profile = &h265_profiles[4]; } pic_size = width * height;

1 0