From patchwork Wed May 20 21:12:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 19787 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6ACFF44B555 for ; Thu, 21 May 2020 00:13:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3BA4B68ACD3; Thu, 21 May 2020 00:13:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74BCE68A315 for ; Thu, 21 May 2020 00:13:00 +0300 (EEST) Received: by mail-lf1-f66.google.com with SMTP id x22so3210445lfd.4 for ; Wed, 20 May 2020 14:13:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=YK0Kis2ZLidoWKkJzwO8CbbsyMsRMm32NY1jkht2Cbo=; b=2QvL5uMgaVfIdjAtigS1N3xgd1mYgM6uLUXawpob6CugL9MXF0tOypaDMPL4x/ejcE /26S8MkYROHdjMGsveDT/bGCt7KURFG/9Z/DR8amG6V1bfbArasQDBTOJH7SE/aC3aMU B/3RPZ8WkldelnocaPzoJv3v1fXyI5yJ0dmgc2a4whKTlBZJdCtGpl8qc0XqoGzx13ps AlrPUqkUX9HHkrhFZLxOFnfMS51qJWF899wHZqMXxOM3XPSJ6yDZcXINA0JV7HVBXKFT 4BDxBzTks57r0lWRTdUQozp2yggYpp741Wsqz51dD1XNRJMoYfgpbJ909GyogiZM0iJw jXKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=YK0Kis2ZLidoWKkJzwO8CbbsyMsRMm32NY1jkht2Cbo=; b=F+4ylwijfbwm5gyXHY+CUg7t4KRzNtDp1pwvQ2w5WBqjgTJvaMFKiAdqCLDCfjIeQ5 r8R3OaVF3dqg+AW2NCleeC/CbzwlUZ3tt25ib/KUVv5lRtJe74bVLd9wlf4GUv/O8gA7 i/a9QzHVmbE+n06ck7Esxh3wnId1m8qP6sxZd96NyfXM8yk5WzQkvtKVGN7aHDxyQ5yx vEl3NBLYviqO2jMgfYLDnkwF9cddECWrOs+Vm5Ci9fVOhijRv1PtqhXqfpRjEmubijAy wwG8s3NRAWteNUASacP7I29SMQoMhVchgcWC4rUsXHYmfEblnpe0P812GWqMvOrPtEbd AbGQ== X-Gm-Message-State: AOAM533WXDTJZKJZurUjUqGXIuFHAAA/LKSSvkCi0PkogIsCvtzWDrYn uX82gPABbYsEg4HvO9ckS2W8m6eKHP8= X-Google-Smtp-Source: ABdhPJxtBvelttkhsLniyBR5lG1EVnOr+ctRC9UeQtkiZjURl1F8U6WeHhXFFZqh1xMhUXlU/eQxsw== X-Received: by 2002:a19:990:: with SMTP id 138mr3399085lfj.135.1590009179107; Wed, 20 May 2020 14:12:59 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id s7sm1304817ljm.58.2020.05.20.14.12.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2020 14:12:58 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 May 2020 00:12:57 +0300 Message-Id: <20200520211257.4542-1-martin@martin.st> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] mfenc: Fix setting has_b_frames for max_b_frames == 1 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This was a mistake in my own additions in 050b72ab5ef318605b305aa6cb920e8b52f1002e. --- libavcodec/mfenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c index dd8188dae3..e62ae4019a 100644 --- a/libavcodec/mfenc.c +++ b/libavcodec/mfenc.c @@ -714,7 +714,7 @@ static int mf_encv_output_adjust(AVCodecContext *avctx, IMFMediaType *type) // "scenario" to "camera_record" sets it in CFR mode (where the default // is VFR), which makes the encoder avoid dropping frames. ICodecAPI_SetValue(c->codec_api, &ff_CODECAPI_AVEncMPVDefaultBPictureCount, FF_VAL_VT_UI4(avctx->max_b_frames)); - avctx->has_b_frames = avctx->max_b_frames > 1 ? 1 : 0; + avctx->has_b_frames = avctx->max_b_frames > 0 ? 1 : 0; ICodecAPI_SetValue(c->codec_api, &ff_CODECAPI_AVEncH264CABACEnable, FF_VAL_VT_BOOL(1));