From patchwork Fri Dec 22 16:29:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45299 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp1175544pzh; Fri, 22 Dec 2023 08:28:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IEPMuD7jTuf4OgXyHgLgLwEraf7hQcQEgpViCG7AthV6opNKRsA1eX4fe6HFiUXH5f6d+al X-Received: by 2002:a50:8d48:0:b0:554:5149:dda6 with SMTP id t8-20020a508d48000000b005545149dda6mr383908edt.24.1703262507675; Fri, 22 Dec 2023 08:28:27 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g24-20020a50d5d8000000b005540c2ac08asi1974904edj.37.2023.12.22.08.28.26; Fri, 22 Dec 2023 08:28:27 -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=@outlook.com header.s=selector1 header.b=vOCuZAqH; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9AAF968D34C; Fri, 22 Dec 2023 18:28:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2044.outbound.protection.outlook.com [40.92.73.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 070DB68D0EF for ; Fri, 22 Dec 2023 18:28:16 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MkD8WsRTd8wJmwLS9Nr6rZnOabnqzvi1bPLd8RyWtpSPLhLoKALg+wYWrCbGRwZ6Kl+H1xQWOTCzhPasmyOzqcwOLrZBA/XU7iI2++co6ucWsBBBAxPaxwzKcTc/MHEzzoSBdlEw122rtHCcBTpl9W8YsW+keVi8RonnGJJT8ampJw6YYIzL5NkL3/1+0jMQqqgb04IdNAmJqLOKY79VeZfcuHwQPxqSt+1NXyQDbAfzmE6viqiGdUIdinsXnsUqLXN8AotoVTiGihVWY4NXkb77QywXtHwWROeajjqRGZR8EkQ2ETsH7GjAdkdJ5h1j6C8CbKta/jSvKTwLHNvXcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8aaDhha/YSgAlFyg3nocET2vM337W3HJufXRVBa3OvM=; b=NB4VXElMFtpRJOLGpMeVUN9yHy90tvEIRMlD+KSGsHKGIYapn7cChZlnK1dcjdKiZ9BjFjFJtmG/Yvhas4HN923W8y4hDJF1F1oc9v5hmKzi0fyz6nJmUGmOxLT0OWlFxYtWJG41QP/50YEhPqbxtWgMwx2WSSqFkRM7cq754b8PZ+Ao35tXm9kCIYblbpvkpNXf6zYcPIirfjLnk12TYb8Ii8Bp86RL4Oxmob38DuPVYVeKgstro1hjSFm9UFCFw7A+KdN22SVT7bEJzzxOgOF3bVPLRkCR60i4kKRNEuV7kW5m4DyiIjHZKNzMxnMJHEd4+Do8gbvTD6v+re5d5g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8aaDhha/YSgAlFyg3nocET2vM337W3HJufXRVBa3OvM=; b=vOCuZAqH00VssImGtybC+Qn0Fu0Lv19w51CcySH3FGxHmzDgzC0A5Vv9aJydRYxqTyi416lBTHkG8UK/JJJ3deupRuJgIx+r50hjpJXujocZu9IPlDhDxZ2KwlD+bnFFwgyf8zcovM8ik6EE4kyS+YqU7HgyO5NStUZr5R4zceE7+F8CC6F4GxVbk4Bkc7nTUNaCDFMXf9NUIf+7OXcltMV6S1JlgKhKBOfN3BzRPrKMYKjjDzxN7fpinG4Wc4OYuMbta4ZbI9SOVoJl/ljK+bJEN4FwKe+0uT6hel7vhppY2fTNG7+Vo6Ibrw8+tHQ2uFXFFttFl+XYs67l50i6YQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0125.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:238::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.21; Fri, 22 Dec 2023 16:28:15 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f59c:9cff:a42d:bde]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f59c:9cff:a42d:bde%3]) with mapi id 15.20.7113.016; Fri, 22 Dec 2023 16:28:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Dec 2023 17:29:41 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [4hC4iXdhs1l+SVFFS7qUZ2IdguMJRVFY] X-ClientProxiedBy: FR3P281CA0198.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a5::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231222162941.2887129-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0125:EE_ X-MS-Office365-Filtering-Correlation-Id: 50a992fe-13f9-4272-1244-08dc030aff61 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: at6yUVdlFXNnbifYxNkDvHLYZSCDbxPhUlaVGxHdjFIFhTRVZ+nS9KFfNG0LsoN+238tskniuYNloO3zbGR3qBVBUo9GsedtW2aemlnm/klWixoSQaWj1WQZfFZeCRSAAjcRjmCm/shrp3H3KhH5bgtL9geywXVwYPsn3tKMGPddHxzVbCiPVHxqwuRtgoPrB0jrupg1fBycYDMMBU7mDUoNqn0TzlyzjHcAUOji7aBZu8C+pk/F3XbqTA7nEXxkD9OAjqD7fKvMZgk4yY5F45qcm+BuJTNxqrSxgF4hezBfqhc3JUjTp7kDfeYbfBMnI9mlCz90ivW7O3thq2JPyOXa2ESYl39ENebP85tHXaPkmr2SKKWxHvuTB0nDJ0BU/jg6nFYRVN3JtKdtXJ0phUOAWaugt0cLPyHcPNVRtZI+xVDmvheOu4Pc/5yyxtcR8E5MR6B9TH0Y/VAWnWBzifndZhrMb1nHJltOSxVIp3FnG5rvsQ4tS9ymt1lYXxf9HPPB1iTyHSWiiidSaHRKzjDgQVs94G4Xx5M2+980g+yrSgNATKWMHyQeQXeApy6Uvf0Pc2sU86IJmWhY8vSvjyB3MTF5ObJXnyqk/oDYxwxVpQPjNSHbrYQsdXN9H7l0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9qYih0vluO/X/0g/ruIa4Gq1Mk3PHp+fG7uyvxkp1rf1olGBJgHnb515UVD81+oo47LEduRKFtNQZeyQ1lMk5YoeoeiRWsDAflHym5C1leOqVJRhzMbLSpFRK4W9+pigDYj6enDGTwAvEt5ilZvY3N/M5NkNu+gdF/m9wWL+3P/IEKpne/bvTo8tljv9DUBZ4Ra+FsPx0smKjgE5CeO+ry/48SoK6n44c5AvGHs/JcxqbOGbgBScKpkHYVxrTUef44IHrZ5o9vYfT6ax8EiZcNjDG4zuHiUuA7euEBad5lpJENQOswWA9ohbOzObHHeDVCS4UqyMGBUc2j0N3uJld5M9/Bh6/Zv2CMRM0q0Ns/w2R5NfJSxXwhVP9zK2y2w7cPueUW+kZuGgUnoMak1wu6EXKUsmCCjzEtl4XOWJtcdC3Lht5K0ISbzOPBmlnYPsJuev5Xf2MB8vXpXDMtwVrgQ2noPSGhEMJhcIKf0IyNrHwazewSgQw+5PzngZUCb8mta9xNxdO1tgnxm1Dt5ToTvNYBsCmDfPS54UwME4KdQ58xSkvTTiwbVrGMAog9CLL3ZnAaZnubx7aIG/92dzm3Z2dDSlredOBbW6ZGWlclv1kk8PhYhQw3tZAI/qaNB0UvvsP8AnVI3DUuGW53jddlsAA7g+zTo3uwdkjCIqKv8VCQP5SAjBOzyXWvwTUnH/MICusHCHKFr293xwGpjUelywKeZV8pFjf0qdkR4NVvexvDjOL40M+mJSXesDlmRF5kCzsPULli4Da1QA6l4Fm4jaaieBCPOavv1S8JWPoSLgMX8YHqxeqWl6xmoaCLBxZEvyYlMarY1Tqe72b2za2L62STdsjEElUSEubV7I13c/oIIS/WEqalv2AS/aoEZ1FCCRXNTdUr+LFHfYA3yfnrKoNPfrmJUnmWvITl46WrgJsw7hKdkom9l+MjqopYfHPXqDqEyAyVIGsjsQDWcT4N65GMrcJYVVkdGdQGBRp7dKaCTejeJBFVM5W4QhDvFDDszUfuoKKH7nhiWsh1TaVc4bTyO2LmrBfrQLnnqHXuHKINAJLFqRV5LubopWLnUh+39/jkgrIKbnftqtBmRA236wr/ZSQre4vurZyTy8vpJP5k8864/WdXOmaVBs8BcIHyi3anB+R9AMFuFQQAy7Be1p/T0g9uDhAGI3vDOXCUqRRXfwh04L2BQRTIYMOAt4khtD1+2U2z264/d0vC3wD7eOtWDI5LnMb4s9ZSxkinn11d7HgoI4URL5h5hrCqMs X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50a992fe-13f9-4272-1244-08dc030aff61 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Dec 2023 16:28:15.2578 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2P250MB0125 Subject: [FFmpeg-devel] [PATCH] avcodec/d3d12va_(av1|hevc|vp9): Don't use deprecated FF_PROFILE_* 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BztWiQVxFwWf Signed-off-by: Andreas Rheinhardt --- libavcodec/d3d12va_av1.c | 2 +- libavcodec/d3d12va_hevc.c | 6 +++--- libavcodec/d3d12va_vp9.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/d3d12va_av1.c b/libavcodec/d3d12va_av1.c index 6a3543353f..4a87169bfb 100644 --- a/libavcodec/d3d12va_av1.c +++ b/libavcodec/d3d12va_av1.c @@ -164,7 +164,7 @@ static int d3d12va_av1_decode_init(AVCodecContext *avctx) int ret; - if (avctx->profile != FF_PROFILE_AV1_MAIN) + if (avctx->profile != AV_PROFILE_AV1_MAIN) return AVERROR(EINVAL); ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_AV1_PROFILE0; diff --git a/libavcodec/d3d12va_hevc.c b/libavcodec/d3d12va_hevc.c index 7e0c295a2d..2fd884b8e6 100644 --- a/libavcodec/d3d12va_hevc.c +++ b/libavcodec/d3d12va_hevc.c @@ -171,11 +171,11 @@ static int d3d12va_hevc_decode_init(AVCodecContext *avctx) DXVA_PicParams_HEVC pp; switch (avctx->profile) { - case FF_PROFILE_HEVC_MAIN_10: + case AV_PROFILE_HEVC_MAIN_10: ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_HEVC_MAIN10; break; - case FF_PROFILE_HEVC_MAIN_STILL_PICTURE: + case AV_PROFILE_HEVC_MAIN_STILL_PICTURE: if (avctx->hwaccel_flags & AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH) { ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_HEVC_MAIN; break; @@ -184,7 +184,7 @@ static int d3d12va_hevc_decode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - case FF_PROFILE_HEVC_MAIN: + case AV_PROFILE_HEVC_MAIN: default: ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_HEVC_MAIN; break; diff --git a/libavcodec/d3d12va_vp9.c b/libavcodec/d3d12va_vp9.c index bb94e18781..84ff06b9a9 100644 --- a/libavcodec/d3d12va_vp9.c +++ b/libavcodec/d3d12va_vp9.c @@ -136,13 +136,13 @@ static int d3d12va_vp9_decode_init(AVCodecContext *avctx) DXVA_PicParams_VP9 pp; switch (avctx->profile) { - case FF_PROFILE_VP9_2: - case FF_PROFILE_VP9_3: + case AV_PROFILE_VP9_2: + case AV_PROFILE_VP9_3: ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_VP9_10BIT_PROFILE2; break; - case FF_PROFILE_VP9_0: - case FF_PROFILE_VP9_1: + case AV_PROFILE_VP9_0: + case AV_PROFILE_VP9_1: default: ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_VP9; break;