From patchwork Sun May 7 17:39:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Levinson X-Patchwork-Id: 3599 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp526228vsd; Sun, 7 May 2017 10:39:40 -0700 (PDT) X-Received: by 10.223.131.34 with SMTP id 31mr43487084wrd.95.1494178780757; Sun, 07 May 2017 10:39:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494178780; cv=none; d=google.com; s=arc-20160816; b=Vgs84ldK8ULbAtaDQyIfbNOKmCkPLRsudDxTUHzMUSnBhagv6If1AVwt1HtVWKzNOx J9VF+Y7G8UfdrsVVjngKgy6aU9JUJrjklB8SPNs6hHPpguuj85FTCIqJDAOYTOdev9W2 3J7tiXq1sSZp5BZC6l1Ax9Z6oODIbZ5lBGJ/Pe65MlJwXzh7nIY2xCSuCJY4ElwhNgQs L6t/AVap7qkewKDTvcZtkm7NGPwr5nhG6R3ktbaSppfUiInr0XREBgbwtH0XxbXw2Lks S49KTo4fyt7dnrn6cJ8/uG9J5aWAoL49v/6N+CbVRYNvKi6HCJw7Y4NxxBZ2vVIJBqNJ Yh+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:user-agent:date:message-id:from:to :delivered-to:arc-authentication-results; bh=47+oUKhfgI42ljFwYJcxdsJXGnP0GHBGOX1CLAKhUuo=; b=hrvQm5FYFI9LXqNiOnf6136mzeDU/OuCJle6e50Agi1AK5I9bgIZB4EV7NAGqJlLVB 4C//g8rSATE4MKe+s5d7DnpoLYcV57IZReBs23smSkQnnVB1ekb5yYlk8/BekQ4t8rf2 8gfRfN64XuBLkbYtijWWTxP/MCqYniVQ6C8SB13kDup2EEhkPLVi2M6dFOT97f1kj2R7 oRTbQjDbxVl6dbgiuQ9G3V0EHyvQ4j+JugTIrI5sWhDkcaOkFxSNDyziJUUDFiL3t/m7 lOl0FrHJ7l9/Ol6qaQGQH1pr+r3FpLSBO6qmWuIb28L/qfhweYJgDM4xK6CAGpYTqrRB 3vUQ== 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 g66si12119433wrd.178.2017.05.07.10.39.40; Sun, 07 May 2017 10:39:40 -0700 (PDT) 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 733D1688259; Sun, 7 May 2017 20:39:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from white.spiritone.com (white.spiritone.com [216.99.193.38]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 72D7D680384 for ; Sun, 7 May 2017 20:39:26 +0300 (EEST) Received: from [10.253.196.185] (unknown [96.89.110.217]) by white.spiritone.com (Postfix) with ESMTPSA id ACD77734057A for ; Sun, 7 May 2017 10:39:31 -0700 (PDT) To: FFmpeg development discussions and patches From: Aaron Levinson Message-ID: <25482358-d5ec-efb2-b49a-68996faf5295@aracnet.com> Date: Sun, 7 May 2017 10:39:29 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] qsvenc: Use MFXVideoENCODE_Query() to update the parameters 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" From 2882d77d76805e74fe139f6763f91c39746bebaf Mon Sep 17 00:00:00 2001 From: Aaron Levinson Date: Fri, 5 May 2017 18:49:57 -0700 Subject: [PATCH 1/2] qsvenc: Use MFXVideoENCODE_Query() to update the parameters Purpose: Fill out the default/unset parameters with ones actually in use. Note: Matches the current MediaSDK example code. This code used to be present in ffmpeg and was eliminated in revision 1f26a23 on Oct. 31, 2016 (qsv: Merge libav implementation, at https://github.com/FFmpeg/FFmpeg/commit/1f26a231bb065276cd80ce02957c759f3197edfa#diff-7d84a34d58597bb7aa4b8239dca1f9f8). Already applied to libav. Reviewed-by: Luca Barbato (cherry picked from commit b22094d74901fb3ac203c8322f8d84aded470bfb) Signed-off-by: Mark Thompson Signed-off-by: Aaron Levinson --- libavcodec/qsvenc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 9c385a79d8..68d4f5edd0 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -740,10 +740,18 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) if (ret < 0) return ret; + ret = MFXVideoENCODE_Query(q->session, &q->param, &q->param); + if (ret == MFX_WRN_PARTIAL_ACCELERATION) { + av_log(avctx, AV_LOG_WARNING, "Encoder will work with partial HW acceleration\n"); + } else if (ret < 0) { + return ff_qsv_print_error(avctx, ret, + "Error querying encoder params"); + } + ret = MFXVideoENCODE_QueryIOSurf(q->session, &q->param, &q->req); if (ret < 0) return ff_qsv_print_error(avctx, ret, - "Error querying the encoding parameters"); + "Error querying (IOSurf) the encoding parameters"); if (opaque_alloc) { ret = qsv_init_opaque_alloc(avctx, q);