From patchwork Mon Feb 5 23:36:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46060 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1074828pzh; Mon, 5 Feb 2024 15:34:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IFZJyMUkR2/8ejURegRZkXjYUgZHqLhygPyLZxQqgYfKMeuI7H/hvfSvyzhiUuhA1aTgEFw X-Received: by 2002:a17:906:1e93:b0:a30:4618:80a0 with SMTP id e19-20020a1709061e9300b00a30461880a0mr255443ejj.33.1707176089097; Mon, 05 Feb 2024 15:34:49 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXlF/DT5Ee33V0/sk77rjEb3NcqebWzugPsXF/iXnU/XPXkKXX4dZb3rK4ekBNQTz5311ApKHLsg3H3hFm8kM20vJFLEueNjDbkfuJb4/pZaihvqpaZ72dfc3L2lVt5XluMWlBtI8v8+8emI9yCdhqYrk4xXTrNrkltsYDXDtLkPJ0dRN8HEcLXdOGMnpKDrcQcShU7FNFZANiq/fnCLKQlDwQZCNaTGxhPgj3+3JViMoMyVe4Jaz6BcGQUIKmAEMkMw5aKtuyX5pIByZRRpUJyNq70e93Q0AKpx7jxoBFvZbcSuS1gy58Ja50BZbVsbVu0zUOBU2ETvUQlgdrsZFBpCH9pgJHpeAfEyXxYTLKZobv9tr683rHpkA4rKnJsfPY6Ny59q5OKiK5XNfkCRD9udAoPQNywwdpXTeQkx4GE/bP3lLA2UKwWIPWpMITaQeTZAhKXgs+0mkM5Xo/bQR19zzszCTS4hLq1h2dp728TCIQZE/vXFmPoEVxTRaKzqUpLy0C8uAHKhBj2Hm4eKlvoFxOknJ3fu3z2nX1BQpsD2oRlHaDN6E7vzWABf4d1iUBC2ixfcAkH7Q4f1txzdR3GjApYOGLlhTbYPdXB+qOldypbrbi6Wvjbwwc4lRy0v7z0oovjIQdpgy8wh4IsX/dFvHpq0RLuaH88LHBNtk6r91umkLxihWAbeGVtpQvfxpiIYlR5dS1gqyxmMBiqk6p0O8C+snEC1DnZXdzvXjmQU3TJE/XaGy0nBTm5yUCB6agPZkgaCJBoeTns1g3YOMQCLnrmbqQmja/SZoNfC8IpFlypIKxgHsTNmg+GY8ITFavnfZOt+UV54qyGhP20EJCIDOjKJlfXz72KeQRpDOkmUcW8QOeHv0Zz0DgyXzxOUk09/utqLzwGZpAGzVguAVpnM5WEaljZYritF+/SQfPetF7U0Q+HYBpampKtJjdSxQAo5c olWZ+P3VeL7zpUegjPTb9Q3X3Oy+VdAx49HnbMGVRzZHAR0WWvwWIXZENFeW21QSRQmE51tua359iOLCEc1S2sPH8v7uEsxoAGMwrN/HtJ1pXdb7kJOD4oDZmYMLJQ1cbALlr4Tt8GnZ32NIHiEECxdpojrfCoM3/ta3uWJbfraqS3d9Q9Tu0yIZtJEMNRBlVs/nTaMIJdpzI6kCUYDt6qQpgtMhggGyaBquWI7Y+q1XEyi473V1O01MZhhJgPYhndTuGvUlycBQ/7vJI0uHiNdiXkSZAyIbpgYeYNfwe3jy4CAfgTuoTpquCkcQ0cMUJRGzf44PhbAgmvlmd993iLoAWoCy8/EXHOzgosLVYQ3RDJwV1mYXc7QOclEfed0kgyEhW5viGA8uyKVhQQtnq1X8iHj8H7uALTGz8sVC3jMuMRyLM/GXZnmuT5VFxdvfSz87teHj2U8GbVuBFHyIsTF42e7s/OxbO8ruMkTz0MRavROO5I02jZLGQHYHDtDJh64tsuxnV0cB/iK9FVXeE1LZCH4OqaRqCLST+toJTRWyJua3d4BpE8f199a2apQm/uo23m2VvfLzkYCNIXp4TeKdGcxKOowDpIXFJMgx/K6zrsvqU/N/EZg9PLveOwXEfw3Llt Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id os6-20020a170906af6600b00a381da7b31fsi74917ejb.226.2024.02.05.15.34.48; Mon, 05 Feb 2024 15:34:49 -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=F1vg7u2J; 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 1E64868D145; Tue, 6 Feb 2024 01:34:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2104.outbound.protection.outlook.com [40.92.49.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B158068C9AA for ; Tue, 6 Feb 2024 01:34:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PDhc1quA76XOHVGOczaeS0NodOjjz2x9BwCpyJSIDsiSYbTDd16q/TAm+hHC6l73km2vk1x30pJJgktyUQyqWaDuj/moSWZwvyKOAo71kV/WPy/nntq+fkb8BJjXNvTRGjOHDZQvn40LMrZpAbdKep/363CTM76J8Um4BoRputFTFxLD39s9jDCV5ZgNU9eb8dVxRkZFrVGj3xUcARTtjxHomor4Vs/hOv0W+5qsnUqUaYoQtEqntykuSwctQMXfBMIHI51JtY+yPuy2kvhrFQS6W3myuI2Y5rFlCtm5AOhx2UzqqEX3d4uPRMrQYnnZvsPq7UII/MxNRAuc+422Sw== 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=+OAIze2J9v9t0x+lVsxnjNUwz0uPLoLmZtWlay1Q7IM=; b=cIXjMjKR+tXLva6Qis+XFITvbNlKhMkwC5EHer7uEZK/aLbRZk6uqh83dqUC0ncyFbR0Qq5Tv8tQWf7tBt05oZoNEh1bpIrznyOVF2Xu1E3r/1HtjAmbNub7PyiU+ysZAWWdTh+GtXz7zbABjejgcWQwdThXsRp7umnbsTHOP8LEYZzsyFiwMTAPGRKD6x8lwp/DvDLaD5041EIIqsxel5x3dAIfk+j/FWjOIm1h5rc6kEzb/RZe29Md3illgRUy6J9c5Colxz5QbYEAOWLYZQXaaPB5bJKF2BUwUwB6nQhrjzEZBAHIOKKfQGPSWGdEzdIxgxtN6xhFtSy60erKsQ== 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=+OAIze2J9v9t0x+lVsxnjNUwz0uPLoLmZtWlay1Q7IM=; b=F1vg7u2JBNpi7T1n+QWMHwwVdJEyiB+e0kZYSNUneOWfEmRcg+QZ/o4HWMQYb8d0AQ96qAiiJBqJ1Bbnvy5kM7vQP8VWjmltYWS/2TVnU5B4xRWEUV4pCWKKlhkC4WRjSQHS+rVNIlpPmcZHUnkkjNw/PUoA8h3XmP9Ytaz6+kVMdjyA3iG2WRyMgtuF53u8HCEQKbpJtyGedSwXxB4Go8rJR2JH5h3tHApPZPcjZ0XKemAiedchYKyTC9J6+bxV2mmbSHRLZ+v78wEecoFsp8D8rU11iHnPCih6ou6RVm0EGfHTZwk7PB/xkZjARPMK+w9zm43DEFJk2k1prfu+SQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0213.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:324::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.36; Mon, 5 Feb 2024 23:34:35 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7249.032; Mon, 5 Feb 2024 23:34:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Feb 2024 00:36:12 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [LMU03H+U+4IWRQd0mK5nFvDUWVFZKNcq] X-ClientProxiedBy: ZR0P278CA0160.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240205233614.3950767-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0213:EE_ X-MS-Office365-Filtering-Correlation-Id: d3ed05e7-8f76-421c-18fb-08dc26a3032b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KdQ7JGO/xq4NwPOA3wCil4N6qNjoV5ALgD8EQ65IwLoiOj5iXbjA/BTeCgb9nGC7suNDOm8hKlfS1hWQQYuPiTeNSqwrK1ZjGPJiyzMoFGldIDL29yAJRtpN3jCFcBoUQr4fU+IgyygHDmawCeV7sYzSQ0hNEjZCbV9rTJhX3+e99VygWeSxvWUKBPxU9YLONKU3j9g6GN/wQb8Gjgqko1XP/wVVFaS0vKe/F5hgMRl4b9++8QBtjKl+zrk5l0ufwkiA2bEGiehpyXMmiB+nXSB/PEr4oRyacWsJJphj8GIVe0l23WeZhS6Ctzo5Bnd6zaGY1Q8ecFAd8ivzg5QLqT/pi4qnYqj69KUzJnJ3o0s07GVTTyxUBCZP7Lis4Nq3xu1nq7LmINtDuVvW/c1iEDgIiXIzs+f0N+u4bSbw6f9vLhkfhH5BNy3Xm898WDN0uS4qi47inMbCZqx/gJLjknf2FmO4G1BYd+xu1COrEYw6MZpg8Hzs4dIUTFP2lBdcCydaFRmPbknYltZVR43bwHFWQZvfMaVg4Y999wdMYbHUwqyywccCO6IMeb1EsKJF5wXM9ufnDq8CFOJiNnUHmqwHxrQaipsUJLQ/+Ty5WJk= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gDG/XDIdp/vsC3C4iCHaBtYfsfeWaKIr8h/vOvEBUfnPVV8efieaQWwv+SckKHY3nmqdkvZc7ZjsHRjhPXW8KHLP2DgVK1eOJ1uoRFeOJyiDu2G0KV6Rk5BIA4Ov5LKHgWlAUuR979dK/Dgbcoof10Rb0yfZnQS9mVzFubPNXe4F4PZSW8tqaws+OJuqFyBkxNe7S9E7o+2JKB10IKLqL1NY9Om9QWoS972OFUtaQ955P3i9F0kFhWgzePVYXMQ969X2ovWm1X68g/YEM7OFk2SuDgTQZBOsp4dUaVz8cvxjLI4mbx79GAAIv0/Gph03os70EUyn4mGGcFrUafZNmJNs3Ep8e7D6cVKVjboWFgOqxUeB85tRovarfAHySBiSi8pNtOvtq81bqoLqALsvKLjUd3mjkVA15V9OlQAWe1tz9a8cfNW6tL9PfHh7fOrGY5WvVrGz6zytLPIsGAR9OK8Q4Lj1IVcHeeB34oZC0mt+7RmMTZDvXnasFMWylNVU9m/WRM9YVfZgnePwiq6scklmDPcYA8eg3uh65rh4WAY760VyB8mjcGri8d+K6vrQWsfRvQ+ykKNTJRBuRrktIvlFbtvByftqpwBOkksjyUaVU5N1nXqtKZGuZ0XYWPw2ObUzUrJO+NWNB93jl/ogjBBWnMMRCK5Ij1INNs/8vb3COjxDI2IL2UJxDOcBiIXz5QHFnSo8GEdJoYhiC9cgQWC1XYhcF6bIHDQnQhTv8a2ejFxHV4dfa9kUM208iU2+wX2E0siS0V37D9/M7I1qghTC8X1LiDe4+tMmit1uG0n9RXTS3/5yfc4Qg+Ar731kDDRWuGjyG7eVBGfytAPU6WX8VwJ9U9XKeROMN+EcfH0Gxzllcct0y/jbfZeiT77xdmW+hVGnN+ABWDH2YDM6vYcL54nWohCLm7ykBCYnIgaT2MYNihtx3wEoR+TXgi0whyyvtAHwm0tnuGdVSZLLoLnTgC8q1GiuTQAe3abSd4iztJn5XOyXk4UxNadiwZeWJxcYv6twUbOOrDPKlIkM8ct7FakZMIgel/OQhi4Ryzmqz3RDiqKd/SFmjxgACACLPvSEXnHKHPsE0sG/qSqQW2ov6K8JK4iRiop4vF3It6ZjWHxN4Q1DKbXq9H69yivGV0D5/oBgEW/RIBouMqk8x1GNamJt7mUGVM8s+TuphZVXCe+nTjsWmku8tL8tMq5Y4/DDBYs7NsZuxcnho+3vdncjocdP4XEQbPIWtISqm7e/j/JT5Jwi5TW06+C5ZCSS X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3ed05e7-8f76-421c-18fb-08dc26a3032b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 23:34:35.6382 (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: AM8P250MB0213 Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/vc1dec: Don't call ff_get_format() twice 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: UCyM86P26GAt It is currently called once in the codecs' init function and once when (re)initializing the VC-1 decode context (which happens upon frame size changes as well as before decoding the first frame). The first one is unnecessary now that vc1_decode_frame() no longer requires avctx->hwaccel to be already set for hwaccel to work properly. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1dec.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 6462a40fd3..4f4aa8aa07 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -691,14 +691,6 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) if (v->profile == PROFILE_ADVANCED) avctx->level = v->level; - if (!CONFIG_GRAY || !(avctx->flags & AV_CODEC_FLAG_GRAY)) - avctx->pix_fmt = ff_get_format(avctx, avctx->codec->pix_fmts); - else { - avctx->pix_fmt = AV_PIX_FMT_GRAY8; - if (avctx->color_range == AVCOL_RANGE_UNSPECIFIED) - avctx->color_range = AVCOL_RANGE_MPEG; - } - ff_blockdsp_init(&s->bdsp); ff_h264chroma_init(&v->h264chroma, 8);