From patchwork Mon Jan 9 00:10:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 2129 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp6836625vsb; Sun, 8 Jan 2017 16:10:22 -0800 (PST) X-Received: by 10.194.89.36 with SMTP id bl4mr3438124wjb.66.1483920622162; Sun, 08 Jan 2017 16:10:22 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l90si8745476wmi.65.2017.01.08.16.10.21; Sun, 08 Jan 2017 16:10:22 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5310B68A5E5; Mon, 9 Jan 2017 02:10:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f47.google.com (mail-pg0-f47.google.com [74.125.83.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B3E5689776 for ; Mon, 9 Jan 2017 02:10:07 +0200 (EET) Received: by mail-pg0-f47.google.com with SMTP id 204so15954654pge.0 for ; Sun, 08 Jan 2017 16:10:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version; bh=HN7b8nNbr6d303FY3oPWw1z9aRLEjXtgF8FdE+JInvg=; b=i8gpJZOPwYRaKQmZ/AIPRf5oPvoSF1io6KpAILbwnq9mx8h0gy7MA5xOjT4dR28249 w0imht2XIZFjW6qPyjgfmnyNJ1azY2XyXi+H0hURTqVvIuGQ1HeHNMdxdNHV6+o566SZ Ozy9ffEtwJL8/s9r0LbT8fnteVCbjWJzWRw+dad8evuHAlosFscSid0vtVWxfuEfi55/ qBq78fP2vxaaZTWHeXmOOJn0athUZIM4w/5wfdTgCLUiR6Qmeci1nlq8xtogIUhC/d32 Ff1yQKtLQugrDRJliwvkPmhNE8wk+fzUTuCGwqqvIx3+6KqveIrp1ShokLSY7BrEbEVY TT6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version; bh=HN7b8nNbr6d303FY3oPWw1z9aRLEjXtgF8FdE+JInvg=; b=hjhJVN1sGwT1015fhQ9MwlON4tydD6t+EGBdSYyTEw8rtt/zWPflV7KBUuaoklSPFq m6X+1YySL9Mf+9kPKwQaDYtzS5HgVEubWn/5xQlI+SwCMuhH2jzGFTZ+5LiRp8KOKcDu nCr7t8A2XRzN5zkVSc05nr9qKjo1sWjxrA2ZtRgerU1Yu/ScKldaHmMR1ObwLKAKy9Iu zjpcsAziEkNYS49OnvvNwbcSdUuKuqXr+dNvg7Q/hr3RuAFU7H447AoG62O/POfGKHqs dYby+7rwaPuaZzjzqmy6qL7OnFC/DvbdVC54CK6BiOGVNgRuWtKVKqnMpPVI8b2RzOqq lfwQ== X-Gm-Message-State: AIkVDXIA2j+hknAU6v9bnlfQugP3SCK7VoQ7QMKVIfpRC84D+TSOUPwG065L46++tIJRUQ== X-Received: by 10.98.42.216 with SMTP id q207mr19911054pfq.74.1483920612743; Sun, 08 Jan 2017 16:10:12 -0800 (PST) Received: from [10.239.204.194] ([192.55.54.44]) by smtp.gmail.com with ESMTPSA id e1sm159571349pga.37.2017.01.08.16.10.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jan 2017 16:10:12 -0800 (PST) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: Date: Mon, 9 Jan 2017 08:10:10 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] lavc/vaapi_encode_h264: disable B frame in baseline profile. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" V2: rephrasing based on Moritz Barsnick's comments From f9e62cc90b546643419e394c09b93e901d517997 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Sun, 8 Jan 2017 11:01:32 +0800 Subject: [PATCH v2] lavc/vaapi_encode_h264: disable B frame in baseline profile. disable B frames when enabling baseline/constrined baseline profile, it's base on H.264 spec Annex A.2.1. Signed-off-by: Jun Zhao Signed-off-by: Yi A Wang --- libavcodec/vaapi_encode_h264.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 69cc483..00d8e6a 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -1190,9 +1190,19 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) switch (avctx->profile) { case FF_PROFILE_H264_CONSTRAINED_BASELINE: ctx->va_profile = VAProfileH264ConstrainedBaseline; + if (avctx->max_b_frames != 0) { + avctx->max_b_frames = 0; + av_log(avctx, AV_LOG_WARNING, "H.264 constrained baseline profile " + "doesn't support encoding with B frames, disabling them.\n"); + } break; case FF_PROFILE_H264_BASELINE: ctx->va_profile = VAProfileH264Baseline; + if (avctx->max_b_frames != 0) { + avctx->max_b_frames = 0; + av_log(avctx, AV_LOG_WARNING, "H.264 baseline profile " + "doesn't support encoding with B frames, disabling them.\n"); + } break; case FF_PROFILE_H264_MAIN: ctx->va_profile = VAProfileH264Main;