From patchwork Thu Mar 22 15:05:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 8102 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp941010jad; Thu, 22 Mar 2018 08:08:12 -0700 (PDT) X-Google-Smtp-Source: AG47ELvHmGdyKVyHe16xfG/xTXs8c2mtcikcjgNc5FypR/rvfwkKCWVJSynnHh7xbg9ibsxxgVM1 X-Received: by 10.28.181.83 with SMTP id e80mr5413971wmf.147.1521731292819; Thu, 22 Mar 2018 08:08:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521731292; cv=none; d=google.com; s=arc-20160816; b=xrRAYIis2sX8SPmhaFNcZmF3+K0VSubzK9pp9iXCkkYFD3S7iBE5Ke6loBsX9Jy+fG E7bc2266ZKj3Kthf/UNDez76/E02TCNEGM8ACFvV00tjCfZGGUsw3SdwQPeuqoV4pBai /th2ibHhFxp+tiSTexGSvXqAmEumXAg8VWI0HhHnWexifB2ExgyBU8XCjB/H2lmkgw9w msRc+6KezQdYNpQGnOUBe4+ue3ypmf5qm8VGaccRO4RE8j3mM0+zuLmcnSikSLggqdEt Rt4wmfaUGXRGFlJEGpr73Cn/qzPIHIKfm3w1VfI9nCW7JgNA1dif9TUV0uUWL2LPHPEJ fCKw== 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:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=cG0JB9xoXJ2L8vwYMv89wWGjOye+/fxWoANtmuXJZ+4=; b=sZ4k8hJ1ypbkGla5MK3oSZsB7y/L+o8bewqbqE2lYMB7eoAw/LHumQWwwIZ5RlX/26 u7GsVhTVrvU9TcnUouV/MOewXXZ17j5jv/kMdxxaPG0md94RXLpbMrLqcUlj8KqEPOpQ LHn5oHz+eCU0hlEhy5sOP66WxflylLjPDbbH6nossbG7J0rlTFjw3/FUhqZIiw4QJZHb gZK8qeiMNTpXbOZNec2eQT/E4iAFQsveWhxa32bJlodhPQ1u43saJfoRsm+lpvD2Lea5 d09gcWz9ukNpszAXyDtM1zgXhUQWelYME1lKRL088t5s/Z5kUHnCFZo3PYCLFj/skKuO hcGw== 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 y35si5112859wrd.203.2018.03.22.08.08.12; Thu, 22 Mar 2018 08:08:12 -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 537D3689D23; Thu, 22 Mar 2018 17:07:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5AD33689C10 for ; Thu, 22 Mar 2018 17:07:41 +0200 (EET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Mar 2018 08:07:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,345,1517904000"; d="scan'208";a="37217062" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.13.18]) by orsmga003.jf.intel.com with ESMTP; 22 Mar 2018 08:07:53 -0700 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Mar 2018 23:05:33 +0800 Message-Id: <1521731134-24618-2-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1521731134-24618-1-git-send-email-zhong.li@intel.com> References: <1521731134-24618-1-git-send-email-zhong.li@intel.com> Subject: [FFmpeg-devel] [PATCH 2/3] lavu/hwcontext_qsv: Add support for pix_fmt RGB32. 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 , ChaoX A Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" RGB32 format may be used as overlay with alpha blending. So add RGB32 format support. Signed-off-by: ChaoX A Liu Signed-off-by: Zhong Li --- libavutil/hwcontext_qsv.c | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 0fefec3..dcaf072 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_RGB32,MFX_FOURCC_RGB4 }, { AV_PIX_FMT_P010, MFX_FOURCC_P010 }, { AV_PIX_FMT_PAL8, MFX_FOURCC_P8 }, }; @@ -731,6 +732,36 @@ 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: + 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_RGB32: + 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 +781,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 +824,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);