From patchwork Tue Feb 6 08:17:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 7518 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp3818665jai; Tue, 6 Feb 2018 00:18:00 -0800 (PST) X-Google-Smtp-Source: AH8x22425wc6y6pZ0vq48j8XygJrFWjRV180VCfJ7LCoIk/Qgdi7QollMRNCp977lNBF0JZFKian X-Received: by 10.28.84.87 with SMTP id p23mr1139175wmi.92.1517905080895; Tue, 06 Feb 2018 00:18:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517905080; cv=none; d=google.com; s=arc-20160816; b=XKMPeCapiyAIXwjHKX/wW+4YES2bt1I0ps4HOPtpZGMpCFJl2O4ntQcqNVK9JCIHrW a/vT37J8QBtEBECkIjLvYzZLK2+A5/goKpy1+hL3xcNN6ro3kjyEadncz7ifbkFqei4f b3CFFKHLptBJFJe8g7Ws70wETnldSsxvqe3JD29XHBofJRYud/yqPtYRcGBUarg9OIS8 Sha02gaIvY4EiZMN9bi6JtWRqfl+KcElLfMSDrFsHZYodGoay/frONUDyFsRIWbcyeq/ zBmqdNpypFX1oeDZokYfbD0F3HJF9zh+g2h7a6TsGd71tzx/cdgzPGFGxX9Dxcw+zwpN GHAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=zdYYn5GXYHDyB8+c4dOhRs2N1G4EAYJeUI3xOEWvkR8=; b=ZGuiPTSxhSfvKy6RLKR/9O2XSmkw8BGR0BhdCVmdZq9okC0kfGqQJ1XQRfZgHHX3Pk oaV/+IZto3PeEZcFbSFHWVIzVC0rS1y6WRyNkypVMlPsJi8obxfxjYAcFZSPwPlqVR0V r38YICawufj3Tvs7DJ0pwbOHGgi79hnScu0LTZVfKai2vODE6FeHsdYox4Ejoeq1799j FS0dJKEtMrPHHdRBrWMq3sMVW37S714Bvvy7YSW3W/ghm5OjwVfyb2NNElUSeDlKJU65 c9mLnXOjHDhcy7gbiFmKOvmcpqQWprZ8dGvQkTP6LW5wAkWa486kewOwK9ESzW+7pvof e31w== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h9si6623546wrc.145.2018.02.06.00.18.00; Tue, 06 Feb 2018 00:18:00 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D04C6680674; Tue, 6 Feb 2018 10:17:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AD556802CA for ; Tue, 6 Feb 2018 10:17:42 +0200 (EET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Feb 2018 00:17:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,467,1511856000"; d="scan'208";a="201713137" Received: from xhh-cfl64.sh.intel.com ([10.239.13.24]) by fmsmga006.fm.intel.com with ESMTP; 06 Feb 2018 00:17:46 -0800 From: Haihao Xiang To: FFmpeg development discussions and patches Date: Tue, 6 Feb 2018 16:17:17 +0800 Message-Id: <20180206081717.24564-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH] lavc/vaapi_encode: Don't return error if the underlying driver doesn't support B frame 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 Cc: Haihao Xiang , Mark Thompson MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It is possible B frame is not supported for VAEntrypointEncSliceLP and the underlying driver has advertised it, so it is better to disable B frame instead of returning error for this case Signed-off-by: Haihao Xiang --- libavcodec/vaapi_encode.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 550ea47991d..e371f5761ee 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1094,10 +1094,9 @@ static av_cold int vaapi_encode_config_attributes(AVCodecContext *avctx) goto fail; } if (avctx->max_b_frames > 0 && ref_l1 < 1) { - av_log(avctx, AV_LOG_ERROR, "B frames are not " - "supported (%#x).\n", attr[i].value); - err = AVERROR(EINVAL); - goto fail; + av_log(avctx, AV_LOG_WARNING, "B frames are not " + "supported (%#x) by the underlying driver.\n", attr[i].value); + avctx->max_b_frames = 0; } } break;