From patchwork Sat Dec 28 14:30:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 17022 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 3216644B082 for ; Sat, 28 Dec 2019 16:31:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1827768AABF; Sat, 28 Dec 2019 16:31:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-m965.mail.126.com (mail-m965.mail.126.com [123.126.96.5]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0893868A857 for ; Sat, 28 Dec 2019 16:30:51 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=KWQbho20exm8K5gU4j TjeFSacRoG5ECBqjS1uox7QKg=; b=OKvziq4DydWDBuvQpMHYfPGEFnRFoEY8O0 wu4GA2NFH8a+ioxsA24inVnsJtmGiisRTiHYzxABvs/i5I8Wv7I5UCQfcezEb7M8 Fhxaj0Ijt21pGMUQ9Rx5DJFEHtz1TWIethE5c20NfEijnO8doxuvcWH3am2aA4yK J3KN6CMig= Received: from localhost.localdomain (unknown [112.64.2.210]) by smtp10 (Coremail) with SMTP id NuRpCgDXeUcQZwde3uUKDQ--.131S3; Sat, 28 Dec 2019 22:30:46 +0800 (CST) From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Dec 2019 22:30:33 +0800 Message-Id: <20191228143033.9348-2-zhongli_dev@126.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191228143033.9348-1-zhongli_dev@126.com> References: <20191228143033.9348-1-zhongli_dev@126.com> X-CM-TRANSID: NuRpCgDXeUcQZwde3uUKDQ--.131S3 X-Coremail-Antispam: 1Uf129KBjvdXoWrtrWDWw4rWr1DZr1rGw4fAFb_yoWfJFb_X3 Z7G3WrK3WUZanFka1Fvwsxtry8WrZ7A3W093ZFyws7tFsrtr15J3srZFZa9w43uw42vrWr J3s0y3y3KF1qgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUUyEEUUUUUU== X-Originating-IP: [112.64.2.210] X-CM-SenderInfo: x2kr0wxolbvvby6rjloofrz/1tbiWBiZwF1w1vylzQAAs2 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/qsvdec: disable gpu copy when not supported 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: Zhong Li MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zhong Li --- libavcodec/qsvdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index baaf1f205f..fc25dc73e5 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -99,9 +99,11 @@ static int qsv_init_session(AVCodecContext *avctx, QSVContext *q, mfxSession ses int ret; if (q->gpu_copy == MFX_GPUCOPY_ON && - !(q->iopattern & MFX_IOPATTERN_OUT_SYSTEM_MEMORY)) + !(q->iopattern & MFX_IOPATTERN_OUT_SYSTEM_MEMORY)) { av_log(avctx, AV_LOG_WARNING, "GPU-accelerated memory copy " - "only works in MFX_IOPATTERN_OUT_SYSTEM_MEMORY.\n"); + "only works in system memory mode.\n"); + q->gpu_copy = MFX_GPUCOPY_OFF; + } if (session) { q->session = session; } else if (hw_frames_ref) {