From patchwork Sat May 8 01:25:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27689 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1025130iof; Fri, 7 May 2021 18:25:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnzxIODD67pLjBjfgP3U3sHyr+sU0OuoTVUUMSRnJr5q26gTophHsWvB79WDNQYesdOVIw X-Received: by 2002:aa7:c7cc:: with SMTP id o12mr15291453eds.291.1620437131243; Fri, 07 May 2021 18:25:31 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jy7si6462642ejc.111.2021.05.07.18.25.30; Fri, 07 May 2021 18:25:31 -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=@outlook.com header.s=selector1 header.b=k4inApJ7; 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 E0E5468073F; Sat, 8 May 2021 04:25:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073076.outbound.protection.outlook.com [40.92.73.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4852B680518 for ; Sat, 8 May 2021 04:25:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IdpjMjX2dXA1fnxiGwC8umSTN0l6OkkCCPZhN2ymjlm8NOOKbL0q3+vUt+FyjG6spSsS+OFP7GkSFGpDxvaIgjUkzuHwimgVOCCUyt2Ytdx8EQ9AGhac6XvLLcYzkPVGanwTIFTnotVTUQigydkhCKPJ061KcTdCD++yK6Ino6LhlMqE4bgQ9ojyj1JQlO+v9fLNbKvk3o3dct4j1lqnYW1TM9GGeRljy112wkQJOYe5JEGhSWK71jzDRbQKuOqDOoPkW2v8hwu2a9gJHuQsD31El2KOYm4cTK7LKiWW0QgcdRg+O6uYExeIyulMTPaDisFdXi7wsvlCB6TFAIv0dw== 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-SenderADCheck; bh=IKlbsQkSasyKWa/kDfNWOsHpj27zMpe4ameN6/sGcFU=; b=Etz24OuWWpMTkmPxCAtb+6BSX/ITnfErYrXvnmCs7r+ratuyiLGyDjaJGDqXj9yNMiplHc9nl70QcxtHq7EZLEyhUM1/4W/6LHdEuTUvsJtwPtnm3zPjQZHltpm9EPeY7K4GOAMWCW0vISkzhwey7Fna9MrZ3dEKQPeUmXQBsVIW6hTxK+IYZ2FNQsb5NW7gfrATjd5f5iW4xw6wUNmqWAkn5njvFJvgDW9bb6OjfEWBKq5mfnN00SLoIoF+pepa8tThtsYYddCj1tcOhmJ4pKsKSXgM6VdxznsX0QjFIgtrQyKjkd4EAhPg72J3lnT0UtqIdk3fvjPD2fBiBKgApg== 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=IKlbsQkSasyKWa/kDfNWOsHpj27zMpe4ameN6/sGcFU=; b=k4inApJ7jyQ9ty2CpZHAsvfKJUSssAx3ytKdKW9NxPpygJdm8eSunJ+GHaLy2/45YWnZXDySJFqKpwZRYOmt65zY+TmCmAfu1jW3n0QVLYdE/Mzr1Q+MYtj7TRyFZtU/rMrttqo3tHyqtI9S2DqSpd74YGMWa9IbGOmvb05/BlI2+unPuVmamLqYFG9rrDXnv6vkwezzrW0rkiWS+iugZRebyWT0d43F68BH5ljZ9cKwadLU7w5QSD44CLAqiHrZx7Rw9rCfUuu0NNCbPbx69IlK3OtGr4AlQlaOi4lMKaHJiDL4axrjoVyryS1Xyiz4vP8mFl4YQfklC9XDopyDsw== Received: from VI1EUR04FT047.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::49) by VI1EUR04HT180.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Sat, 8 May 2021 01:25:19 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0e::4f) by VI1EUR04FT047.mail.protection.outlook.com (2a01:111:e400:7e0e::81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Sat, 8 May 2021 01:25:19 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:774F7A8BBEC8352C97106C4320D8EC77D9B8EF605C24A593AA8846D2C2BAE403; UpperCasedChecksum:A92939CEAD57E398B41A7E9E9A434BE222448BD0FA6AF61467D4D0F0F5E7475F; SizeAsReceived:7435; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Sat, 8 May 2021 01:25:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 May 2021 03:25:06 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [mh3vLFs9zuYRc0/cZxDO54X6DRCCwZLA3ocLKhEbCMk=] X-ClientProxiedBy: AM0PR06CA0136.eurprd06.prod.outlook.com (2603:10a6:208:ab::41) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210508012509.1016367-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0136.eurprd06.prod.outlook.com (2603:10a6:208:ab::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Sat, 8 May 2021 01:25:18 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 87426584-40e1-4ced-2967-08d911c02426 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTy/gRYuf0ZoUTUwR2ZBCcCfRKgPyTHNGSlQaO7Z6LffLpJWLzgR2eLAq9GCS8s8/jEaF7fcP5oHHVKNSM3wzWZHiKGxt64hFg0A6NypEiaGBCoUFyFYgr9emkUyAM8a6JgwrATVQqtECEtDvseITMKyAOJjF6zhv41a6ueyrjrsnXPpFMikItvjJM2TQv3KGfhSpdS0q/Jazz8guxGhBx5eTHl9VCH4j9pvJqUQr8sBhkO9BnmTuxQ8R4A9w5/CpIe5j36wtkywrq5NPMmHMGjas2yLS+t2Ze9U4nfrtkRrN8u0gI/fUz9Miv5bxUfaAAEiPQ4UJsGzKMGpwGyuzKjcyiBX+GrA9iQf4DQF56rMPqRL7+0ohwReZ005u7AfZw0UUvSAgTGafGXf9VTwpZDymYwjtGmsc74t4mvfGFgp2BzABkx1S8bfUHsJdS9l/YtJRrSU4gCAI6iNUbU8kY5XADiDH0HhC0U7lKD6ME0yX40mHNvIFMoo9ulbL2N8YVh6GsxonFZLHYkkz2igNZqWSpRIVx7wn0C8jTrN/DZZrbETofsOawuntZ3k5D+gmSy542f6ZS2ZYkdsGV5eaWCovkWXMB6ZxF30AiucnSYSCxe4QqQagI8oY7h+i+3P3byel72lDcbySqXj1uiANdzefATf7eMflSghUxFo4bjhne2QwQ0aSaLRPf30SMxAjDqvK5lL8HGAV5byzNjhu26bCVBaRu+c5OuE/C8yKv39KXDiCT8fffgQG5FjtgMj8Y= X-MS-TrafficTypeDiagnostic: VI1EUR04HT180: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2y3+qSlLai5pF9cNQzd43Z8IsH6peJBv43J5XyAZze7hxdJewb38jthmmyz9LM69j//jr1Y+q9lUwKcI1vtVoFwJjCmGtnI8GbPGdttRA07805ITiCmEEpABrORs8TWLOcGYNGNwYiJpZk/bN3jDcyUmaYzwpHYTMAok5g1BdALURGOgBmrxrfogvJhnv9Y+OgxjxmTgeSnMstYdp9/qRQjryT8M9S9BaaDf1XG8PO7h0oJxrckEXtS2H+JaTYzyzYYF/GVuj0L29Z+o1zi/GhPn8lEomFlbX2Wn2wiRGaHBxhyzKZ702YaMiJiOomz/RIQ7fG6C8mDr4nesFWWuvLVczzmN5u1R4+pWWKkuenp58uMSDWJVeZG+NR0M2D2PAwGtfu9XJslGIcEfAuyhmA== X-MS-Exchange-AntiSpam-MessageData: 4uf5cNEsB+pFt2g4ohcq/OObP6b13MCUu7KPCUyEfT+qmHO1y/Yb+72SALsf/Y81KFDhfaC4BgBk3G5l5rdKel58A/k9Y6IDHTHdpBIdQ81h1YZa4pxtEerzxpsbdPq68rewBOfXMsC7e/qCR8MChg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87426584-40e1-4ced-2967-08d911c02426 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2021 01:25:19.0818 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR04FT047.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR04HT180 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/vp3: Don't try to decode VP4 when VP4 decoder is disabled 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: A3xW/6r/Pi6d Otherwise decoding will crash lateron; e.g. because dct_tokens is never set or because a VLC that has not been allocated is used. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp3.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 0cae075452..9aa84e83b7 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2335,9 +2335,13 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) if (ret < 0) return ret; - if (avctx->codec_tag == MKTAG('V', 'P', '4', '0')) + if (avctx->codec_tag == MKTAG('V', 'P', '4', '0')) { s->version = 3; - else if (avctx->codec_tag == MKTAG('V', 'P', '3', '0')) +#if !CONFIG_VP4_DECODER + av_log(avctx, AV_LOG_ERROR, "This build does not support decoding VP4.\n"); + return AVERROR_DECODER_NOT_FOUND; +#endif + } else if (avctx->codec_tag == MKTAG('V', 'P', '3', '0')) s->version = 0; else s->version = 1; From patchwork Sat May 8 01:27:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27692 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1026169iof; Fri, 7 May 2021 18:27:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxyNNe8dRWsBJJ1NJ82kLfbC679b8QaAnn9q4o5wKy+I1I2AljzdfUAJg0kPmadZQC3oZA X-Received: by 2002:aa7:c2cc:: with SMTP id m12mr15109481edp.1.1620437257009; Fri, 07 May 2021 18:27:37 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r2si6332921ejh.306.2021.05.07.18.27.36; Fri, 07 May 2021 18:27:37 -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=@outlook.com header.s=selector1 header.b=LFhcfpJ3; 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 2ECBE680771; Sat, 8 May 2021 04:27:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073097.outbound.protection.outlook.com [40.92.73.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1CAC68020F for ; Sat, 8 May 2021 04:27:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ekQ4/myw/VAN8AO3g74EE/Rlva3xuMmlVwL6TdmtbPv2gG6CnQwmBqZeko3Dq2qmO/aXZWRb7ZJtrrWT1GpYt++zDgQZ8wiKuSj/01s5XWkbxqyHww7u3jupqpCia95szTGgTE+wjnw8RNm9ekQ6ubGnp4luEkuaRLtTCOIBkN8v9sMI1BLCK3mWcB+FUzAc/M5YgLz0FVjrMTcB9SBTjCVoYskHip6zS0/ugDKBt8w897xip0Wl9OWJV3GwIIVv+jY1vHOUcvxFd44/XhBLiaVfPl0xvjThidLClXHjS93TIdxGDEqIohgG9KxjSVPDtVeezU472p4+cNrgQwuzxQ== 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-SenderADCheck; bh=vcEtiBAiCH39kZgf5k3SXrHE43wW5x6zwG6lrU2ux10=; b=SLwbR+kYzHbSaZVM84wWb64GJoaMexHxqN7tV+S5/2xxJ9wlEVgu9+lwZOKqwLSNtyfADoiI/u/ONzrIenejT93flL0tVrT8R3oAUZmG/y6F/Tg5UVKNL9fsS0I0bzYFEomc6kT8DUB7e185NaYQYendTmO064AElUjXbf3gUXhw0D/8rDeSqEi1lLLtOKtgO4q/+SHZcKCwyBeB037J0xn0Io+bHwSuhwfcr/YMMT/X5x0H0uXFmEJPWjZ7drQYP+82ASUBG9m/nv4l809MCwgN7+WNJfvVUx+KbqfkT4sSNaTZ3nThFylRXCf2S4+SdkXJckuxSPWpYZaWpJ7c1g== 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=vcEtiBAiCH39kZgf5k3SXrHE43wW5x6zwG6lrU2ux10=; b=LFhcfpJ3TtVXPSGbcKaejhcUpadE7ZvvYA7Zq7fhc9NrDhn6sBIYFF6YQnoWyCg3VeyR6L97oj3GatJ7rN9eSSBE/wCSzvSol+I+mWKmDmm8FEmo/OKaOLbXNjZvID5iI6N3Y1IaItJLfqglK3bUddZX4jDU7H7+7+jeHYMnrtB+/MkoElznYFgf0YpMZf3tR7K0iwkcWCt/tiLbvMQNZl3q1Zu8VIxBXm5pi3WaMdds2FCtoasaZymfVzTWejBnz29xkye++O4VSoMVOC+JhWW+/AWFnSkUwDdh5gmUoTfsCkA8eHjlkksbuZTtnDgrlNjjwqWqsI4etyX9zrl0hg== Received: from VI1EUR04FT047.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::4b) by VI1EUR04HT047.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::349) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Sat, 8 May 2021 01:27:25 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0e::4f) by VI1EUR04FT047.mail.protection.outlook.com (2a01:111:e400:7e0e::81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Sat, 8 May 2021 01:27:25 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:04E907212059A490769D4BDD71F8B7514B2EF987CDD470F462A69B7DCACBDB71; UpperCasedChecksum:463877E7B46F8F915F29DA6305D658606B11F33F83BA6A6554680C3F68AA66D0; SizeAsReceived:7617; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Sat, 8 May 2021 01:27:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 May 2021 03:27:15 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [AWIpf5fJyLpuGI6j0BILc+mBQ08LCoWA1y79lpOBQuc=] X-ClientProxiedBy: AM0PR06CA0123.eurprd06.prod.outlook.com (2603:10a6:208:ab::28) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210508012717.1025788-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0123.eurprd06.prod.outlook.com (2603:10a6:208:ab::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Sat, 8 May 2021 01:27:25 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: b0f91571-6b68-47da-9951-08d911c06f89 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWUr2JHLiAqcqkhUQ1DDaKHqKaETF5BwPeXRCh5HytqA+lnaOAvmrAii3i7uyiHAUG9fOeRwkT/7eGFXxtJQ9lL7zYvBwXDepy7yo55TljWpnZGBmjjUiy5p7eEYyhR/1SFueh5kaHDIIjvec6b7kdb0TfoQxqafOlPTNC/+UExygJkwXZtykUhTejKDuWYIXCGM88FM8qb9IcRrwU5+W8msgN2CyV0+vnvq8f3r6HDvo8jFY7oaD9zR9MEXirhoO8W+XXBHne01FHpQLQGch3Xugw0rm4izsHbM6CtlBRitTBrz45RjP2q/BKbsdTQr3XyKAGQjKeQ9Gpgy5QUXivqnSKM6r3ADAAtuSiL0c4AeVfoMZtMydf8Q6qEyfGDos7ajt7Yo9TFmLx03MRsi9SKu6CoIkl9KvCFqrpj5Le9PJpb4oq31pWkzlcp60yeb/J0CPGyhcyjm/KxLlbBvBXdXwpktFKRbUggBER1bZSuEAkOq2MGF3bagJWiYmmTobSypXAMH4k1b8dcEkzXfo7pDDNFiP/gRNe4XC5PB60t3zGyrm/cZRWjNpCz12KwfETN+NhX5idh/CqSihZaD9cS1gAUgUtgRQy2asp5Y/TK/Fk9095gN+m8UA09aLzMrAv6nSDeAnyprLPBXY/oVMkwrJGrWpwbTKLmNuUdEvB9G4Z2QPwFByT3ccuRDaqMEBmfjLsr1+sX5DO7tBBVB8+pLylnFiQzC0o= X-MS-TrafficTypeDiagnostic: VI1EUR04HT047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: km9jAVagC8pF4MicxGMjnDl8gNDtl2dMjh9IeRGiKV4SGBdjD0Zs7RE6YnxjtiUu1HqIMCjvyxJyztgXlCMcAnO9Xj25LJxpEwBqnFGmWaLYlEHFrc/I2jZNfBwz7tQ7BZxHEz1UXQWzfLRBfM87it6MCKO4iH/hyIL7JRUWCpPuHaYSbN6r36vrGd7fnXZqAdpNcgQAqLwUwJb0+0zt18lgnP3czISp5SHb8Ri3qRP+/rYSUREjcN5dSxsOPGWiEZ2k91DALijUDk5qlhgPR00Yx0wTyW6+M+gOZdyhyQKbmUw4CH2+Z+5UBOE7X8v/PkOYs4iWV/aOs7MkskFZH36uNvBwCiA3OEijpK+IkJSj5yZ+rwih1WpaM3ZhmSyCzQG3WJsq1Dia9o2vtVWuZQ== X-MS-Exchange-AntiSpam-MessageData: I3c7QSWrnsOj6ZJYYPEdFKyzkU8VTb8Z0HF+uXbbMgGMWi4dDs1Vt+WpvF/rA23731MZLdgwV9exSEKdCELOA7i8Ooxs8ZBSR/GFpRF5sjWR1pd+gdgEnHhAhQMW/cRtMl/HTT40unkn8mOvr4oP6g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0f91571-6b68-47da-9951-08d911c06f89 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2021 01:27:25.4326 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR04FT047.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR04HT047 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/vp3: Avoid code duplication when initializing coeff_vlcs 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: BpHI970GMlef Signed-off-by: Andreas Rheinhardt --- libavcodec/vp3.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 9aa84e83b7..ef443dbf22 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2408,6 +2408,8 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) s->fragment_start[2] = y_fragment_count + c_fragment_count; if (!s->theora_tables) { + const uint8_t (*bias_tabs)[32][2]; + for (i = 0; i < 64; i++) { s->coded_dc_scale_factor[0][i] = s->version < 2 ? vp31_dc_scale_factor[i] : vp4_y_dc_scale_factor[i]; s->coded_dc_scale_factor[1][i] = s->version < 2 ? vp31_dc_scale_factor[i] : vp4_uv_dc_scale_factor[i]; @@ -2428,27 +2430,15 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) } /* init VLC tables */ - if (s->version < 2) { - for (i = 0; i < FF_ARRAY_ELEMS(s->coeff_vlc); i++) { - ret = ff_init_vlc_from_lengths(&s->coeff_vlc[i], 11, 32, - &vp3_bias[i][0][1], 2, - &vp3_bias[i][0][0], 2, 1, - 0, 0, avctx); - if (ret < 0) - return ret; - } -#if CONFIG_VP4_DECODER - } else { /* version >= 2 */ + bias_tabs = CONFIG_VP4_DECODER && s->version >= 2 ? vp4_bias : vp3_bias; for (i = 0; i < FF_ARRAY_ELEMS(s->coeff_vlc); i++) { ret = ff_init_vlc_from_lengths(&s->coeff_vlc[i], 11, 32, - &vp4_bias[i][0][1], 2, - &vp4_bias[i][0][0], 2, 1, + &bias_tabs[i][0][1], 2, + &bias_tabs[i][0][0], 2, 1, 0, 0, avctx); if (ret < 0) return ret; } -#endif - } } else { for (i = 0; i < FF_ARRAY_ELEMS(s->coeff_vlc); i++) { const HuffTable *tab = &s->huffman_table[i]; From patchwork Sat May 8 01:27:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27691 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1026262iof; Fri, 7 May 2021 18:27:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9bnWOwY0bH/fCWdV6vr7MJCSUqQcq/6ay5+r3s+E8+I9PWj1OhN1+18ahjOKkMarJB3HD X-Received: by 2002:a17:906:c1c4:: with SMTP id bw4mr13319294ejb.534.1620437265165; Fri, 07 May 2021 18:27:45 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d23si3606049ejc.536.2021.05.07.18.27.44; Fri, 07 May 2021 18:27:45 -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=@outlook.com header.s=selector1 header.b=NQpils2E; 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 25EF1680301; Sat, 8 May 2021 04:27:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075088.outbound.protection.outlook.com [40.92.75.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B854368020F for ; Sat, 8 May 2021 04:27:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V0mgf/7ZHB+CczdUyIXZniuXZVideJw0QruXmKSzPQCPMuzvHplelVXCX7pDD9C/f6a8WaeM1kod/9ibuleJ1PXUqDIaKZu1MkVkWZdRxAW+T4WXUJIKqX4nH+3Lv+8KXQdHLeNu4LxZculjgHvPeDIfnYiGBw9oAo302DONIryfZc5pYnI2yWvO0KW/qRUgxLHzC6C0UhRc1q3oqx/Rn3vROdGkjezGxPiDhstvYPEjOHh/d98mp0Xi/d9eRb4SOyJFQaQavxGKgerJ5f66b6dzQo7FKY2YW0s43A6brML7/U3XDAEfIK4JIGV08qJz5Vz6GSf/rVV1q6mhmoABgw== 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-SenderADCheck; bh=i3V9YRRykX5Cs7pjrPqlMxiXCSa/X5Ia2c4PIPBzOUw=; b=JWFJ2r0RsHHXOXa6R8JW40wsgrYQdmb4Ybn+Ptl4MrcHfWmJ8+tt755CGyXNkFfm69FtdyzJVEpdZGkFUdEXnzLQFZAzFAspO8p9wuwIE2Z/aalpZUBuH2dMc2epEyZJunzHTJ4hZXbzvg+YWRuzqzCpazzLQHxrjSDn4ZFiQHty2exIQhP0tUij1cP8g7UxNBysnvIjjFxN43jgVQf+aWdxKn1uTpmQ65z1A8SHb01nWx2cmQ1AGjV9ioz19ghD5MnOPjs+Ska7Urwm5tvNG5dzZU17OrbgYMoqrwb1Lof18CGs9LQQrdEl5S9db7RWJiJAgurF4k8JErv7YUAYCg== 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=i3V9YRRykX5Cs7pjrPqlMxiXCSa/X5Ia2c4PIPBzOUw=; b=NQpils2EV3d1VdFJ0WeUdCH1Kp5EDLgMFD+np6Wz3l1Du4E3DSSNXw/mGMR5yeKFFR0/Vl4YOmZc2FEklNeIhqu3tYVfCxw/BdztLXui/uHpCkZ6mWJhGsMcmzP2tBuxU8Ucdon8R5eGu5fzCxJFTUDHQl6AKvr447z0HyOfx+ajb+x55s0dsysltmHSNdHcKXgWpRfwFstRR8nIAqS9nt5DsWN7GEjNygmTRLoDauvdl3WwBZk7bE/onzE20G7NAxyEAwJxBkoawxPhYE7DIKil8aNgfueUgrpruRQccQf5sjaPLp9OfvN6dqTxuHNJr5xA78XmAoiX6YqsvKodvQ== Received: from VI1EUR04FT047.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::48) by VI1EUR04HT060.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::312) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Sat, 8 May 2021 01:27:30 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0e::4f) by VI1EUR04FT047.mail.protection.outlook.com (2a01:111:e400:7e0e::81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Sat, 8 May 2021 01:27:30 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:F93FC2D06130D40DAEDA2E1D02BD7CFC0EA66D6E76628360C064E2B3B734D3E1; UpperCasedChecksum:B2624C433F729ABEFC5A7ADA357E3A5E555CF65A8CE018A2C45CB1CD68F5C3CF; SizeAsReceived:7580; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Sat, 8 May 2021 01:27:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 May 2021 03:27:16 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [nIINFxExHn8qnmibuDHw1ISvbK4jy/dkiftoqMaYYhY=] X-ClientProxiedBy: AM0PR06CA0123.eurprd06.prod.outlook.com (2603:10a6:208:ab::28) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210508012717.1025788-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0123.eurprd06.prod.outlook.com (2603:10a6:208:ab::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Sat, 8 May 2021 01:27:30 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: eb7d9a3f-6b3b-411c-734f-08d911c0729c X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKDSr/w16Yq9B9NsBGbJyn99XBMz02q6gJc/xVxvuCMAleGXILnzJ3A9TjL8l+yFiSQN3TPfeSZ0xyNyVp8xYfeGxZgBxFd37Xl/DP4Sx5Vzu/l0PlBAgRjocoN6YkRilNPaNa69Ezq1+Ky9Mvwhnwxf0Jom7iUur3Lf1ahsEJdzQlFVepT+eyzxdTh/kl+awH+2TcehVgZPS+7jYqXp23RR4PdGzttkwxCfxUDxbLodajXPeVB7lf/5Jrzbtj0eNxEMWkXX1aITX8794H4WG8HWe/3uqAgVYD+0f07g5DvTSdEjg7wqd81Be1/HjMHhhEYtCayobpBAlY2kpnW1WBRAJHWCQHK7jtE/kbsJd1BsZjyImhSgfkNuFJ/Uzli+ECPyeoTVv9OXolz7qrzxvugG1Nmod8I7IG753hEHw4A3EDHb1Uzd1dZXBRux+Kp3ZVPx0F0MKzmnTe2/o36m6DLCW68WweslZ35DK0uKsuM3RawLOBYq5qUwonQwneX6iAC3nW0nz4v93FSQN8d6XDLs7SCcTBn3IsfeEQzyR8f2MoObVIyu4/YoA3JDAg2Fp0767fC4Wz5NVenSd6CwDbXi9HMbvKlpuk267U6EPKvL4nGxWYsdZlRkEuZpR4L6yEiPfD5qSTN1vicB4Ehj9U4WpD2V8oq7ojQLEdoTFZCpN5Q+wPprD5bYdDWomoFSqEHnkKUwdRp1Q== X-MS-TrafficTypeDiagnostic: VI1EUR04HT060: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ulB2Cc09xZRWJtDO5ynyUXi2OAvIt8ISXBWuVElx5ULv2IwW7ZI7iq51x6FM2dkJN45pwKSEzN1n6QKIHT0MRAOi87cUKSWXR5XgJQoDWCYCl5Uws4v/OuD5LFfXlEiP7cfDTir9ZEgygaBggF2cZs1sR22qxLy4trD22L18vAa3PFxauZMg7UKIxeiRcWZxo6H+S1+QiRzAS0kT54kuwFSp4rq6IuItrJb7lRBdOsKnJ/DnurnQJKeVIiYJzZqtI0RCpwOvyaQSxCnf4Ph/PezGpEA08hScLy8rsHh4zC7kppv6EWHVLIZZbftDOUR/C0v1sa2sFt4Cp6l2LXSRDROntjKYtLIy1YOQNtavxWKFqjHumpj/du7xnYbevt92/UAqdLUz2Ku9unW1YVEy2g== X-MS-Exchange-AntiSpam-MessageData: RHfQWxnF3DqllLci1GZq5BmwSc/f1Meu3eMf7AJuziOpEzGGlBgH67hQS9XbJ3L6g2V6MfX457yldbtt3X1jMg+LoqLo0ox4UqMqI3/gC/dFZ3ZmedzQIxJer/P0bA+BJciyjAKXqEkeZbcriHilWA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb7d9a3f-6b3b-411c-734f-08d911c0729c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2021 01:27:30.5843 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR04FT047.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR04HT060 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/vp3: Reindentation 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: Mg+RAlaKlGYR Signed-off-by: Andreas Rheinhardt --- libavcodec/vp3.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index ef443dbf22..6d44b9345c 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2431,14 +2431,14 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) /* init VLC tables */ bias_tabs = CONFIG_VP4_DECODER && s->version >= 2 ? vp4_bias : vp3_bias; - for (i = 0; i < FF_ARRAY_ELEMS(s->coeff_vlc); i++) { - ret = ff_init_vlc_from_lengths(&s->coeff_vlc[i], 11, 32, - &bias_tabs[i][0][1], 2, - &bias_tabs[i][0][0], 2, 1, - 0, 0, avctx); - if (ret < 0) - return ret; - } + for (int i = 0; i < FF_ARRAY_ELEMS(s->coeff_vlc); i++) { + ret = ff_init_vlc_from_lengths(&s->coeff_vlc[i], 11, 32, + &bias_tabs[i][0][1], 2, + &bias_tabs[i][0][0], 2, 1, + 0, 0, avctx); + if (ret < 0) + return ret; + } } else { for (i = 0; i < FF_ARRAY_ELEMS(s->coeff_vlc); i++) { const HuffTable *tab = &s->huffman_table[i]; From patchwork Sat May 8 01:27:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27690 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1026345iof; Fri, 7 May 2021 18:27:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKZ9609vZtqrg1pQmpBxcVwFr7hzHXpmfo7URtHlz5qy7Y0KjHpUfl3EAttgkldaOnVqj3 X-Received: by 2002:a17:907:7b9f:: with SMTP id ne31mr13223377ejc.139.1620437273754; Fri, 07 May 2021 18:27:53 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hp35si8305830ejc.361.2021.05.07.18.27.53; Fri, 07 May 2021 18:27:53 -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=@outlook.com header.s=selector1 header.b=HbbJPrlf; 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 314FF6807FB; Sat, 8 May 2021 04:27:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074098.outbound.protection.outlook.com [40.92.74.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 960F96807DF for ; Sat, 8 May 2021 04:27:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z7FOvufFxb+Kkaxuh1+8V1qUwm+nqryUi9Kx4y7u18kS3qqBQYUQaIRxbafBDPvj+wQjpBEHlAvaVvKVEaNwhYR43oJRNvJm3sqwDPZH2i+HUoT6I9M/yDGzDztA6S6DOX2fFJZsmJhpkc2do+IgxKHO3waU0/5O804N9wx+PC0wDCJ301GTN/viRcHDPT1EfnM6lpCC38M41tIOCBHZAZ8Ahp9kJqUlHYYyKA5N1ixOH8hePdWZiGTYXpJ4fD3WDWZoU1tVv8UrwFvj16YGayebwsYiuiG52qpDUmaXaBqH0tsmp78TBEl+EzAigohRRgz9bo4XtXzqZXPz/gv9cg== 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-SenderADCheck; bh=UzyQHlFD7baqoHFDsO1DhOD1yyhQ3nMsoqvxLIKODbk=; b=dqDg66Yk/zdpLX66b3KSM7e57irx6IhYuN/k7Olitj9fBCy34JNRtlgCcjFQMofb0q/rotI5JnRulj2T87/Qe9jSU2orHQIUOb7tCnad1rTSwDJYj5OdPgVIHJkRSBTyybn6D1YxwSImF13pRssFHFk8Qtcpc+dVAoJ1DtURo19CwF34XO2TgYXnEf0XclTf9ZRSYj1zDbd4DA0WJCdbKKTGph5/j/n/2NWC2kHmayiGg68KUWyfmBTc030xikuGkmZR2g4MLTicjCjAxuQ/ytcFdfU8ZZwRhaNf/FCXbOmYVFJnqmOR/XqiSIjqN8+mZRa4rHSnjG6bpXJqL9ZX/Q== 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=UzyQHlFD7baqoHFDsO1DhOD1yyhQ3nMsoqvxLIKODbk=; b=HbbJPrlfVaqo5Y2VRkk2HIzoMFoqUTWQgjAtqfEbLZzkUVz+IcTf9SyiX0uW+vmmln3yLaw2mmCtiHhn38XKpQdM9pw5xrJp6PRZyhZ2kjuZThOaBuY9ZLQJzaoESEJGZtdqxvgi6j4dtvdb5r3K/of0rB+PeVtoVxK/nIb+ZhW2pmkeF21u8qCuG0Faq3DNCgrAmq05Yc+RSxaC49C1Ta1NPgQVhI0MS6TqCt4HNMqD00xKYTwmr+WcqopbN/G+MC1RqkkUmDQO4Gl/ilCLosjXboGuy1itV1KA4qPWCO0zjjlWt81l3AbXQ2FZWgR2Mydn30foVJzhpVwU7vhQlQ== Received: from VI1EUR04FT047.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::4a) by VI1EUR04HT161.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::402) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Sat, 8 May 2021 01:27:37 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0e::4f) by VI1EUR04FT047.mail.protection.outlook.com (2a01:111:e400:7e0e::81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Sat, 8 May 2021 01:27:37 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:54327D651B25BC5DCCBD8CC4FC7DE942561826EB18060B196C2E39222EB7743F; UpperCasedChecksum:05DED2AEAF1D573F4281E1E9B12A4705ACEC766BFE4C355CAAF089CA5FC886F8; SizeAsReceived:7598; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Sat, 8 May 2021 01:27:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 May 2021 03:27:17 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [LPHtoO8HGnjxAhwHoWQqZAPCzcUInNOyF2BUYWLFNgU=] X-ClientProxiedBy: AM0PR06CA0123.eurprd06.prod.outlook.com (2603:10a6:208:ab::28) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210508012717.1025788-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0123.eurprd06.prod.outlook.com (2603:10a6:208:ab::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Sat, 8 May 2021 01:27:36 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 06530ad0-8acd-4b4b-8b3b-08d911c07679 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTy/gRYuf0ZoUTUwR2ZBCcC+UiOlj6nGlj9ypAKukqKvWVe7FxZJ7/3JjfdoKeyr+NefShKvYkH0B0JgLvzmM8O6j210ag4a23SnVtKgYNBBDw1OoG4N1y9NVCrcYhnszoenCo3CcQzQWb35/LsvbatRKqXMLjnHqTZd9fnaB3imnBscJSGcqnB20rM9Tw4qqaPAIM5XprQ8Ir2VdzaFGK7rbG5ukMsJ3jrlXztXPxypvA8rJx/kkWqUFfhhWqA6m4eoyfkZssO1yKLAujbPmJrr3RTDpnVDKdsjaPEJ9LgUnCyV5VslsQNCt4UWJ35vdo6SsRFz25cRpxksQDU4HK06wcqfOU06tWPaNnK7GvFH9PAzyePKUpYMdoB7lRNL9Y21pJOgeq8iT/Z21h1LcMrPk6Z1E2F/BAubxxPdOz3iBYUF8ZMNxH75dIuq37uUV8rtDAKzpWhuFQ4isD+Dlo+JwSLvZANLdKR7mnjHznjrIxi+jKZsbZ8hQPHfnLiQ5393rh8E86kQsf1iRnmDjTZ+HpGONBJBTh985syj64KWhHi4sAexxINS/+e6jV/dhoFWJMnqu4ztBj0wjNh3EO166CSKa5kZd4ybPV33ZIVdfJz/77rKKqYbdFIt6P3LcvQI2WTcfIi/Hy+pAVl3HBMpkfMvRz/s6CgmpYwWsDB+JYNdLhXWv6n5hx/1EF02tHQPwXAv0mN2znLVdMIzCACtNsL9SGRgs8WZn1a9EI+YO0/vLVjdzuxdHIWybZwDF4= X-MS-TrafficTypeDiagnostic: VI1EUR04HT161: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o5RlMS/yeNmVVKpyc1PYSadl+DkjdahFGm7cZUWMu6Z+myh5IMePr8wPzSx7Y1im6CvJlG22eeyphYsHJ9c2zkXHZLrOYwF+IQmG5tD82iDaIlEfdvguR54fw4fweCDkQH3pvYNsLTl3ajxDs/THThDxfRNCloVvNsJQYMAJriwia9L8RMKwlPwZTsNq2QIYC4E7ftesjzIxBTsGGzI3tmnmiodwCxyYP+fOmDmhYoVy0DBf080wQl1TFcyqa/gKTLotX9F0KJQ8m5fc5b0M/0hFcFLhPA2Gly+GSOIAPkNzUw7y8Pj46vkrcqH6tpHHDClMLGbM4aXlPqGW8PbWhn3RvDrqpHrkY+OTjFhXjjoEO8Cz/AjNBqQkW1fG4ZwB0CMxyXsNGnjCCOX4jBTFDA== X-MS-Exchange-AntiSpam-MessageData: oSRHF0EBXbzHkYghl/SApGf70v3WukNZ9FfCi8cQ79TlKAD+21LzHeHo84cLK5+UY8eZS+qe7pkzQ8gMKha3lNaIy2H3lsdyrBsO+jMHDfKHzW2NLyJD+FCFNsUV01XRUwuYKsmhgixwSonFIQ/3zQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06530ad0-8acd-4b4b-8b3b-08d911c07679 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2021 01:27:37.0585 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR04FT047.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR04HT161 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/vp3: Mark decoders as init-threadsafe 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: 2rvIe93ySqNL Signed-off-by: Andreas Rheinhardt --- libavcodec/vp3.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 6d44b9345c..166c1bf60d 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -3166,8 +3166,8 @@ const AVCodec ff_theora_decoder = { AV_CODEC_CAP_FRAME_THREADS, .flush = vp3_decode_flush, .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context), - .caps_internal = FF_CODEC_CAP_EXPORTS_CROPPING | FF_CODEC_CAP_ALLOCATE_PROGRESS | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + FF_CODEC_CAP_EXPORTS_CROPPING | FF_CODEC_CAP_ALLOCATE_PROGRESS, }; #endif @@ -3184,7 +3184,8 @@ const AVCodec ff_vp3_decoder = { AV_CODEC_CAP_FRAME_THREADS, .flush = vp3_decode_flush, .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context), - .caps_internal = FF_CODEC_CAP_ALLOCATE_PROGRESS | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + FF_CODEC_CAP_ALLOCATE_PROGRESS, }; #if CONFIG_VP4_DECODER @@ -3201,6 +3202,7 @@ const AVCodec ff_vp4_decoder = { AV_CODEC_CAP_FRAME_THREADS, .flush = vp3_decode_flush, .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context), - .caps_internal = FF_CODEC_CAP_ALLOCATE_PROGRESS | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + FF_CODEC_CAP_ALLOCATE_PROGRESS, }; #endif