From patchwork Mon Apr 5 01:44:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26745 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 B427744982B for ; Mon, 5 Apr 2021 04:45:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 98C406880C3; Mon, 5 Apr 2021 04:45:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2090.outbound.protection.outlook.com [40.92.17.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 426B3680946 for ; Mon, 5 Apr 2021 04:45:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YnyDaYGL5yvS651cb2aARaRXZtBXOKAi5DOWjkdxuqBuQ+77hzkVswPMD1XEpl3pB2PSgRHdltNjPS2GF08vKNAjtxb2yVQT+48g2XugzdrxrOwQt5X0bd9wkNRY3Wt9k2hgWsayTe5oRUAZqjLxhPBje4pxhTKxD+Q8E+f9dbDXDNyBl5l7DFcWB26JqJ30P+b8rHL/VXLcq/b4d5dimQD9MchCuVWz9g9SL5XWKUSXFMuC0RpvQZYVnIa6JJPtBrC1ucEr5OpgMwICevUJUvFgW7vQRaXL6q7YbWHA+dY6ac8k9Doi/pomGRde2JHiFbDLiwiQ0FGiQt6s805Ljg== 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=+RzxgQMAnOcAhYeFYnbqhiWLOo7yiu3lTkI4Xd8K8A8=; b=ch0dZRTEA1pAy3/SrsTbijRxtu3t9ydvhg7qJ5H7VKssotmJRVlkVPFxsngphE8tI6wXiYRyAQ5nvjI1jCop4RhCLLlwazDa3LPZilLOY5YrXIRGQbGL1iwEiHeZFEW9IXKvBC1VMoidc6U2heTrYf41sV1sOHcFgdsiTc3MCrY+y40lUYZJK1sEzIuk3Bnbv5opm7HmEwHyVShYh7AeANAMEpI/zjibHpv3zvxCnqfqJ6ISwzMQHqhV2PsZT+0/s2Yzi+j8yUPw4+VfGcqiE922PxIfX/iPEEzt9wO46mMJnzwRF4fQR+Kjkbly2JiFChxDLNJ+Sm6V3y1GRXi3Ew== 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=+RzxgQMAnOcAhYeFYnbqhiWLOo7yiu3lTkI4Xd8K8A8=; b=bJTT6KUiLz8RDghy9xi1H+lDcft0m46/rUEdpHpJIiK5DRQjlSOuLh4EFndbjw/Mr1AIiWSaRdIdSAnb+K4hE+ADxlo65HBuPqIZ3jjZZ8k01pPzlEDny+6dXsG0nUWz9DVqaensOqygrvpw5A8q3HSaiimBkMhX77Mw82OFrAKwo0TCscHDJPJllzfHeY3tuOUOCNkLKWefEbx+HXtc1d5ZapSaUT/R4kq59sUjrEXMHZPI3qmtpXxSck9Jbb8YJUsjxOiBYad45qNQTLdcYywelor3vshQXUa4s9LrRub0xn5TS1X1n7Z6CMm+L9bZbs8nlsgj2HKK8cfxp1u0Sw== Received: from AM7EUR06FT063.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::50) by AM7EUR06HT032.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::126) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28; Mon, 5 Apr 2021 01:45:35 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc36::52) by AM7EUR06FT063.mail.protection.outlook.com (2a01:111:e400:fc36::403) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Mon, 5 Apr 2021 01:45:35 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:2C172DC8EF94BC8D92534D8F23303EC6A4A560EBECBF05C041B68FFCAC10266C; UpperCasedChecksum:8F25A4F62A75026A9D1E3D2D74A2AEBBE6D942170F50AA2332267070F822AD44; SizeAsReceived:7595; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3999.032; Mon, 5 Apr 2021 01:45:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Apr 2021 03:44:34 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [bHOOQwwfNyufWWLre5lEhbRHG7ci7AC4] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210405014434.3973535-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.26 via Frontend Transport; Mon, 5 Apr 2021 01:45:35 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: eec0f81f-5b3a-43b1-a71c-08d8f7d4819d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS3KLhuc01YFDN7B235wyuedQvkoheZYP7NcrtLAJGMWXdSzygTbeZVQeuY6JE3PioIeYYBwjtkhF9ouNdS/Sp8W3d8Mtmn+YVnV4oODIrfFKvv/q7st3I9W2ZwpDtUj0jA098iWtyhCzup8rEqbYOM/74yFiPOfdlcMg30X+6RuxpVejK+rB1fEAsVCH2/vPRiy9h7YYYeuZY2VaZFUJv+wq76SyL6XHXuuK3yOYRGJYe+8vSQZoWfCP0qJpX9T9vVx9j3hjBeQ/y4Bk1GrwEDC6CD4oeaupMte7KqymQ577RF2o45Q+QHpyQZWNHGjBE0bOTRrnDEWkezXmr44v923SOF4coa7iLjDfK7fg8OS1IUSYa/hyFopcpvDLEUaqdV22jC98/H+cXAiVeOHmgBCAa0WcSQKQh7cKpvhSwu16uBOfxqJI3+5nt7NxJkDysVXq2fCl0L6q2VDiMgHmCbGKdW4IMHqQrio2B9YgAhEqtoV2+/POabqf1PNS4K+AMb1gDbqxdrmywvBFqrJ56afy6+7nm3HyTdxR7XcEQ3TXwoIBAxO3fcm6FV6Ng4zwmI9szdaMbMDrW46usmn9w3/MfKrFJGwjMa5W6JQ4fsUXkpec8q8kmU/H8n/LBqcaDJEpsw96ydr9XfFozqM53Zo0GY9YWC/ddtAXjTsc8yKcXoLSmR3fthELzC1vbapiKzQSYBSw3ElF/IADyf/BF0biBC7neiqvYp3i5aSXRPioiq+aivdLeSzBlzXA2UvNg= X-MS-TrafficTypeDiagnostic: AM7EUR06HT032: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hl/VPhgUjnBfmL+UKLKxd8/0DZx65y8lflg/RitDU5HfwUviP/Uz0qK2crTLY3wyR2R1EWxEvaSBCb0ATzuvf4CVFm2DHNlvfDsos9c+OHIK00/AggZmLiVyhZo+PrZ8bZk8/DvGfK0WY+D8GrCOsbpq0ggncr9clpyROw4DmjG5KLQAWUnJ5aPP2bW5x3ji+87tacLn0K3/sgBiaJciSYv++YlF4Cb0rCvUIL/NEwvXYtsbYNwbOLHhJm3dOy3THybzS1jZqC6RQsHT+EaUj5OjbChiYiuAPaKFy0feXweKVz4mzWLLNSMICogCzvugPAbvDEkdfMUWUeMkvntz95RGPyK+uhm3oTxXBlP/Mtcmwr80r+E+boPbh+PkgQw5lnDBGXOh1patzVmuLrlzKg== X-MS-Exchange-AntiSpam-MessageData: MHA4ZFeRrijs2bFLDnyH1lMEoalItHBlMkQkHgHT0YcWkTOgmGxlx3mClS4gAwi99mngHr4QEEAb8Y+toxXcsqvt+Wyyi4YVcglT7ApnUurSIIIBr9faDOcxYlZ/RoXNcg4/fORLiQB/8tpdXF5+6g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eec0f81f-5b3a-43b1-a71c-08d8f7d4819d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2021 01:45:35.4754 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: AM7EUR06FT063.eop-eur06.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: AM7EUR06HT032 Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/h261dec: Initialize IDCT context during init 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Before 998c9f15d1ca8c7489775ebcca51623b915988f1, initializing an MpegEncContext's IDCT parts occured in ff_mpv_common_init() and this has been called in h261_decode_frame(), not h261_decode_init(). Yet said commit factored this out of ff_mpv_common_init() and therefore there is no reason any more not to set this during init as this commit does. Signed-off-by: Andreas Rheinhardt --- libavcodec/h261dec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index eb544e6046..0d8cd8c20d 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -79,6 +79,7 @@ static av_cold int h261_decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_YUV420P; h->gob_start_code_skipped = 0; + ff_mpv_idct_init(s); ff_thread_once(&init_static_once, h261_decode_init_static); @@ -595,10 +596,6 @@ static int h261_decode_frame(AVCodecContext *avctx, void *data, retry: init_get_bits(&s->gb, buf, buf_size * 8); - if (!s->context_initialized) - // we need the IDCT permutation for reading a custom matrix - ff_mpv_idct_init(s); - ret = h261_decode_picture_header(h); /* skip if the header was thrashed */