From patchwork Thu Sep 6 09:25:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 10250 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp262298jap; Thu, 6 Sep 2018 02:24:17 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZzVNyGMdRaSNEieB+BMiZ6i1O8AMTfHtCZ/ddbLqFsAi5qID1pPNdUtqJhOsVX2BsVdIT+ X-Received: by 2002:a5d:4a44:: with SMTP id v4-v6mr1546365wrs.278.1536225857415; Thu, 06 Sep 2018 02:24:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536225857; cv=none; d=google.com; s=arc-20160816; b=yPtxTrf/4r89tHWrbnGaf51F/gkwCYMIda1qnTeGK/OnmASt5u1vjO4T/yDzfVddl+ oS7cW6CelkTCG7pwhYUXKHEcF61+56/c/w6b+g6Qn9UsOiYb75L0L9PmURTGqvPKDnRw lReyVGbR1m88DAUGL8cuUFeDZM2k6l7SPe9iUKrILtaMqI0TO4e5ndDAqBSikCj3P7Dp ufuImg0y4OO1JuPDBlr2XbBUdQzfJ1n7YFVCNa4eXb/cR71DoGuQZFQUNxYveSDviBdK Mo+yQngdIQyNNz7woGd11r3j/PCWtDNJ4SeutuTpxTdhQqJtD2bYS+ENnMASe0+YX0K/ hOnw== 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; bh=rSK+IQdQv/K8rH0wdAnrX2Ay3Tz0tUpCggm6uxN1Cvw=; b=g6wEsxr4f60QzuJ6RvAzqWc27rUX47A8GcTo5oXzj5f+rH8UMwME7Sefe4bg/vfsS6 TF646PGlVZHSsmUM6Vvg7/6CZNjB4gesE/W2ryW5tfOJ6AgXUNI2+LoCeoP9/T4dP80S lZZJiIe+fpf3LavUqhEr0+4VAsk6zrtFR0vC/tYkP2FZ71daLXdMJZPsQMHnYdxosoXn S9sFoMsxaIm89qTJ5aTJa1RQYNP7UPskAQVbwb6XOGM1faZGK2zrKIS/NsfVL4wpJDmC IfD7p8oHd7s23tw25MOig6YJPOuCdF2vAhUAkwLsh0Q3JWJflOy+mDdrbHXaD7tSl0vo hmPg== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 68-v6si3852308wra.134.2018.09.06.02.24.16; Thu, 06 Sep 2018 02:24:17 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 70A1F689EE9; Thu, 6 Sep 2018 12:24:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7125A680CE0 for ; Thu, 6 Sep 2018 12:24:01 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Sep 2018 02:24:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,337,1531810800"; d="scan'208";a="68808648" Received: from media_ffmpeg_skl_e3.sh.intel.com ([10.239.156.42]) by fmsmga008.fm.intel.com with ESMTP; 06 Sep 2018 02:24:06 -0700 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Sep 2018 17:25:13 +0800 Message-Id: <1536225913-20147-1-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] lavu/hwcontext_qsv: Add support for AV_PIX_FMT_BGRA. 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" RGB32(AV_PIX_FMT_BGRA on intel platforms) format may be used as overlay with alpha blending. So add AV_PIX_FMT_BGRA format support. Rename RGB32 to be BGRA to make it clearer as Mark Thompson's suggestion. V2: Add P010 format support else will introduce HEVC 10bit encoding regression. Thanks for LinJie's discovery. Signed-off-by: Zhong Li Verified-by: Fu, Linjie --- libavfilter/qsvvpp.c | 2 +- libavutil/hwcontext_qsv.c | 44 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 7ee1e56..06efdf5 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -142,7 +142,7 @@ static int pix_fmt_to_mfx_fourcc(int format) return MFX_FOURCC_NV12; case AV_PIX_FMT_YUYV422: return MFX_FOURCC_YUY2; - case AV_PIX_FMT_RGB32: + case AV_PIX_FMT_BGRA: return MFX_FOURCC_RGB4; } diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 250091c..fa7459c 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -90,6 +90,7 @@ static const struct { uint32_t fourcc; } supported_pixel_formats[] = { { AV_PIX_FMT_NV12, MFX_FOURCC_NV12 }, + { AV_PIX_FMT_BGRA, MFX_FOURCC_RGB4 }, { AV_PIX_FMT_P010, MFX_FOURCC_P010 }, { AV_PIX_FMT_PAL8, MFX_FOURCC_P8 }, }; @@ -731,6 +732,37 @@ static int qsv_transfer_data_child(AVHWFramesContext *ctx, AVFrame *dst, return ret; } +static int map_frame_to_surface(const AVFrame *frame, mfxFrameSurface1 *surface) +{ + switch (frame->format) { + case AV_PIX_FMT_NV12: + case AV_PIX_FMT_P010: + surface->Data.Y = frame->data[0]; + surface->Data.UV = frame->data[1]; + break; + + case AV_PIX_FMT_YUV420P: + surface->Data.Y = frame->data[0]; + surface->Data.U = frame->data[1]; + surface->Data.V = frame->data[2]; + break; + + case AV_PIX_FMT_BGRA: + surface->Data.B = frame->data[0]; + surface->Data.G = frame->data[0] + 1; + surface->Data.R = frame->data[0] + 2; + surface->Data.A = frame->data[0] + 3; + break; + + default: + return MFX_ERR_UNSUPPORTED; + } + surface->Data.Pitch = frame->linesize[0]; + surface->Data.TimeStamp = frame->pts; + + return 0; +} + static int qsv_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst, const AVFrame *src) { @@ -750,11 +782,7 @@ static int qsv_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst, } out.Info = in->Info; - out.Data.PitchLow = dst->linesize[0]; - out.Data.Y = dst->data[0]; - out.Data.U = dst->data[1]; - out.Data.V = dst->data[2]; - out.Data.A = dst->data[3]; + map_frame_to_surface(dst, &out); do { err = MFXVideoVPP_RunFrameVPPAsync(s->session_download, in, &out, NULL, &sync); @@ -797,11 +825,7 @@ static int qsv_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst, } in.Info = out->Info; - in.Data.PitchLow = src->linesize[0]; - in.Data.Y = src->data[0]; - in.Data.U = src->data[1]; - in.Data.V = src->data[2]; - in.Data.A = src->data[3]; + map_frame_to_surface(src, &in); do { err = MFXVideoVPP_RunFrameVPPAsync(s->session_upload, &in, out, NULL, &sync);