From patchwork Sun Aug 9 05:11:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linjie Fu X-Patchwork-Id: 21547 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 D8DF444AC3F for ; Sun, 9 Aug 2020 08:34:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A4C16689D84; Sun, 9 Aug 2020 08:34:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f194.google.com (mail-il1-f194.google.com [209.85.166.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 922DD689C71 for ; Sun, 9 Aug 2020 08:34:20 +0300 (EEST) Received: by mail-il1-f194.google.com with SMTP id c6so5016948ilo.13 for ; Sat, 08 Aug 2020 22:34:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tTGnyNWoCA+D188BG1VCHGEfwqeXKOTCymrgjGGIxsw=; b=ScHMPfjxod/aXplSDny2CVPnaBfFKQuVcbK/4LQMlSzjAMeULjYrXNSRGETPXfiQc4 MZ3yidwoap8Mlic/mKp4XYI7tGr/gyKiZEHzJb3HNgBBi3oqoyzzD1jPZZ5RyLE4J6w2 +TCMjCBQTuj5f48WD+5VFsnzVSTP/X1ptWLZdfNSwF9ScXXbYN6g/JWX30UsRut9QNjq 5pjmz+PbMCaPM7gxtqJcQOxbA01sB739U/UXDnoEnt3DAYjMIiU8ndjIXTo9tsCFvBfi QA0sxqsBI419oljNpx/aL1y+L/6EER66ZPTC8+pAiRaoq13nbWUUQqV9Kkem2PIGc380 K+sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tTGnyNWoCA+D188BG1VCHGEfwqeXKOTCymrgjGGIxsw=; b=S3t8RUQkdhm7KK4KLNP+QzSll0D9zMXoDy7s2sX77XBsepIUkgSF5G1e6xOrgqzCxV SSfwE7XEp7xbAkZvVjyYJoUHC1PYsIjBJUGk66DU2PJuS81a+6Sxm1f2besyBJPcTedB S671rZ7w1W5ZMy7d8KXLLbN1HZwQlWCdMXbDvv1HDz0CFsbhvOGrR9b+n2w6IP0dhVwh TMZ6ECkXot7elPbrdyAIVqMZ6poCkcGPpqNoo/H36wRie4zN+1Jrkz56qX3ckOUwcTNl 1Vovde2JgbAhgSpEDitFyAhTzyHhheEF1/7maXE069SufovcXEcQQ7epmTDlMpdGAh2m My+Q== X-Gm-Message-State: AOAM532KRcPtpjPFtEkLUfSw9v6I6QqzqXwvZxA+PZ16YEmv94s/wjbW 7Xwh/xlkjbOSxXA+3Qw77EQh9fmk X-Google-Smtp-Source: ABdhPJzZz/MABDzRE0dti26e0Ax43KLmocomBX2lIV5/sLQwZCEwPOh4rQo5tGE5YmwSxQ+uZhq8Og== X-Received: by 2002:a65:60d4:: with SMTP id r20mr17261247pgv.436.1596949879648; Sat, 08 Aug 2020 22:11:19 -0700 (PDT) Received: from localhost.localdomain ([47.89.83.10]) by smtp.gmail.com with ESMTPSA id o134sm18331554pfg.200.2020.08.08.22.11.17 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Aug 2020 22:11:18 -0700 (PDT) From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Aug 2020 13:11:07 +0800 Message-Id: <20200809051107.86008-1-linjie.justin.fu@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavu/hwcontext_qsv: add 10-bit RGB support for QSV 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: Linjie Fu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" After adding a copy pass through path inside MSDK, x2rgb10 is now available as an output of VPP. Command line for CSC: ffmpeg -hwaccel qsv -v verbose -c:v hevc_qsv -i p010.h265 -vf scale_qsv=format=x2rgb10,hwdownload,format=x2rgb10 -vframes 1 out.yuv Signed-off-by: Linjie Fu --- [1]Issue: https://github.com/Intel-Media-SDK/MediaSDK/issues/1654 [2]Adding copy passthrou: https://github.com/AntonGrishin/MediaSDK/commit/20058c0e1dbd521e2571e14f6246c48fea996094 [3]Still in need to be fixed: https://github.com/Intel-Media-SDK/MediaSDK/pull/2268 This patch would be ready to merge after [3] is handled decently. libavutil/hwcontext_qsv.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 35a944f8f8..64cb1663d8 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -110,6 +110,10 @@ static const struct { #if CONFIG_VAAPI { AV_PIX_FMT_YUYV422, MFX_FOURCC_YUY2 }, +#if QSV_VERSION_ATLEAST(1, 9) + { AV_PIX_FMT_X2RGB10, + MFX_FOURCC_A2RGB10 }, +#endif #if QSV_VERSION_ATLEAST(1, 27) { AV_PIX_FMT_Y210, MFX_FOURCC_Y210 }, @@ -798,6 +802,10 @@ static int map_frame_to_surface(const AVFrame *frame, mfxFrameSurface1 *surface) surface->Data.V16 = (mfxU16 *)frame->data[0] + 3; break; #endif + case AV_PIX_FMT_X2RGB10: + surface->Data.A2RGB10 = (mfxA2RGB10 *)frame->data[0]; + break; + default: return MFX_ERR_UNSUPPORTED; }