From patchwork Thu Dec 23 09:13:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32855 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7105525iog; Thu, 23 Dec 2021 01:14:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJz/UqscbXV78WcD3m/WE/zk/Zq/r7EPW6fcc0ySECH1YI1k1CPedPSrSorpF6WA7I/FrOY6 X-Received: by 2002:a17:906:4703:: with SMTP id y3mr1229476ejq.346.1640250851137; Thu, 23 Dec 2021 01:14:11 -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 g9si2148060edt.243.2021.12.23.01.14.10; Thu, 23 Dec 2021 01:14:11 -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=ZocWRNyI; 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 BAEB568B15C; Thu, 23 Dec 2021 11:14:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071067.outbound.protection.outlook.com [40.92.71.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5334368B148 for ; Thu, 23 Dec 2021 11:13:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XtpvOZoO4rCuxw4e2gKGVnO1ZLXygjDHwhQY7yM61WQNtkavhsWjwQaMsQXqUvZj2nZ4lVvVE6gmeXXx4hfWcBHuHTh0wgTeZTklnh5UXrqzzoJ+zf/MSA1DyOPotwCcMqn+wourtvzLChrvU4n7uLGe/DtK7CPRyFjcOSFk7zhfK5R3SVrNJpiUYkIDwtQbcLOC1NyhuLfuz0fID3/uM0N/0f3wFoTqmroYzJucO68c3E5euJx829hghTOw0U+KdG1CbMdhW5FrLVagqf39IIaSp3eIHg+AKXappWDTdPDnuSUSzJoTvESRay2+fkhTyIS1NNBF/Y4JDmkyLNKQ1w== 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=AcALattJNm20VefZATtWgzSwTB7q2TsPzgE7EAxEM5c=; b=Hqalq8zNkvKGmCm8sIuNOec9n/J8G8hVOxCsM/a87YRHT6hGyoPEzzhmvBHpPI4rfquJl4lAdlGRALGsitenHIf6FddCaou194PEYySPeKUOcvqeWP6BPoXQEo7qWA5++LEPfADjUk/+Nf1s2Rjy2c9B5h9b6k5iKPikKhPYB0Ynj43W0faXJ9+Wfds7WdqCp8Ms/ggXBe3jyyphPtm1ebsWqkoe6wIbojht8+SD6Hcwnbynjua9OMfyppaHGeRhyDyIM8OUnl4uOTH/YfGADsvDOBbwwT1rJhRjB4otzLx+WmF1vcmP7b4tz2+6fiUZp5wjozRV+cmaymuUMAC9ig== 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=AcALattJNm20VefZATtWgzSwTB7q2TsPzgE7EAxEM5c=; b=ZocWRNyIsnflgt35OEUQKkyM4yT4lBWNubfwbaU7f9xnHSC3DqXKCQar6jVVXcrmSnrnnJvNSoKk3oRaDglBWrWathG1dkRP/8K31f5EHUrCo2Y98gOlQQLmryyuccwa6zX4eaYbGKqNf+ilHWOKbjtO2uuanJ5lLDQo9CGKNdzBLfTKEPi+9S1EwQXUJemoaxnEJ673f8jlIQ2pNog+cl9AjcJ2NukTqd8e1rXpPleb0WwREx+hGbzNcdTXzbpFVTnlCoUA3eE3vjmk/ljaotqdIaYtVu38x91hjZ5JkSdGUEfdUuMF3Js8dP++Hc5cP8152rHMVxep8RIU1xik6g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5701.eurprd03.prod.outlook.com (2603:10a6:20b:f6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.19; Thu, 23 Dec 2021 09:13:53 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%5]) with mapi id 15.20.4823.019; Thu, 23 Dec 2021 09:13:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Dec 2021 10:13:26 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [YkTaYjS0brazAD+PQzU1BrChQPJPcK0X] X-ClientProxiedBy: AM4P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211223091340.1450013-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8dc52bd3-ebe3-48b8-0dfd-08d9c5f48a11 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhlQiC7NGv+v69eNmCOGzzjRRFNt865ZPNG1QolM6AXvr8NzNzdSTDW8A6aUl9qbQpxdBwzCFY5Y5GaW50Xjqd03xkDImyQKtLWrvk9AkEs+Oaw6s+i9vew9cKAzMOJtB+fE/Ntg/w85JBSxjU0K9f1fp3F5TB5GeA+C0daFzPoi5rI9xIgTL0pzbfqMS0YI8voALoqyaDUTXg0gs/Ah8n8kLAWk3cV2y6SGNqSuB4qXGONTExvpor7qFq6NosEPLv1wGXaVGyIamDu1cYUFsgtSur3HWEfmcSrmcTNNm+62hMRVJcqjr2lja4LEliMVO0/eCrkqZOIFYezjWXx7PRrGaR7Z4qSw+cPFPPc3tnOTPACclD3dA/dit8umQ834ytrZUL+TqFgngjxPbVnTH5Xqgeq629YXXl1xqGhHQl7QVk00IcQ3t0RinBmrfayfQ4eAeblDmjrQhw+HMe0qGGyvt5wPOftunMA1XDnPB8Z1jNA6pjmBbAiOx56PHxSo2VyqwxEmrjsF4ZHs9jsP0Pz2Nbuhd4VUi1+FVq0qJbshoLhg71LddDa/BXXYtTXeVKdMGXm3TvnZYcT1DoKr2C6MAvHDqA0Yt7AhqjCe4ISK5A66whi/nt9sCT4C6CayYxUFsN28DzbN9vktfkwBHrEz/nosEghp8JBe0eoUZf3k6gvHNeKs6WjWr2dJXqYLOG0wx0AX6ApdK0= X-MS-TrafficTypeDiagnostic: AM6PR03MB5701:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qvlgpzf0gClqerz8AGMkUF1/5S6xY+FZsMSk1y9E7q+pB7l4PJAfKAkkOrsPZdYpxiW2SZxH9T/Eg642IfvOAfitJ1HRL0tm0te3y4md9yFz/KM5vJQbupUm82EpcWwm54KKBLtQyZQBE3VLX7XikBM7O/g03hDBJOzICRhpqNTKm7UeULz9AKLUn6DIxIeFRDiAovCStrcR9eIzqE3mKR8kWgItPghJU5JvbIZiLGerDCZnSRCfZAiAxdU8NtQqoCor9dRLmjcUagzmqprIrPAiQxMXIewxVUROiOtoThvd/xzKoR7KorKBsbt+2OAdlAfmATLRr3ea7iChINahnTC18pSViE3FKBgTgmGesL7VBiR40ddsZHm65Uavwqfjr83Qy01JbHeFBngS4yoTVLR0hWW89KOWj4dIBxYuM3l9jAA3UqejKiCUfqyiu/57mn8iLn1K4X6ODLlBLp8YNEnT6yEDD+qt1WIMpQhsvh1F7APc+TCf8VoioBXWKFKbxUP64+ck4zwi2OWM7c9qvEPWATtvEjqKqZPEg4+X+59WW6AuFTz5B21omu50PTxv7Ww+BhSbrHTdbpXNsAIjnw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: N9c8rfV9/HMzRlZsaiuL7naz9QoZ4TQPJiGsUggSLFbgdgFxZNpmNRvwejD3ZiS1/6WeuIdJ1hUCQEzo3M2n9GfxEB3na371MNicbE7fiFdK3LTEMx7kmPoTMfB01RdW2xcpr67Vzp6GIUwsKZPcZLD6Vgb+E8VSygah8HyZsKQqbwlBi7yUtfgyAOt3fr5JGECVOYR4j7upJXwkJy/W8jDqZ7bYiAbeDPOUJ2SUaM5cjsF6QIPhYmpuW80W5yQkv/1uZ4ZC9L/urliRFNxIrTJvHE40BmKTUDEbciRqTmZixbZZdLAt7v9bMRxy6iiYDZLe3B3VyCAYzQxC6M+Pn0SinoXnnrP2uQwXa2YVBXpxk/h8uafCjMtAVmRxWmnWSIO4nurXAbf39k49c3LVp2/hO0hITQx+3+zFptHVXtkXRetz92T2Kda6eX0nDQHjA5dI70fpH3fg/t3ydLbbdQqRAx3vCVopcy0toIZzqlAOVl1abcncjtqv+90f4QQRAiIuIXUczt4+YVBUetV8y7E43sKjsXzadRuaNvyCw53F24jkDPJu1b/4Dn3yg20zzp4j0fjcx5vqlaqXY31ldR5Qd6J667dLWHIMSR9hBX84sstBlgXUs3PQ0ni7sZhDKUaOd2IaqcoAqQlb8sZcs0Xfe1ttbzsEE0rBkTuWn9KDFbHKHcv6jYMs+s+UovjMEK1OxDU8/4xzltEHMpnlwH8XABp2PA2SjkUAH2VDYaKV913Avjpmdw1alD9aaV2aEIgwJ0LaByeKQmqKFugtgIJDWVNqrllqSdMUqgyeHujQ1mNTdvDu+5fhQShpfqk+cx80qA5+6zqHpIO8KkMbMGb6VVMNrNDu3cvLH2X4q+guUoJwPRVv8NttuiudoVQHec25JXb4F48EJqm81sQaZlXaFmQDLlFXHWeJicr1iuAKolxhW02LAJfwUNxvnEWowjRimu/4VpT1B9Dw2eaZWg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8dc52bd3-ebe3-48b8-0dfd-08d9c5f48a11 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2021 09:13:53.0576 (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: AM6PR03MB5701 Subject: [FFmpeg-devel] [PATCH 16/30] avcodec/mpegvideo_enc: Move updating mb_info to its only user 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: Sb3r0nprK+Si It is a H.263 option. Signed-off-by: Andreas Rheinhardt --- There is unfortunately another call to update_mb_info() that is not immediately followed (or preceded) by some ff_h263_* function; otherwise one could have easily moved this to a h263-specific place. libavcodec/mpegvideo_enc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 79f67ca01b..0c98629603 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -2906,8 +2906,6 @@ static int encode_thread(AVCodecContext *c, void *arg){ } } - update_mb_info(s, 1); - switch(s->codec_id){ case AV_CODEC_ID_MPEG4: if (CONFIG_MPEG4_ENCODER) { @@ -2924,8 +2922,10 @@ static int encode_thread(AVCodecContext *c, void *arg){ break; case AV_CODEC_ID_H263: case AV_CODEC_ID_H263P: - if (CONFIG_H263_ENCODER) + if (CONFIG_H263_ENCODER) { + update_mb_info(s, 1); ff_h263_encode_gob_header(s, mb_y); + } break; }