From patchwork Tue Oct 22 12:48:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52444 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:143:b0:48e:c0f8:d0de with SMTP id h3csp3344415vqi; Tue, 22 Oct 2024 05:59:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWOcztM/3lJY+lfBIHeYZWB1ha2/WmYXpWNb8zdpC1wKd7Nhb31Nc4Qy9XoQfb5kXmslOoDCjn2iKZzLRmwvhcI@gmail.com X-Google-Smtp-Source: AGHT+IEbCN9kaSo2nZhCjquvAtR/nc8+NGaKv3ZE8jIy50oQGpfgoCb2tGsoBB2r029S67RQPM8K X-Received: by 2002:a05:6402:2681:b0:5c5:b9bb:c67d with SMTP id 4fb4d7f45d1cf-5ca0ac43e1bmr5370775a12.1.1729601945984; Tue, 22 Oct 2024 05:59:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729601945; cv=none; d=google.com; s=arc-20240605; b=XiPxW8nP0NI1BvZxe2LZ/VHaaECamTKN26bWOIN29Bf3EMb77jhusitLVuXI9oOvH1 lv/posTf4LfijMscqa+858u5Zy21f/r8i6eeWrchmSgflyJfFYcwizrj+KxAuwbV12Vz TMrZ5PO0AM3WBLEHcNfgG2nZpd8RmPqB4gKx7/vnKLOxPGWMLmPQILshmm5t4fFzudZb fvY8+2jemSYLJm/CzRDqdYrVTiDynu6GDhP9UcPMjovy74R8PLWps8mB1b5c2xFkGd7J SQkvzM195Yu/A9VhxJq24nLkKz6i8mV+CwihxkcxphXxFiRKXdKM13OWgRiyqO7K7pXD 0hLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=pXYmJE9eYA1W56ucfZPzoOu/vf4JxnPUuxEHPDL89i0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=YWL7FMJbN5+LrqABxq9M32AobM+M32ziXwXOwxt98vmZF5uasIv5urE7txJDzqL2id 7N4Mkl81p1QupWaF0JhTx/uuBDhmfyTnFtWLwJ7B0k6x65977liyoaPQfJX1IqtzTzDO i2skjFpKraTrNrVg017uco0ZN8LKcmrDlJ2jQ43SEUQoORniaINs+gHJzruJ9JuMEIo9 vGZdCeCOMUQX4E9NdkJvtUczLYly8OJ9YT6zXWyeaLO1GHnCBqgFjhKkW5CLX3KhxiRq hlQt7v4syvfQQRnK1rCl1yghTX+pTpXy2YIWeGVcWBNwH9tT3j7s9k20Q4w3NjtkByAF gE8g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=HCpydiOl; 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=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5cb66c7b3f8si4119873a12.447.2024.10.22.05.59.05; Tue, 22 Oct 2024 05:59:05 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=HCpydiOl; 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=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9DC4E68DDE5; Tue, 22 Oct 2024 15:49:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9A3168D892 for ; Tue, 22 Oct 2024 15:49:03 +0300 (EEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-71e953f4e7cso3743568b3a.3 for ; Tue, 22 Oct 2024 05:49:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729601341; x=1730206141; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=oCtOShc61J6jq7IKwR8hqSV9yOoacsArKFc6YiNlyG0=; b=HCpydiOlEzlUqLm8ahZusROeAzSW4+nSGBKtLXsSlU0sdA71hP5ZYVKJ4sebI31MjM 3TtRoy39bAh/Ha7Kts3x7GgOkPsmpMOZyBIXf1P6EOX0JGa+btNHIJ3gSIWwjz9DiQjj ZqkWdIM+XuCKNLCTiWumfgeRq6dcz6LjYDC+S71XBlKYOwkOrHJ9f5nVdCOW2RKLbum9 L2K5k0KOOp2Gnypkjpr2SL66TB5AfZwrnB/3hRN7QbYF8r+jV+gTGe+Tc3G+0b10lAuv GJB2WM/oTGmyzSSKIHqVYiHA0ylX+V+5h82YpnViu7SC3w5hh7m4pjk7TtkQcIeqOcf/ 0ylQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729601341; x=1730206141; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oCtOShc61J6jq7IKwR8hqSV9yOoacsArKFc6YiNlyG0=; b=ew+4r/bzHxSvqFqwkleKwb3vz0GeCbenbmZPoOru8qjjy8dUWTxHubrhbnTTkUSC66 OncluwzFud/VHcoiRSVzH8rBhcp3az8VoHFH4y7jMKGShON8y8a8Fa0ibv/fEr209BDQ RtTIedQnPGP5CXEeLGNw7Z6vukvGDvw0AE39C0aumc4vbPyNUnHpCsmzt64grOf99ftH qbRbVOpUSTWbHrU6z1JimHZjzYZBY1Et0TrtgLzbR2GGbr+f63Lnp5m3HK6mzO4VI6E8 lFKvVOwE22KJcRUaWcTPrHbjOOjd8xbgOYRldDzgi3thTkyD+Dwcby5ooGS1B1ciTtDW ua1Q== X-Gm-Message-State: AOJu0YysXcIXbnWDCdf+4C9aTLar4JL+YdkzmCOaYSRygUkR1tcVlv2r GLMZfK9qGX63Uf7+CVe7vxvIXho3TCPB4gE3OovBrsf1CWKuzO0TDm77Og== X-Received: by 2002:a05:6a00:1a8a:b0:71e:ba5:820e with SMTP id d2e1a72fcca58-71ea322dcc5mr20786990b3a.27.1729601341489; Tue, 22 Oct 2024 05:49:01 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71ec13ea0e8sm4802456b3a.145.2024.10.22.05.49.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 05:49:01 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Oct 2024 09:48:46 -0300 Message-ID: <20241022124847.14314-5-jamrial@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241022124847.14314-1-jamrial@gmail.com> References: <20241022124847.14314-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] libavutil/hwcontext_qsv: use the Y216 pixel format 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kDQB49ku1kwb Signed-off-by: James Almer --- libavcodec/qsv.c | 8 ++++---- libavutil/hwcontext_qsv.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 8a3dc95706..d9eb212b1c 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -218,7 +218,7 @@ enum AVPixelFormat ff_qsv_map_fourcc(uint32_t fourcc) case MFX_FOURCC_Y410: return AV_PIX_FMT_XV30; #if QSV_VERSION_ATLEAST(1, 31) case MFX_FOURCC_P016: return AV_PIX_FMT_P012; - case MFX_FOURCC_Y216: return AV_PIX_FMT_Y212; + case MFX_FOURCC_Y216: return AV_PIX_FMT_Y216; case MFX_FOURCC_Y416: return AV_PIX_FMT_XV36; #endif } @@ -270,10 +270,10 @@ int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc, uint16_t *shi *fourcc = MFX_FOURCC_P016; *shift = 1; return AV_PIX_FMT_P012; - case AV_PIX_FMT_Y212: + case AV_PIX_FMT_Y216: *fourcc = MFX_FOURCC_Y216; *shift = 1; - return AV_PIX_FMT_Y212; + return AV_PIX_FMT_Y216; case AV_PIX_FMT_XV36: *fourcc = MFX_FOURCC_Y416; *shift = 1; @@ -309,7 +309,7 @@ int ff_qsv_map_frame_to_surface(const AVFrame *frame, mfxFrameSurface1 *surface) break; case AV_PIX_FMT_Y210: - case AV_PIX_FMT_Y212: + case AV_PIX_FMT_Y216: surface->Data.Y16 = (mfxU16 *)frame->data[0]; surface->Data.U16 = (mfxU16 *)frame->data[0] + 1; surface->Data.V16 = (mfxU16 *)frame->data[0] + 3; diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 721c841c2a..220b2eaa77 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -160,7 +160,7 @@ static const struct { MFX_FOURCC_P016, 1 }, // Y212 is used for VAAPI child device, // the SDK only delares support for Y216 - { AV_PIX_FMT_Y212, + { AV_PIX_FMT_Y216, MFX_FOURCC_Y216, 1 }, // XV36 is used for VAAPI child device, // the SDK only delares support for Y416 @@ -1750,7 +1750,7 @@ static int map_frame_to_surface(const AVFrame *frame, mfxFrameSurface1 *surface) break; case AV_PIX_FMT_Y210: - case AV_PIX_FMT_Y212: + case AV_PIX_FMT_Y216: surface->Data.Y16 = (mfxU16 *)frame->data[0]; surface->Data.U16 = (mfxU16 *)frame->data[0] + 1; surface->Data.V16 = (mfxU16 *)frame->data[0] + 3;