From patchwork Tue Jan 31 08:41:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 40188 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp4048085pzj; Tue, 31 Jan 2023 00:45:38 -0800 (PST) X-Google-Smtp-Source: AK7set/wQp1+6+642cSeu5KAkUB4Fkszlr+eguEnc/MAVcsml3ndY8Oza8Jz17/H0NwfPJ2c7oyc X-Received: by 2002:aa7:d30f:0:b0:4a2:46f3:467e with SMTP id p15-20020aa7d30f000000b004a246f3467emr7114716edq.30.1675154738419; Tue, 31 Jan 2023 00:45:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675154738; cv=none; d=google.com; s=arc-20160816; b=AFL8WwGjxg1xVNQY5bDevB5DmX01+MRl87N+eQPmswjtgDVd0ncsHjMpZlypo8mhik zsD9tWdwyILEOthZNdP0f0DpU+BvZB9voopiS+S4hb/hpPo0MoFG/Ox03Dc3XAMqP0Iz T7FJm+N6TB/H9fWe70Lvl84jT9st+X0N8tKE9Lh6dnQrb2tFlTsKBPvHv4glyiB9Ngui mtm3Quc4LacA3NsElp9E4tTtag5O0k/UD0LMKT7LNqLq94s72TssQfgLy8w2EjhNnYAj iqAMc4AIYy7gWqMzvnA/JblBODQiI1HjFWeRqr2T6qRDRc/q0OoU2LVShFO9ZThjWf2s bYXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=LXd17slXghuDluJnLn712mh9i8TH/cOqRXUeRbSBvyk=; b=vsFTTv6pcOGOvcSJYKc1W+1O4RFKVOOAimcO2TJPPohXVo6MuGMnQNfsQa21iATqBJ 20inFNDBXjdEMu4vWOWyFXjJODU06yKI5q4CFOKXzHCl7L+lZ0Dyvg0qM/HaHSw8X05I +VgPY94XULxujD64a96+IZA3Bk40/dwyW9ZDcAKp7iKbl2D+rkB5vyKmVMKaiZOizlEN 9zcLIYXEjnx8RGgdiBlMegj16+mxpa86SCgZfv3krnxweDJTIy/eaP6g9NBG45zpuQdb zV2VkvBTDX4NRZyIlHt0xKCaMHYqUm6XQJqOQ5kfIfJ5xhdIZxUuz/8H0oVsvd758rzc bCDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=kJBLFbvJ; 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 r5-20020a170906a20500b007309e8d567fsi18503701ejy.145.2023.01.31.00.45.17; Tue, 31 Jan 2023 00:45:38 -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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=kJBLFbvJ; 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 ED3D568BE2D; Tue, 31 Jan 2023 10:44:54 +0200 (EET) 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 200BF68BE19 for ; Tue, 31 Jan 2023 10:44:47 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675154693; x=1706690693; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+VJCShEMJ8PJENOYRj0d7zHoDaavjSiuSWJdko7fcPM=; b=kJBLFbvJFknMDl93YKVTd9G44H8sOAs2wikGVjkstkkgMeHfxMQ0T0UZ welkMd8/QmDRlkQAZQCL0MT4LkR6MXH6DUnHaX1SQxZepu2TTy8AdVsN5 cuLrSW00ipioqGApyVNMrlHmEq4ygJjtIP1kPvXVRqpX1m0EyRxcmYT3b 91lPrOQRV79Ub67MUNZIRp1JI87QSI8XR9jRd+OimODL9ZmQqZjRfUfTI 8isiHKxuJeo11oUi7fezT9c5ILMvFOcyUT9p03G2iiGk2Bi3m5l/6yXlY IES73BzYQzuIzZ+M6PEnIhbWsSFmGSK3eZL/Vh888EVgI8i//AoEsU6T6 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10606"; a="414003303" X-IronPort-AV: E=Sophos;i="5.97,259,1669104000"; d="scan'208";a="414003303" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jan 2023 00:44:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10606"; a="664421010" X-IronPort-AV: E=Sophos;i="5.97,259,1669104000"; d="scan'208";a="664421010" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.59]) by orsmga002.jf.intel.com with ESMTP; 31 Jan 2023 00:44:41 -0800 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Jan 2023 16:41:26 +0800 Message-Id: <20230131084126.613-3-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1.windows.2 In-Reply-To: <20230131084126.613-1-tong1.wu@intel.com> References: <20230131084126.613-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] qsv: remove CONFIG_VAAPI X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CNsu9tDD49Up Make 8-bit, 10-bit, 12-bit YUV 4:2:2 video sources as well as YUV 4:4:4 video sources supported by d3d11va and dxva2 just like what VAAPI does. Sign-off-by: Tong Wu --- libavcodec/qsv.c | 4 ---- libavutil/hwcontext_qsv.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 7af154202c..8eabf46b45 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -208,7 +208,6 @@ enum AVPixelFormat ff_qsv_map_fourcc(uint32_t fourcc) case MFX_FOURCC_P8: return AV_PIX_FMT_PAL8; case MFX_FOURCC_A2RGB10: return AV_PIX_FMT_X2RGB10; case MFX_FOURCC_RGB4: return AV_PIX_FMT_BGRA; -#if CONFIG_VAAPI case MFX_FOURCC_YUY2: return AV_PIX_FMT_YUYV422; case MFX_FOURCC_Y210: return AV_PIX_FMT_Y210; case MFX_FOURCC_AYUV: return AV_PIX_FMT_VUYX; @@ -217,7 +216,6 @@ enum AVPixelFormat ff_qsv_map_fourcc(uint32_t fourcc) case MFX_FOURCC_P016: return AV_PIX_FMT_P012; case MFX_FOURCC_Y216: return AV_PIX_FMT_Y212; case MFX_FOURCC_Y416: return AV_PIX_FMT_XV36; -#endif #endif } return AV_PIX_FMT_NONE; @@ -245,7 +243,6 @@ int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc, uint16_t *shi *fourcc = MFX_FOURCC_RGB4; *shift = 0; return AV_PIX_FMT_BGRA; -#if CONFIG_VAAPI case AV_PIX_FMT_YUV422P: case AV_PIX_FMT_YUYV422: *fourcc = MFX_FOURCC_YUY2; @@ -277,7 +274,6 @@ int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc, uint16_t *shi *fourcc = MFX_FOURCC_Y416; *shift = 1; return AV_PIX_FMT_XV36; -#endif #endif default: return AVERROR(ENOSYS); diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index ec0f72b329..ba0ac8cda5 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -115,7 +115,6 @@ static const struct { { AV_PIX_FMT_BGRA, MFX_FOURCC_RGB4, 0 }, { AV_PIX_FMT_P010, MFX_FOURCC_P010, 1 }, { AV_PIX_FMT_PAL8, MFX_FOURCC_P8, 0 }, -#if CONFIG_VAAPI { AV_PIX_FMT_YUYV422, MFX_FOURCC_YUY2, 0 }, { AV_PIX_FMT_Y210, @@ -142,7 +141,6 @@ static const struct { { AV_PIX_FMT_XV36, MFX_FOURCC_Y416, 1 }, #endif -#endif }; extern int ff_qsv_get_surface_base_handle(mfxFrameSurface1 *surf, @@ -1524,7 +1522,6 @@ static int map_frame_to_surface(const AVFrame *frame, mfxFrameSurface1 *surface) surface->Data.R = frame->data[0] + 2; surface->Data.A = frame->data[0] + 3; break; -#if CONFIG_VAAPI case AV_PIX_FMT_YUYV422: surface->Data.Y = frame->data[0]; surface->Data.U = frame->data[0] + 1; @@ -1556,7 +1553,6 @@ static int map_frame_to_surface(const AVFrame *frame, mfxFrameSurface1 *surface) // use the value from the frame. surface->Data.A = frame->data[0] + 6; break; -#endif default: return MFX_ERR_UNSUPPORTED; }