From patchwork Tue Aug 9 18:28:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37196 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp423046pzi; Tue, 9 Aug 2022 11:28:46 -0700 (PDT) X-Google-Smtp-Source: AA6agR6MqtSEHJD6JhQ6CWlWu+sOJTSIMAon+pq/tyveVBNdA/pZW5ofiDSxEkprsAJ5n8lpIojl X-Received: by 2002:a17:907:6e14:b0:730:a229:f747 with SMTP id sd20-20020a1709076e1400b00730a229f747mr18470046ejc.202.1660069726526; Tue, 09 Aug 2022 11:28:46 -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 he7-20020a1709073d8700b0073099d0fe90si3268845ejc.216.2022.08.09.11.28.44; Tue, 09 Aug 2022 11:28:46 -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=quN41Xs2; 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 11C3F68B7F0; Tue, 9 Aug 2022 21:28:41 +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-oln040092074077.outbound.protection.outlook.com [40.92.74.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF20A68B308 for ; Tue, 9 Aug 2022 21:28:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DXYgvT6N1nh9Vr/u5Rvic/1nHA8Bp75juWf2q0ko1XnOn/QOjzi0F6cPc0xBBCj5ZY93LvQwUGXDWn6lTcZc9dr5XX1lPNd7b14r+3YxILsWVeDYVXBHAJyUnwxV70bqnN4Q1EnOFV2i3pBhS3/HY/09iDLzEkAgmT5FD+aGWNe42axLLkz0v0E4TTKDfLzMXGDTFkZoy2eWl5t5VHiFLPZh4bmXRI2p1/TYbEqv5MCT7dWP026Vo9Rm25JEEHmxQ+eLCBX6q4twUv7A1umcMBuPJxtbTvuQljWzEn0AsNvwckpA98SorUZ8g9GZp8tw9TFSiaO1u5aKxTb44j+WTQ== 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=ify6n/YGY8Fr9DPjRy1LQ3nxMkqZCN+J6CA1Ir7CSb0=; b=R6u4u1MZMBHYi41GPMkbwu/9BUT7J4/DZ9iyUaj93WjF93rSG/dgZdyPuWDWgHTs/HKVorRFsFXq4Zcsv/cQNde75tQUwlMZ2SwCA12M4/rQavCe2KjRp16PscwlQDvLEBPLWEZhck0tvQOSH3LlG1rSIfsF48HCSsP7dcQhhzHGlwcVaMfCSc2YphqraIT/4PB+Jn12YopDleE81O36gkmWmAFWdpeJI417eZPu6s6+pBHd4k3/kpmyxFFtTmHxMsPOf1oQgslcnNj4m+1PMi0Avg2RbxRy7AWprJeRoz6SPNwIdhAGiy2GqU7e10nIImLqZvNnOI3cB04vDQrPqg== 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=ify6n/YGY8Fr9DPjRy1LQ3nxMkqZCN+J6CA1Ir7CSb0=; b=quN41Xs2xPOgvT7QlXS4ljCI+3pq5zUDMkdKKER67wlJ69THWAjtBj+2ySwv8EKGGQvs8kU4Vv6GFxTszE5puHilbal+AWhVLWf+ooZ4Z5PSl2XM42bpC1yV/RahBnUvAMTrWOBqqb7hlUo6uR6lOK8ZbNAAED1yCimVZqpitJlsrPKlUUQRGGcY4UAQhtf2nO5mTas5WBFV2UMNM6LNdorapAJ1MBHqqmD/nOJAf8jL0eABNZWW/mLYeZTgsVvodTT7yXWXK0y6i4vh1CbZsc6yTYpLwbLa7Ft6qMzNT7YEvjqE4VjPWUoICVm5U/sxe1hsph5irvTZC0NufkYLgw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DU2PR01MB8093.eurprd01.prod.exchangelabs.com (2603:10a6:10:276::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Tue, 9 Aug 2022 18:28:32 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Tue, 9 Aug 2022 18:28:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Aug 2022 20:28:15 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [eDQxiKr15vpMl6kPHsh5GwL7TJgnk8MU] X-ClientProxiedBy: ZRAP278CA0002.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::12) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220809182823.219584-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 27ed94af-8e11-490b-1654-08da7a34f6ac X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTC4ziyQch4o+p4arh48fV8YgiHM79OzMt8Ga4gbpq059lleuZTVpKUeT27Wo/RFa0LgDOEltvYP4NOVl3BgpRx1oWtROeSDWD5+JkwprumnNSuB4Vok9Qwnb+SB5ougx17zYVpvEQ7foAdKQLASdfKes7HzOvUY6uTbra3XL3W0ntieEFYcF6WoYqzMT8r0at3oYGEtG6ItRijtOxT0XpuYaaNu9EYBeCIbvaAiy2En+kidqRQOFXODcTvhlXd+eMoc5bpdluzv6myTrcB7ByzeqHFt1HG7tPeNqM92ZfGy0rZWFMhSu/ejnlXf3rQ278iWDLqbSx6wQNOLmuzp4iZTa+zlxGOaFMtMhYuPMS62yHbah75SwTPKqq7EkMd4nOZTvZ4pbAUNpv8OhFSi0PeDXdYN7SkITUPlgF0oSPw22cbK7JDE2hu+96TAUyYlrFmFRNxsdbeIs/fwNO9BN/Lx/KjWBSZL6vIjZHmNNajTmFX/6oY8Bz141ObtUDlBAS6/v698iI6g8ymzOZTtV9ylRNvWn3ds/9w27Ilg2PNQzzgLUqjiHOHncIZFK1MymhEIHiUHVGEbsIexXEdXszTiyGgksjES1J4tmXdelvRiYPnMe0MiQQgZQ4dxTVMLibKiJrNDkRizUCuCsB4xA8HSs556s+wtWpgsGKWtXLR5btZ0uJyHYIUOBFOv9wmTHj1GvvarFCBX4fsBAk7T8Fvfp8mcEjuo/Tao6D6+bwzbln9o6ySeT5bU5mEq36dM54= X-MS-TrafficTypeDiagnostic: DU2PR01MB8093:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bP+XoRS73Tr+iMaSkvaM4C9+RMkPZX4M8CtZYyIxMOQTSimxjP67ebciLrTt3AeXnvXbagSC1GGgk2dkFU6CSjV+J9gnQBGS20VEVIzXnZD6e541o2UBEQ7wzdXkiSkySI78tAo80JQfldbb9nZKNsoua8VY0IfK5fTWS8BIDujo8INWuxcR36A/i+m7iAyfjLH0o2qpMdxyZ2gAUFynkyqEdr3lvSHgPn0cU0S7GZ70Fg5SD3Ibnkonxo51bZMBYaJmnpwSbwMXfac9o79xWUrSRFKoeq1G8qyz144N16SV3VamCPGVx5AE0+6fwU97ee6aFNkRSFEBtvpkM0kbPqu/tciEiLobkQjFvkeZjI9bNSTYClR7p9pj2yljZL+jjPfHqWfxxD6BU6prIXRTLGQSVt9ydlV2DXYe5KtnVs0UXnZTGP+9fvLj032X25QqA6juetCtAGrj8JJvIw7JZqLD+ogIamg2fjVAJE0+zr2DI9IKmSalVXK+Z8sJMgjDtB1Ta+JMvtW7UvEbZZRV//vP8aVvmwUstWfejmRs39IIz6fIMyjisOv1+Ss/tnhN2clwYNtqNiCQnhVkfjZKQbKzsS9loG8prE0jqnWn+rXJ0b1OgMSWRi03KIsY3RJ8sN4vwoziK+qZtC5FAmDa5A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3rOTB5qF4jk0F1Bl4ysDXg6+NW1MIfE6JjcBYhshBcsJseFtcDWL+/qMOU3mI7QytlJstcOKl7IkQWQ3EBLZIVkMLL6kudIvHj+tijQl9OKITHFI11qDTLoQr4X/LRK0av4BlMVrFaiIspyTOkfs0TZM+H1upvnW8B9xDzIoE0cDrDkLCQkej1RYm4pM44gORufMG7RaHF+7XMpNDIxAd6PyekVZol+ZFGzB0qy3Om1VJEYuVSxT8x6Qn3hdcHN/tKp0KnUsfY1lYQmY04e0TFgCWyuYEwB6H64blw54CHA+zXn3xsYOYlOkvzzwiN0bgBwIqqPzCLiZUQ4Myih14lTnQ88RjEZ+hwhlQhp4XDItZgv1Nfscn3NGX98QndkkH7hBPykFG0LyAosKeqd7wCIOh30NBTANuxCDK+E7i5V8JVxE2cKCsgrlnM315ZCyn+a5UOEMg50+rUFyeEmt6z2VUnt0G3O18WYWWY6K2dp6Ux+sAdSnTZpwOBon+h7amsfrfGoixonFqZHFbimL04m4HHf94TuGtVq7lorzmfAIRazsMC6O1BenMnKKFAcToG5L6VArzE3qJRIIFdqVyLRwkXNwtAsc9+bnZ53h6/89aQoe3c6xIuSaoOudopZ1kdxBESNRV65lb6ZiLvQ7k0bmBplnVXmJUWYGTVheNRaxwk06rwcks06mHJZL2iVZj2nAZ+l1b016w2xoVSf9laut7nDCXbbtnH0WjOIkUo6W8akKFfhroml6J1SJh2N8zRm5FTJoL6vIKRqLwDLWi9o3/B6kwYPh2tkNjJmnx/phP8A/19PhRpEZuFGgexCF+8zChDvINuJW3stji/T6N/z7rkXYMiV+8T5Kybo/VkuRAy7S4XbSQfDTJGfkqyV6EMtq06s3oo/h5HA5W8gZp2r075DGA/tE9Hg3elKWBejQBRGRVoDHMzMHNnF3yXhUXBWNI+aL27lndl0xrpYunq9jRq0SX0OoK9hFovkJYN59foOIZdMCGMTRol6oZuGsRqBweG7vpZvNBCoLE4gm00TLcFyFOKcXjX6RzSKGYdIvl1rj4NqlcC9yYqLJ5oOVU1ZRMIv6gIL+iqYK4xf13kMM4/tiPZU5mPNPYehQPdGtd2bWT4RtxLT5p05jfIk8el7DJIXPobb1jxyheglXCpQVcPVyoFBx+BHH8ViNP+oVniP2WT1VagEuqi3MUdy58GSRG90ESwhiJhuw2cDLXvNnjRpoxcOi+n75s+i4wNW1AZmmu1qqxbRhAfUC9bn/+kZZkdwJjV+q3wbMM2jRNoxJugW33THqqls57H+VKWo= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27ed94af-8e11-490b-1654-08da7a34f6ac X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2022 18:28:32.6082 (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: DU2PR01MB8093 Subject: [FFmpeg-devel] [PATCH 1/9] avcodec/wmv2dec: Zero mb_type array for I pictures 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: 7KnbolijM8ec Up until now, ff_wmv2_decode_secondary_picture_header() only set the mb_type array for non I-pictures, so that the decoding process uses the earlier values of this array; this affects the output of the wmv8-x8intra FATE-test (which this patch therefore updates). These earlier values were set when decoding earlier frames or when the buffer was initially zero-allocated. A consequence of this is that the output of this test would be random if ff_find_unused_picture() would select the unused picture to return at random. Furthermore decoding from a keyframe onwards depends upon the earlier state of the decoder. This patch therefore zeroes said array when decoding an I picture. (It is not claimed that zero is the right value to fill the array with. I just don't know.) Signed-off-by: Andreas Rheinhardt --- Would be nice if someone knowledgeable about wmv2 could take at whether zero is the right init value. libavcodec/wmv2dec.c | 4 + tests/ref/fate/wmv8-x8intra | 644 ++++++++++++++++++------------------ 2 files changed, 326 insertions(+), 322 deletions(-) diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 6d9b72d123..22eb012f56 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -242,6 +242,10 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext *s) WMV2DecContext *const w = (WMV2DecContext *) s; if (s->pict_type == AV_PICTURE_TYPE_I) { + /* Is filling with zeroes really the right thing to do? */ + memset(s->current_picture_ptr->mb_type, 0, + sizeof(*s->current_picture_ptr->mb_type) * + s->mb_height * s->mb_stride); if (w->j_type_bit) w->j_type = get_bits1(&s->gb); else diff --git a/tests/ref/fate/wmv8-x8intra b/tests/ref/fate/wmv8-x8intra index c9ed2733e7..8802d03834 100644 --- a/tests/ref/fate/wmv8-x8intra +++ b/tests/ref/fate/wmv8-x8intra @@ -7,21 +7,21 @@ 0, 3, 3, 1, 115200, 0x8911d86f 0, 4, 4, 1, 115200, 0x7c5dd82e 0, 5, 5, 1, 115200, 0x7c5ed82e -0, 30, 30, 1, 115200, 0xd323d838 -0, 31, 31, 1, 115200, 0x6e7479ab -0, 32, 32, 1, 115200, 0x14674bf6 -0, 33, 33, 1, 115200, 0x074c2e3d -0, 34, 34, 1, 115200, 0x9b3025ef -0, 35, 35, 1, 115200, 0x76882dae -0, 36, 36, 1, 115200, 0xedf3421b -0, 37, 37, 1, 115200, 0xb5378486 -0, 38, 38, 1, 115200, 0xc4a53420 -0, 39, 39, 1, 115200, 0x559cb60f -0, 40, 40, 1, 115200, 0xcc034ddd -0, 41, 41, 1, 115200, 0xb77b7779 -0, 42, 42, 1, 115200, 0x0ad9c3e6 -0, 43, 43, 1, 115200, 0x4e673027 -0, 44, 44, 1, 115200, 0x54717979 +0, 30, 30, 1, 115200, 0x03fbd838 +0, 31, 31, 1, 115200, 0x37c879b2 +0, 32, 32, 1, 115200, 0xd5994bfc +0, 33, 33, 1, 115200, 0x4b662e3e +0, 34, 34, 1, 115200, 0x2f1925ea +0, 35, 35, 1, 115200, 0xc5912db0 +0, 36, 36, 1, 115200, 0x76c4421f +0, 37, 37, 1, 115200, 0x5cc8848b +0, 38, 38, 1, 115200, 0x75e63425 +0, 39, 39, 1, 115200, 0x1a29b620 +0, 40, 40, 1, 115200, 0x60c64de9 +0, 41, 41, 1, 115200, 0xc7ac7783 +0, 42, 42, 1, 115200, 0xb056c3ee +0, 43, 43, 1, 115200, 0xa57d3030 +0, 44, 44, 1, 115200, 0x2864797c 0, 45, 45, 1, 115200, 0xf9e557c9 0, 46, 46, 1, 115200, 0xbdcf6358 0, 47, 47, 1, 115200, 0xd55c7bb7 @@ -82,156 +82,156 @@ 0, 102, 102, 1, 115200, 0x78bb8f95 0, 103, 103, 1, 115200, 0x9c71d03f 0, 104, 104, 1, 115200, 0xbe5db887 -0, 105, 105, 1, 115200, 0xa88e00d0 -0, 106, 106, 1, 115200, 0xc7b50827 -0, 107, 107, 1, 115200, 0xf9155ed3 -0, 108, 108, 1, 115200, 0x8dd72d44 -0, 109, 109, 1, 115200, 0xee38183a -0, 110, 110, 1, 115200, 0xea2b6329 -0, 111, 111, 1, 115200, 0xf556c2b3 -0, 112, 112, 1, 115200, 0x90edebf9 -0, 113, 113, 1, 115200, 0x4f440fdf -0, 114, 114, 1, 115200, 0xfdec7a9d -0, 115, 115, 1, 115200, 0xc7927952 -0, 116, 116, 1, 115200, 0xdd475704 -0, 117, 117, 1, 115200, 0x974a61a5 -0, 118, 118, 1, 115200, 0xbf2b785e -0, 119, 119, 1, 115200, 0x5de451fa -0, 120, 120, 1, 115200, 0x3fac503e -0, 121, 121, 1, 115200, 0xc6785643 -0, 122, 122, 1, 115200, 0xe6666254 -0, 123, 123, 1, 115200, 0x1a05130c -0, 124, 124, 1, 115200, 0x082cea5d -0, 125, 125, 1, 115200, 0x473ef142 -0, 126, 126, 1, 115200, 0x9769a776 -0, 127, 127, 1, 115200, 0xe6e841af -0, 128, 128, 1, 115200, 0xa44c8d1e -0, 129, 129, 1, 115200, 0xd03d641b -0, 130, 130, 1, 115200, 0x3aea3c9e -0, 131, 131, 1, 115200, 0x09efcf21 -0, 132, 132, 1, 115200, 0xeeb6ff64 -0, 133, 133, 1, 115200, 0xa310af6f -0, 134, 134, 1, 115200, 0x2488519e -0, 135, 135, 1, 115200, 0x48e1febf -0, 136, 136, 1, 115200, 0x76d00513 -0, 137, 137, 1, 115200, 0xa28eda81 -0, 138, 138, 1, 115200, 0xc2cbdcae -0, 139, 139, 1, 115200, 0xd976c9b2 -0, 140, 140, 1, 115200, 0xb0abebab -0, 141, 141, 1, 115200, 0x32be4765 -0, 142, 142, 1, 115200, 0xc0a36b11 -0, 143, 143, 1, 115200, 0xb6d1d47f -0, 144, 144, 1, 115200, 0xab7954a6 -0, 145, 145, 1, 115200, 0xc485789c -0, 146, 146, 1, 115200, 0xa07101b6 -0, 147, 147, 1, 115200, 0x6297780a -0, 148, 148, 1, 115200, 0xf550ba94 -0, 149, 149, 1, 115200, 0x9b77f994 -0, 150, 150, 1, 115200, 0xb0e870ad -0, 151, 151, 1, 115200, 0x2dd89b0b -0, 152, 152, 1, 115200, 0x36dcfe2f -0, 153, 153, 1, 115200, 0x3e5e1a8f -0, 154, 154, 1, 115200, 0xb8394740 -0, 155, 155, 1, 115200, 0xbfc852fc -0, 156, 156, 1, 115200, 0x5b3f8aa2 -0, 157, 157, 1, 115200, 0xc29d8e3a -0, 158, 158, 1, 115200, 0x7300abd8 -0, 159, 159, 1, 115200, 0xd1dd7a3b -0, 160, 160, 1, 115200, 0xe5978f39 -0, 161, 161, 1, 115200, 0x235c6b8d -0, 162, 162, 1, 115200, 0xec1b5805 -0, 163, 163, 1, 115200, 0x16d23946 -0, 164, 164, 1, 115200, 0xa8de1cf4 -0, 165, 165, 1, 115200, 0x5e730512 -0, 166, 166, 1, 115200, 0x1250feed -0, 167, 167, 1, 115200, 0x0928c190 -0, 168, 168, 1, 115200, 0xa25d9e5c -0, 169, 169, 1, 115200, 0x921068ea -0, 170, 170, 1, 115200, 0x2c974ddb -0, 171, 171, 1, 115200, 0x35ae4d75 -0, 172, 172, 1, 115200, 0xec0c6469 -0, 173, 173, 1, 115200, 0x22704fad -0, 174, 174, 1, 115200, 0x0a9a5aed -0, 175, 175, 1, 115200, 0x45192f2f -0, 176, 176, 1, 115200, 0xc07b39f4 -0, 177, 177, 1, 115200, 0x32c60215 -0, 178, 178, 1, 115200, 0xda65035e -0, 179, 179, 1, 115200, 0x99d0cd81 -0, 180, 180, 1, 115200, 0xd08ca5e3 -0, 181, 181, 1, 115200, 0x82cdad17 -0, 182, 182, 1, 115200, 0x2587a420 -0, 183, 183, 1, 115200, 0x85cba73d -0, 184, 184, 1, 115200, 0x4677bf89 -0, 185, 185, 1, 115200, 0x84c2e034 -0, 186, 186, 1, 115200, 0xd343066c -0, 187, 187, 1, 115200, 0xdec716a1 -0, 188, 188, 1, 115200, 0x93c04f5d -0, 189, 189, 1, 115200, 0xce126ac4 -0, 190, 190, 1, 115200, 0xa20098c5 -0, 191, 191, 1, 115200, 0x9a4ca711 -0, 192, 192, 1, 115200, 0xfae9c154 -0, 193, 193, 1, 115200, 0xb34cc431 -0, 194, 194, 1, 115200, 0x923cdec2 -0, 195, 195, 1, 115200, 0x60ffdfe8 -0, 196, 196, 1, 115200, 0xa3e6f9f2 -0, 197, 197, 1, 115200, 0x374f0a47 -0, 198, 198, 1, 115200, 0x8fb228f1 -0, 199, 199, 1, 115200, 0x4c1a24bf -0, 200, 200, 1, 115200, 0x768a52d1 -0, 201, 201, 1, 115200, 0x5bf77025 -0, 202, 202, 1, 115200, 0x6ca67c2a -0, 203, 203, 1, 115200, 0x107ca3e9 -0, 204, 204, 1, 115200, 0x4abeda93 -0, 205, 205, 1, 115200, 0x750be9ff -0, 206, 206, 1, 115200, 0x28c5eee3 -0, 207, 207, 1, 115200, 0xa1b0e4b2 -0, 208, 208, 1, 115200, 0x2ae7f33d -0, 209, 209, 1, 115200, 0xf29cdae0 -0, 210, 210, 1, 115200, 0xd470f9ed -0, 211, 211, 1, 115200, 0x2d22f832 -0, 212, 212, 1, 115200, 0xc5b91780 -0, 213, 213, 1, 115200, 0x3d8e4151 -0, 214, 214, 1, 115200, 0x459f58e0 -0, 215, 215, 1, 115200, 0x8dc198fe -0, 216, 216, 1, 115200, 0x2479f579 -0, 217, 217, 1, 115200, 0xc2040c21 -0, 218, 218, 1, 115200, 0x39ad60d5 -0, 219, 219, 1, 115200, 0x9329dd37 -0, 220, 220, 1, 115200, 0xa08807da -0, 221, 221, 1, 115200, 0xbf514cd1 -0, 222, 222, 1, 115200, 0x8b66a779 -0, 223, 223, 1, 115200, 0x865ebff5 -0, 224, 224, 1, 115200, 0x5967074c -0, 225, 225, 1, 115200, 0xd5521f60 -0, 226, 226, 1, 115200, 0x462c329c -0, 227, 227, 1, 115200, 0xbefd36fb -0, 228, 228, 1, 115200, 0x6f58403b -0, 229, 229, 1, 115200, 0xe4af2fac -0, 230, 230, 1, 115200, 0x46453662 -0, 231, 231, 1, 115200, 0x72cc59e8 -0, 232, 232, 1, 115200, 0xd6c67f8e -0, 233, 233, 1, 115200, 0xd35674a7 -0, 234, 234, 1, 115200, 0x65785ddb -0, 235, 235, 1, 115200, 0xfd7958aa -0, 236, 236, 1, 115200, 0x93e45607 -0, 237, 237, 1, 115200, 0x196a4fa5 -0, 238, 238, 1, 115200, 0xe33a5dac -0, 239, 239, 1, 115200, 0x4e66904a -0, 240, 240, 1, 115200, 0xc1e3a50a -0, 241, 241, 1, 115200, 0xa685b351 -0, 242, 242, 1, 115200, 0xee2fdeb7 -0, 243, 243, 1, 115200, 0x189cefdd -0, 244, 244, 1, 115200, 0xbdf90506 -0, 245, 245, 1, 115200, 0xe72c23d2 -0, 246, 246, 1, 115200, 0xa3f65e7b -0, 247, 247, 1, 115200, 0x8bc67eee -0, 248, 248, 1, 115200, 0xd305d09b -0, 249, 249, 1, 115200, 0xc521eba5 -0, 250, 250, 1, 115200, 0x16cf161f -0, 251, 251, 1, 115200, 0x2ce322b5 -0, 252, 252, 1, 115200, 0x57ce82b4 -0, 253, 253, 1, 115200, 0x8da896b9 -0, 254, 254, 1, 115200, 0xc16ad590 +0, 105, 105, 1, 115200, 0x125900d0 +0, 106, 106, 1, 115200, 0x916408eb +0, 107, 107, 1, 115200, 0xe45b5f5a +0, 108, 108, 1, 115200, 0x94222dc4 +0, 109, 109, 1, 115200, 0xba6018b4 +0, 110, 110, 1, 115200, 0xe64b63f7 +0, 111, 111, 1, 115200, 0x2a6ac35c +0, 112, 112, 1, 115200, 0xb899ed0d +0, 113, 113, 1, 115200, 0xefcc1111 +0, 114, 114, 1, 115200, 0x67a57bbe +0, 115, 115, 1, 115200, 0x48877a83 +0, 116, 116, 1, 115200, 0xf83d57ca +0, 117, 117, 1, 115200, 0x80a6625f +0, 118, 118, 1, 115200, 0x984f78e4 +0, 119, 119, 1, 115200, 0xd0c7524d +0, 120, 120, 1, 115200, 0x60475044 +0, 121, 121, 1, 115200, 0xce495653 +0, 122, 122, 1, 115200, 0x05956238 +0, 123, 123, 1, 115200, 0x1ede12ce +0, 124, 124, 1, 115200, 0x5ecfea25 +0, 125, 125, 1, 115200, 0x533ff0cc +0, 126, 126, 1, 115200, 0x0900a711 +0, 127, 127, 1, 115200, 0x0ff44124 +0, 128, 128, 1, 115200, 0x96298cc0 +0, 129, 129, 1, 115200, 0xd2a063ab +0, 130, 130, 1, 115200, 0xe9c63c2f +0, 131, 131, 1, 115200, 0x0991ceda +0, 132, 132, 1, 115200, 0x089aff4e +0, 133, 133, 1, 115200, 0xabe4af7e +0, 134, 134, 1, 115200, 0xd7ba5162 +0, 135, 135, 1, 115200, 0xb3adfe6d +0, 136, 136, 1, 115200, 0xb04604c9 +0, 137, 137, 1, 115200, 0xdef1da1b +0, 138, 138, 1, 115200, 0x25ffdc48 +0, 139, 139, 1, 115200, 0x8b7ac975 +0, 140, 140, 1, 115200, 0xaa21eb49 +0, 141, 141, 1, 115200, 0x5ffc46cc +0, 142, 142, 1, 115200, 0x73616a99 +0, 143, 143, 1, 115200, 0xabfad3f5 +0, 144, 144, 1, 115200, 0x11d45466 +0, 145, 145, 1, 115200, 0xc123788b +0, 146, 146, 1, 115200, 0xa58d01e0 +0, 147, 147, 1, 115200, 0x72137847 +0, 148, 148, 1, 115200, 0x25b9baa9 +0, 149, 149, 1, 115200, 0x1d5bf9d6 +0, 150, 150, 1, 115200, 0x6bab7161 +0, 151, 151, 1, 115200, 0x59789be2 +0, 152, 152, 1, 115200, 0x2784ff18 +0, 153, 153, 1, 115200, 0x05901bec +0, 154, 154, 1, 115200, 0x5a8648be +0, 155, 155, 1, 115200, 0x048854c1 +0, 156, 156, 1, 115200, 0x5d2b8c69 +0, 157, 157, 1, 115200, 0x951d8fe6 +0, 158, 158, 1, 115200, 0x5118ad8c +0, 159, 159, 1, 115200, 0x6d417bdd +0, 160, 160, 1, 115200, 0x59c590d3 +0, 161, 161, 1, 115200, 0x7c826d1a +0, 162, 162, 1, 115200, 0xa87659cd +0, 163, 163, 1, 115200, 0xe0893b19 +0, 164, 164, 1, 115200, 0x73531ead +0, 165, 165, 1, 115200, 0x7bdf0697 +0, 166, 166, 1, 115200, 0xd3de0067 +0, 167, 167, 1, 115200, 0xcf29c29b +0, 168, 168, 1, 115200, 0xda299edb +0, 169, 169, 1, 115200, 0x0e766935 +0, 170, 170, 1, 115200, 0x29f34e91 +0, 171, 171, 1, 115200, 0x85524e53 +0, 172, 172, 1, 115200, 0x13796542 +0, 173, 173, 1, 115200, 0x78bc5073 +0, 174, 174, 1, 115200, 0xf4b05c51 +0, 175, 175, 1, 115200, 0x12ac3079 +0, 176, 176, 1, 115200, 0xf5bf3b45 +0, 177, 177, 1, 115200, 0x1a9103a7 +0, 178, 178, 1, 115200, 0x3b5904aa +0, 179, 179, 1, 115200, 0x5d4fce7c +0, 180, 180, 1, 115200, 0x3239a6fa +0, 181, 181, 1, 115200, 0xd7ffae3a +0, 182, 182, 1, 115200, 0xc687a51d +0, 183, 183, 1, 115200, 0xc5a5a871 +0, 184, 184, 1, 115200, 0x40a4c09a +0, 185, 185, 1, 115200, 0xd905e0c1 +0, 186, 186, 1, 115200, 0x0cea06c3 +0, 187, 187, 1, 115200, 0x87961734 +0, 188, 188, 1, 115200, 0x79bb502e +0, 189, 189, 1, 115200, 0x3a606c03 +0, 190, 190, 1, 115200, 0x7eea99f7 +0, 191, 191, 1, 115200, 0x8a13a800 +0, 192, 192, 1, 115200, 0x4793c238 +0, 193, 193, 1, 115200, 0xa305c503 +0, 194, 194, 1, 115200, 0x5e4bdf82 +0, 195, 195, 1, 115200, 0x0165e148 +0, 196, 196, 1, 115200, 0x175afb1f +0, 197, 197, 1, 115200, 0xfb710b4e +0, 198, 198, 1, 115200, 0x8074299f +0, 199, 199, 1, 115200, 0xb9bd2576 +0, 200, 200, 1, 115200, 0x0d135337 +0, 201, 201, 1, 115200, 0xe53e706a +0, 202, 202, 1, 115200, 0x57627bd2 +0, 203, 203, 1, 115200, 0xfa13a336 +0, 204, 204, 1, 115200, 0x1c47d9c4 +0, 205, 205, 1, 115200, 0x9f44e929 +0, 206, 206, 1, 115200, 0xfd15ee4d +0, 207, 207, 1, 115200, 0x0a43e426 +0, 208, 208, 1, 115200, 0x1413f2d1 +0, 209, 209, 1, 115200, 0x89eadaa0 +0, 210, 210, 1, 115200, 0x01b4f9c7 +0, 211, 211, 1, 115200, 0x0883f7f9 +0, 212, 212, 1, 115200, 0xd5f81739 +0, 213, 213, 1, 115200, 0x637d40c8 +0, 214, 214, 1, 115200, 0x211d5850 +0, 215, 215, 1, 115200, 0xb0319873 +0, 216, 216, 1, 115200, 0x90e9f518 +0, 217, 217, 1, 115200, 0x70f40bd3 +0, 218, 218, 1, 115200, 0x8f646061 +0, 219, 219, 1, 115200, 0x1f50dc9d +0, 220, 220, 1, 115200, 0x3c810751 +0, 221, 221, 1, 115200, 0x79e44c66 +0, 222, 222, 1, 115200, 0x6c9fa6b6 +0, 223, 223, 1, 115200, 0x9211bf3f +0, 224, 224, 1, 115200, 0xfbe70678 +0, 225, 225, 1, 115200, 0xab9d1e8f +0, 226, 226, 1, 115200, 0xf54f31dc +0, 227, 227, 1, 115200, 0xe6963636 +0, 228, 228, 1, 115200, 0x58ac3f43 +0, 229, 229, 1, 115200, 0x4d382f03 +0, 230, 230, 1, 115200, 0xaa663672 +0, 231, 231, 1, 115200, 0xbbf559c8 +0, 232, 232, 1, 115200, 0x6c567f1e +0, 233, 233, 1, 115200, 0x59817491 +0, 234, 234, 1, 115200, 0xba715dc2 +0, 235, 235, 1, 115200, 0x299f5882 +0, 236, 236, 1, 115200, 0x139455d5 +0, 237, 237, 1, 115200, 0x37e74fb1 +0, 238, 238, 1, 115200, 0x4f005ddc +0, 239, 239, 1, 115200, 0xc90e8fcb +0, 240, 240, 1, 115200, 0x22e4a47a +0, 241, 241, 1, 115200, 0xa974b2d2 +0, 242, 242, 1, 115200, 0xfab7de51 +0, 243, 243, 1, 115200, 0xa9a7ef13 +0, 244, 244, 1, 115200, 0x8ddd0464 +0, 245, 245, 1, 115200, 0xd314232a +0, 246, 246, 1, 115200, 0x1fba5db0 +0, 247, 247, 1, 115200, 0x52387e64 +0, 248, 248, 1, 115200, 0xc58ed032 +0, 249, 249, 1, 115200, 0xefabeb35 +0, 250, 250, 1, 115200, 0x002315c1 +0, 251, 251, 1, 115200, 0x124721f7 +0, 252, 252, 1, 115200, 0xc24981e9 +0, 253, 253, 1, 115200, 0xa1f795f0 +0, 254, 254, 1, 115200, 0xc01fd535 0, 255, 255, 1, 115200, 0x8cdbe729 0, 256, 256, 1, 115200, 0x69eafd96 0, 257, 257, 1, 115200, 0xd9e40a03 @@ -320,160 +320,160 @@ 0, 340, 340, 1, 115200, 0x82179a82 0, 341, 341, 1, 115200, 0xf8865f3d 0, 342, 342, 1, 115200, 0xa5fb7b80 -0, 343, 343, 1, 115200, 0x9aebc04d -0, 344, 344, 1, 115200, 0x44c705fc -0, 345, 345, 1, 115200, 0xd322add3 -0, 346, 346, 1, 115200, 0xf4230b76 -0, 347, 347, 1, 115200, 0xaa915069 -0, 348, 348, 1, 115200, 0x518d53d8 -0, 349, 349, 1, 115200, 0xefa7d909 -0, 350, 350, 1, 115200, 0x803c3c0e -0, 351, 351, 1, 115200, 0x5650bc0a -0, 352, 352, 1, 115200, 0x8b34ecab -0, 353, 353, 1, 115200, 0x975c4976 -0, 354, 354, 1, 115200, 0x700e3cb4 -0, 355, 355, 1, 115200, 0xef27a4ec -0, 356, 356, 1, 115200, 0x2b953936 -0, 357, 357, 1, 115200, 0xcf9b4956 -0, 358, 358, 1, 115200, 0xae4a8eba -0, 359, 359, 1, 115200, 0xf8821144 -0, 360, 360, 1, 115200, 0x97c2402c -0, 361, 361, 1, 115200, 0x209b7bb3 -0, 362, 362, 1, 115200, 0xd22fff2c -0, 363, 363, 1, 115200, 0xe85b4f16 -0, 364, 364, 1, 115200, 0x0659f318 -0, 365, 365, 1, 115200, 0x6e2bff98 -0, 366, 366, 1, 115200, 0xc6626f2f -0, 367, 367, 1, 115200, 0x123138e2 -0, 368, 368, 1, 115200, 0x69e680ab -0, 369, 369, 1, 115200, 0xe4d7cd1d -0, 370, 370, 1, 115200, 0x4ca10d47 -0, 371, 371, 1, 115200, 0x633a4c39 -0, 372, 372, 1, 115200, 0x64ded292 -0, 373, 373, 1, 115200, 0x88d2df42 -0, 374, 374, 1, 115200, 0x998f4c63 -0, 375, 375, 1, 115200, 0x753c76f9 -0, 376, 376, 1, 115200, 0x9d7ba0a6 -0, 377, 377, 1, 115200, 0x68798da5 -0, 378, 378, 1, 115200, 0xb5b18bc3 -0, 379, 379, 1, 115200, 0x20245e49 -0, 380, 380, 1, 115200, 0xf15d4b8f -0, 381, 381, 1, 115200, 0x17f83b69 -0, 382, 382, 1, 115200, 0xcc545783 -0, 383, 383, 1, 115200, 0x3dad530e -0, 384, 384, 1, 115200, 0x6b465c94 -0, 385, 385, 1, 115200, 0xbc5f3831 -0, 386, 386, 1, 115200, 0x1b2f042d -0, 387, 387, 1, 115200, 0xaec391ac -0, 388, 388, 1, 115200, 0x99fa8b2a -0, 389, 389, 1, 115200, 0xf78d3524 -0, 390, 390, 1, 115200, 0xe6255a24 -0, 391, 391, 1, 115200, 0x253542c6 -0, 392, 392, 1, 115200, 0xfab05365 -0, 393, 393, 1, 115200, 0x406a3749 -0, 394, 394, 1, 115200, 0xaf0f3935 -0, 395, 395, 1, 115200, 0x0d9ff780 -0, 396, 396, 1, 115200, 0xfadcfc15 -0, 397, 397, 1, 115200, 0x8267d5ad -0, 398, 398, 1, 115200, 0xd705d250 -0, 399, 399, 1, 115200, 0x18f9d1f2 -0, 400, 400, 1, 115200, 0xd92bc045 -0, 401, 401, 1, 115200, 0x439b9ca0 -0, 402, 402, 1, 115200, 0xcb80a14c -0, 403, 403, 1, 115200, 0xee887f49 -0, 404, 404, 1, 115200, 0xfba297eb -0, 405, 405, 1, 115200, 0x0e2f744b -0, 406, 406, 1, 115200, 0xaa227aa7 -0, 407, 407, 1, 115200, 0xd7bc6fff -0, 408, 408, 1, 115200, 0x295c91cf -0, 409, 409, 1, 115200, 0xc5678733 -0, 410, 410, 1, 115200, 0xc8d49120 -0, 411, 411, 1, 115200, 0xb14e90b9 -0, 412, 412, 1, 115200, 0x6a09acab -0, 413, 413, 1, 115200, 0xb9aec358 -0, 414, 414, 1, 115200, 0xeb3695b2 -0, 415, 415, 1, 115200, 0xc5bebd62 -0, 416, 416, 1, 115200, 0x2d6b1a3f -0, 417, 417, 1, 115200, 0x92986f49 -0, 418, 418, 1, 115200, 0x00c37cf9 -0, 419, 419, 1, 115200, 0x5a4d87a6 -0, 420, 420, 1, 115200, 0xe87888a2 -0, 421, 421, 1, 115200, 0x4ab18d6d -0, 422, 422, 1, 115200, 0xcb84880b -0, 423, 423, 1, 115200, 0x82458848 -0, 424, 424, 1, 115200, 0x11b477dc -0, 425, 425, 1, 115200, 0x56d876d3 -0, 426, 426, 1, 115200, 0xf5297ceb -0, 427, 427, 1, 115200, 0x47357713 -0, 428, 428, 1, 115200, 0xede562df -0, 429, 429, 1, 115200, 0xabf42d38 -0, 430, 430, 1, 115200, 0xea9225c8 -0, 431, 431, 1, 115200, 0x79ce1cb4 -0, 432, 432, 1, 115200, 0x0cd418b4 -0, 433, 433, 1, 115200, 0x6f7c118e -0, 434, 434, 1, 115200, 0xbbbc0fa4 -0, 435, 435, 1, 115200, 0x890514e6 -0, 436, 436, 1, 115200, 0x9c4d0e7d -0, 437, 437, 1, 115200, 0x56260e76 -0, 438, 438, 1, 115200, 0x7dc80258 -0, 439, 439, 1, 115200, 0xa990f5a3 -0, 440, 440, 1, 115200, 0x2174e913 -0, 441, 441, 1, 115200, 0x8296e674 -0, 442, 442, 1, 115200, 0x9e28e3b4 -0, 443, 443, 1, 115200, 0x404ce72b -0, 444, 444, 1, 115200, 0xc7cbf4ec -0, 445, 445, 1, 115200, 0x5ce0f5a1 -0, 446, 446, 1, 115200, 0x88dbf7c7 -0, 447, 447, 1, 115200, 0x26daf35a -0, 448, 448, 1, 115200, 0x5cfdfe63 -0, 449, 449, 1, 115200, 0xdd40fb9b -0, 450, 450, 1, 115200, 0x5b8df20f -0, 451, 451, 1, 115200, 0x4f2ce5ac -0, 452, 452, 1, 115200, 0xc9d0e0c2 -0, 453, 453, 1, 115200, 0x51c7e2a6 -0, 454, 454, 1, 115200, 0xb3bae109 -0, 455, 455, 1, 115200, 0xbd85e5b2 -0, 456, 456, 1, 115200, 0x1fbbdfd1 -0, 457, 457, 1, 115200, 0x3665dfd0 -0, 458, 458, 1, 115200, 0xcd29d50c -0, 459, 459, 1, 115200, 0xedd1c6bc -0, 460, 460, 1, 115200, 0xebc2d072 -0, 461, 461, 1, 115200, 0xe2e5fbbd -0, 462, 462, 1, 115200, 0x616a13dc -0, 463, 463, 1, 115200, 0xf64f1efc -0, 464, 464, 1, 115200, 0x5356235f -0, 465, 465, 1, 115200, 0xafc032d5 -0, 466, 466, 1, 115200, 0xaa034420 -0, 467, 467, 1, 115200, 0x007e0afa -0, 468, 468, 1, 115200, 0x077ad5c8 -0, 469, 469, 1, 115200, 0x8fc815b8 -0, 470, 470, 1, 115200, 0x95b85990 -0, 471, 471, 1, 115200, 0x46f5899f -0, 472, 472, 1, 115200, 0x1e37cd82 -0, 473, 473, 1, 115200, 0x3ce90bfd -0, 474, 474, 1, 115200, 0xbb95bd1d -0, 475, 475, 1, 115200, 0xd4aa9ba8 -0, 476, 476, 1, 115200, 0x0e761649 -0, 477, 477, 1, 115200, 0x49ad7886 -0, 478, 478, 1, 115200, 0x2f4184df -0, 479, 479, 1, 115200, 0x80b906ee -0, 480, 480, 1, 115200, 0x62405100 -0, 481, 481, 1, 115200, 0x3ece13b5 -0, 482, 482, 1, 115200, 0x3abd4cfc -0, 483, 483, 1, 115200, 0x91b418e3 -0, 484, 484, 1, 115200, 0xde1ce68e -0, 485, 485, 1, 115200, 0xfc47f912 -0, 486, 486, 1, 115200, 0x5b380a6f -0, 487, 487, 1, 115200, 0x8f35c3c0 -0, 488, 488, 1, 115200, 0xb26dc220 -0, 489, 489, 1, 115200, 0x3d5bbfce -0, 490, 490, 1, 115200, 0xa1f9bee6 -0, 491, 491, 1, 115200, 0xa87dcd24 -0, 492, 492, 1, 115200, 0x9374cb71 -0, 493, 493, 1, 115200, 0x0c7ccbd0 -0, 494, 494, 1, 115200, 0x9a16cc49 -0, 495, 495, 1, 115200, 0x4df0c28b -0, 496, 496, 1, 115200, 0xb5b8b866 -0, 497, 497, 1, 115200, 0xafcc1019 -0, 510, 510, 1, 115200, 0x623b0ff3 -0, 512, 512, 1, 115200, 0x1d6f10b5 +0, 343, 343, 1, 115200, 0xf2a9c04d +0, 344, 344, 1, 115200, 0x2b4005ea +0, 345, 345, 1, 115200, 0xcec6ad14 +0, 346, 346, 1, 115200, 0x1c040afc +0, 347, 347, 1, 115200, 0x164c4fd5 +0, 348, 348, 1, 115200, 0x5bcc5385 +0, 349, 349, 1, 115200, 0x7f7ed8d3 +0, 350, 350, 1, 115200, 0x48ab3c54 +0, 351, 351, 1, 115200, 0xd5debbfb +0, 352, 352, 1, 115200, 0x720ded36 +0, 353, 353, 1, 115200, 0x3ae44a00 +0, 354, 354, 1, 115200, 0xfa893d68 +0, 355, 355, 1, 115200, 0xc833a619 +0, 356, 356, 1, 115200, 0xa3583b05 +0, 357, 357, 1, 115200, 0xffed4aed +0, 358, 358, 1, 115200, 0x3757904a +0, 359, 359, 1, 115200, 0x2f09122d +0, 360, 360, 1, 115200, 0xcc9f40d6 +0, 361, 361, 1, 115200, 0xb8287bfb +0, 362, 362, 1, 115200, 0x5f62ff06 +0, 363, 363, 1, 115200, 0x76b04f67 +0, 364, 364, 1, 115200, 0xa9e6f352 +0, 365, 365, 1, 115200, 0xc0e6001f +0, 366, 366, 1, 115200, 0x19bc6f22 +0, 367, 367, 1, 115200, 0x0dbe3871 +0, 368, 368, 1, 115200, 0x413c8035 +0, 369, 369, 1, 115200, 0x8c28cc8d +0, 370, 370, 1, 115200, 0xdd7f0cda +0, 371, 371, 1, 115200, 0xf6f14c0c +0, 372, 372, 1, 115200, 0x23bbd27b +0, 373, 373, 1, 115200, 0xa8b8df03 +0, 374, 374, 1, 115200, 0xadb14c5a +0, 375, 375, 1, 115200, 0xb5ca76f0 +0, 376, 376, 1, 115200, 0xea38a095 +0, 377, 377, 1, 115200, 0x60218deb +0, 378, 378, 1, 115200, 0x947e8c0f +0, 379, 379, 1, 115200, 0x6afe5ed1 +0, 380, 380, 1, 115200, 0x139f4c22 +0, 381, 381, 1, 115200, 0x5e4c3c2d +0, 382, 382, 1, 115200, 0x86df5833 +0, 383, 383, 1, 115200, 0x824e538a +0, 384, 384, 1, 115200, 0xebf25d19 +0, 385, 385, 1, 115200, 0x229438ae +0, 386, 386, 1, 115200, 0xde5e0494 +0, 387, 387, 1, 115200, 0x63399194 +0, 388, 388, 1, 115200, 0x1f048b80 +0, 389, 389, 1, 115200, 0x0774357a +0, 390, 390, 1, 115200, 0xddd75a69 +0, 391, 391, 1, 115200, 0x6d054339 +0, 392, 392, 1, 115200, 0xd0995428 +0, 393, 393, 1, 115200, 0x607a37eb +0, 394, 394, 1, 115200, 0xa704399c +0, 395, 395, 1, 115200, 0x0d7ff8b8 +0, 396, 396, 1, 115200, 0x5b20fd4e +0, 397, 397, 1, 115200, 0x7cbad667 +0, 398, 398, 1, 115200, 0xe217d35f +0, 399, 399, 1, 115200, 0x3ff6d303 +0, 400, 400, 1, 115200, 0x5aa4c0e4 +0, 401, 401, 1, 115200, 0x2d779d91 +0, 402, 402, 1, 115200, 0x7097a25d +0, 403, 403, 1, 115200, 0x57c5809d +0, 404, 404, 1, 115200, 0x0fe0997e +0, 405, 405, 1, 115200, 0xd81d75a9 +0, 406, 406, 1, 115200, 0x30a87cc0 +0, 407, 407, 1, 115200, 0x22a971b6 +0, 408, 408, 1, 115200, 0x9f849351 +0, 409, 409, 1, 115200, 0xa1218894 +0, 410, 410, 1, 115200, 0xefdd92a8 +0, 411, 411, 1, 115200, 0xe0559201 +0, 412, 412, 1, 115200, 0x07ebade6 +0, 413, 413, 1, 115200, 0xe0c2c425 +0, 414, 414, 1, 115200, 0x92159752 +0, 415, 415, 1, 115200, 0x048fbe24 +0, 416, 416, 1, 115200, 0x8a051ae9 +0, 417, 417, 1, 115200, 0xed466ff3 +0, 418, 418, 1, 115200, 0x11157da7 +0, 419, 419, 1, 115200, 0x1f958850 +0, 420, 420, 1, 115200, 0x1e488948 +0, 421, 421, 1, 115200, 0x8c538e13 +0, 422, 422, 1, 115200, 0x26d188b1 +0, 423, 423, 1, 115200, 0x903b88e8 +0, 424, 424, 1, 115200, 0x04ed7882 +0, 425, 425, 1, 115200, 0x58d17772 +0, 426, 426, 1, 115200, 0x37c67d8c +0, 427, 427, 1, 115200, 0x6c2677b4 +0, 428, 428, 1, 115200, 0xc0a763ba +0, 429, 429, 1, 115200, 0xce242e3c +0, 430, 430, 1, 115200, 0xcd0c26d9 +0, 431, 431, 1, 115200, 0x4cf81d8a +0, 432, 432, 1, 115200, 0xb5a61995 +0, 433, 433, 1, 115200, 0xb4bb1276 +0, 434, 434, 1, 115200, 0x085210a6 +0, 435, 435, 1, 115200, 0x4cf215b4 +0, 436, 436, 1, 115200, 0xe78d0f4b +0, 437, 437, 1, 115200, 0x52bc0f3c +0, 438, 438, 1, 115200, 0x8c50033d +0, 439, 439, 1, 115200, 0x0147f6b5 +0, 440, 440, 1, 115200, 0x5da1e9f2 +0, 441, 441, 1, 115200, 0xf5fce75b +0, 442, 442, 1, 115200, 0x90aee4e5 +0, 443, 443, 1, 115200, 0xd73ae879 +0, 444, 444, 1, 115200, 0xb578f62a +0, 445, 445, 1, 115200, 0x9ebcf6dd +0, 446, 446, 1, 115200, 0x7a3cf909 +0, 447, 447, 1, 115200, 0x7240f4b6 +0, 448, 448, 1, 115200, 0x55a9ffcd +0, 449, 449, 1, 115200, 0x95c7fd1b +0, 450, 450, 1, 115200, 0x40e3f3c4 +0, 451, 451, 1, 115200, 0x2059e762 +0, 452, 452, 1, 115200, 0xa0bee25d +0, 453, 453, 1, 115200, 0xedf9e470 +0, 454, 454, 1, 115200, 0x83a9e2b0 +0, 455, 455, 1, 115200, 0xf420e78e +0, 456, 456, 1, 115200, 0x5512e1ad +0, 457, 457, 1, 115200, 0xca18e192 +0, 458, 458, 1, 115200, 0x46d5d6cb +0, 459, 459, 1, 115200, 0x40c7c6bc +0, 460, 460, 1, 115200, 0x45e4d06b +0, 461, 461, 1, 115200, 0xeefffb82 +0, 462, 462, 1, 115200, 0x6f9a1394 +0, 463, 463, 1, 115200, 0xec521ebc +0, 464, 464, 1, 115200, 0x8b632329 +0, 465, 465, 1, 115200, 0x858732ba +0, 466, 466, 1, 115200, 0x1f364406 +0, 467, 467, 1, 115200, 0xf6870af0 +0, 468, 468, 1, 115200, 0x8738d586 +0, 469, 469, 1, 115200, 0x52761588 +0, 470, 470, 1, 115200, 0xc1c8593d +0, 471, 471, 1, 115200, 0x88a88938 +0, 472, 472, 1, 115200, 0x4a01ccf5 +0, 473, 473, 1, 115200, 0x2d990bde +0, 474, 474, 1, 115200, 0x2dc9bd2b +0, 475, 475, 1, 115200, 0xc1599b9b +0, 476, 476, 1, 115200, 0xce621632 +0, 477, 477, 1, 115200, 0xbe027871 +0, 478, 478, 1, 115200, 0xf48f84a8 +0, 479, 479, 1, 115200, 0x6a240689 +0, 480, 480, 1, 115200, 0xfb90504d +0, 481, 481, 1, 115200, 0x1a5512ec +0, 482, 482, 1, 115200, 0x5f124c22 +0, 483, 483, 1, 115200, 0x2ea3180e +0, 484, 484, 1, 115200, 0x2519e60e +0, 485, 485, 1, 115200, 0xe240f88d +0, 486, 486, 1, 115200, 0xac9209d8 +0, 487, 487, 1, 115200, 0x926fc3b8 +0, 488, 488, 1, 115200, 0xa5cdc217 +0, 489, 489, 1, 115200, 0x4d52bfcc +0, 490, 490, 1, 115200, 0x2ce6bedf +0, 491, 491, 1, 115200, 0x19e4cd0d +0, 492, 492, 1, 115200, 0x1cc7cb5c +0, 493, 493, 1, 115200, 0x74facbbc +0, 494, 494, 1, 115200, 0xb771cc31 +0, 495, 495, 1, 115200, 0x6aabc273 +0, 496, 496, 1, 115200, 0x0308b854 +0, 497, 497, 1, 115200, 0xa70a1019 +0, 510, 510, 1, 115200, 0x59790ff3 +0, 512, 512, 1, 115200, 0x0e7110b5 From patchwork Tue Aug 9 18:34:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37197 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp425976pzi; Tue, 9 Aug 2022 11:35:13 -0700 (PDT) X-Google-Smtp-Source: AA6agR4BnIeigk7YG5jFo1JNs/NdS7lGRuhgQyIEj/GSM9naXIzJV6TiVrVIji+5ct95UzEdxbhU X-Received: by 2002:a17:907:3e91:b0:730:ba28:28d2 with SMTP id hs17-20020a1709073e9100b00730ba2828d2mr18545626ejc.10.1660070112794; Tue, 09 Aug 2022 11:35:12 -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 h6-20020aa7cdc6000000b0043da6d85bb2si8175233edw.631.2022.08.09.11.35.12; Tue, 09 Aug 2022 11:35:12 -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="ma5FEl/q"; 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 9478468B371; Tue, 9 Aug 2022 21:35:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2104.outbound.protection.outlook.com [40.92.58.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B17D268B371 for ; Tue, 9 Aug 2022 21:35:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CmXBz3a9AHiagWn0uLMDeuoHLzO/+dET9RyujdgLQSYyVCSoxSlBeG7dExM54VInWcNTJU87a0L13hgKQ0HDErH57kL5ImrsD3GSGTmHQE2wPGSmzwpINib62GUPpgMdRPiCQT3nPi2SNDa9nY4YnNfamS3vzTUuDoJLCJ81rLJoMxoAUJQii9fL/qVTSnpXm9lHBqAaWKMCnAbnYVcejCPFG8wk959xS8zRo35z6EdyLgS186hYsfyn+hBAdsX7HzrbuEsSEEels9h2wJW9cG9OYxCdWidUP22q28ve1v4hQlfY8y1ZyvEmBtQTKx8ctVu+KQk9e7MVXSbLnjtmHQ== 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=8l9M5E4yJZQFGFI4PBfHWfE8VAhURMzkIHAbYiEqxjo=; b=jv9SdEZPRMU9oVacpkaJpioFnRlhN/9y/L5bDwH/Nb2e/ihjGDb2oTWshRooyZWllzcpCuUoWlbTNOr6fh2ZcSO/VkRFfuQWf9e07MLeI0BXgfJ+U10qAyYvjRCkuEzSKFpYvccZ1CC4nN8Uz5rAXOrV4ivzK1kcwCH5nGZkf1P72rn6hCYMcZulez5wIosGrgOesTfUh5zLSX+sLSOweH51NVdVrIuXoJBBA9N50/hBa/8jffqoHNmOhOqERazzXZJZaUuiT92g9CVoXc6HSdFlICKGC+T3r3ZzqLfhpmFEkmYXfl4hxq8Se/5pudVawD758F1yuBa4EKh6H4xUrg== 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=8l9M5E4yJZQFGFI4PBfHWfE8VAhURMzkIHAbYiEqxjo=; b=ma5FEl/qEJPEd2PJ6A/OJlBHjWo3LTkO3kQHbFmFv1ejqefdFBUJKW1jSIgvpxJVik6XRQq73Cbiozvw3eRNkIcNRkzVCrzELBSmuOPJxN7CNADogR7g1N7zMzgHbVNZeI43HjJEhnHH886mL9sAJWBsMbeju5EdDHDlD5PYW/uWHyiRoWTuKSP7/h4NrqRTTpGf3fSdBqXRWn39rGBSvSpBszTpAh0L+tX5GB0h1heFAjndomrh5uX/uif/iJscB0hkV7hcrDpVLm2I9b4ELMXKHfY/NLkcATBv/K1gwOO7WmmzDCDWSmp5aExILC9+astfsGnU2tg7k/F39uwg9Q== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DU2PR01MB8093.eurprd01.prod.exchangelabs.com (2603:10a6:10:276::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Tue, 9 Aug 2022 18:35:02 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Tue, 9 Aug 2022 18:35:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Aug 2022 20:34:46 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Fjrftvsh5rCAi05VZIUrUbLwD30J4TRT] X-ClientProxiedBy: ZRAP278CA0011.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220809183453.220687-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e946bceb-ed4c-4b10-5376-08da7a35ded3 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXow4yDQWpczRUJbygObe2vr4AuZwNh6RBFzutJbV2T+1aMmHV2jBtXeE3NT/IRU0NoahP3L+AmveydttH1jyE5lxpU01THEJkNtEZ4h/DlFjnj6XPB7eGW6RZZNFHoX4HkR3t2gdKdjTsgYe5BU4f4+QInRsA4f6kQ6s+Z3ns/Iv6EHphE8CPva3ZOrYMpAdrQN2dBZueLK1rGMjywMyAe9lCIwpxcXiHP51WITQMYOYssA1gzMno7hkuOE/pWGsDJDiuYRi32pTWMpZWaG6yRNvHueHDLY7eMEHxQ+sZycYgLAnKo0vp5WZuJMTapuIU5H4ynV1B0TWeVfX1MzVJ19YUJYUVAoa6otUYWrWL4O0ZMfD71PPJ2aUBrlgL6pPwMnhgQUMzw3H2EZ9eKSOvEb96IjcGriSHHAhj80wICfLi8q5aWxfmEpYZmGP5aODcRxEe8uaZFNqwrZy/AYomZu7cygMEcQeCq+5+Z7fp6wFJjViBYVXjDRVKf23Glyc1kRO/XruVgaaOjoLguCRrau2zNy9/RU+hVmkwOP44R/Gq2kybT19Mm6/eTdcQ0UmB35F5xo+4ULAL0PcFgjtGi5BDEfM5da/phsRizxT5CMxxaQk0PNrUXm2ElJIDOPW6IUydLbVQzCloRl3Ow60+67IiTRS9mq4rVxfhw1WpmncDs/a+BiEqVSt37SuoBwRfVOrP/Dn/CaJweJ3rjxqhN1XZj8xKCH14= X-MS-TrafficTypeDiagnostic: DU2PR01MB8093:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l6D+yMdOGKDVeRWCrcnTU6adFxxOLaZLOn2Q7tROJH4nhJaBRrAQ2RcGCyQ0ON6MmDxqExvQK0cJHOlbuOfCIQ2GlYXY7w38ZHvKPHzOyoJvQpF0pu/vr5j6gOVHqRRbfe+Pcg7x9vo5tHjQsPMM9BC8ZzUN7RFolo4YoXC0IA1wCwzwl0i2K5v25ZBcEr6YQkDLdB8UWuUl+/FMtwBvGr0B2tyRpqIKxyZDVTmofQiEzB7pU43B9tlBGhNgE923qRAVNtTAbT+cWv2v8GQ+1joW+FUp+lWGjig56ESrRBP9ZF5w0fgbUueFGPGfK5vz4L4pXTS7aSC0uL/bWn0eIxxLHblOSNJvSjn/gOeWPOtH0xMi+ZbVTeeHapoyiQHCGWgGg4Eb3MX/nWGLi4/k6PkG+K1rw+u9BCZfLwELgG6ixFTmd6kLjpsNVMiD2gxgmCNJxtuFFXdUdAQ0f1ZGpib8QYvTlpeV18oyFmASFbxOKT5ehawvRXnXWcL8Vo4eEMPnQyJRd/zFR5ATdnK9uVcSsHV1rkwRu7QraL8Z2FyxQLkV4hdaB7hpGgY+KfiZzC07yIy1i6lYj33jWPAtxhl4iSFVXEPhNv4tRe59usl1INv5HyvkKit7G8Trh1yECfhBAaTEmmvhxTG6sLJs1g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BZcO1Pa2rmEhYcFd2AbxYydmFraYz0k2hXiDa5ss6DrJgibjc0mL/PB/f3/l+gu1fudNDHc66SveYmiBTMqqbBnCd0EAMkk2HYhRVTH/lCfyLQSGk2zWXFP9G17vSysuzzrX7ZY6NsiW0j9O8vmmNJnYZhUzZz8X8C/YgkS7DNyLMYJ5+bJEg/PH6koFPCQXla2gh0iKPHS0VDnx/rTQlKEV1jrQAbAQhuoJTLchCCuKRAZCbsO+uC5ZIqHRCrQy2S/dgktBb1p55KjKWKPVllf6n9Bl6Jx0mckzM8ugHEaOIV/eKY/mCfH1ad2Dh+DQVF/r+nfOi7L4Q2cg1mIC1KoUEpA0VjhkULH3RmPmxUTE1UUoda4w8WP16YZTa2tkCLJrH/WiDQZOwXb9PyV+tzys/26FeTiRGT3An9EzVYhorl2h3ObfbEiPNUcIO8pyCg5SG05ECXJmCB3F48lB8fXJd09PbRUkvRVPfa57RgTCt/h1Fc8ZU1yosOfxGAzXkJCHtSCsfaefBQCBM/Ql4Vj3nVqNYSwzbqHMccAmgFp6HMTST3zxcynDWTD+I7Du2+qHXxS0yv/YEOx6gEOwnlhS3cPgSS9pjKTSefB7buahgukGUb5FFgDKcB4rDSwm5l50zquHDyXbDP/krqdmIIo5WRuW1Sxa4p2yolA7U0rw5GLpk9riGy8GG2yu2Nl7Jg8Gv/rkSwah02YgwGVTW9GbaQGAN9MA5fgHtpHXqejA/8kgjAdk22pw9fG7t9QZsLC50dLwFgLqhKpWC4dHvBQCelAQzvw0s6r6rFlZyrNU+1/sR+WsUM8WgyZs0bUv5fcjQuEzDajE1S/lP9Wf/+QtIDWl0DUthy8+hgUQ5Ajrd+AY5P3ZJXzOiRtHylJkAh/dUyIVLAVvxKGJXHog7OiYmcUdtQcJesMW3WK6WCrK4jonWJ0szmpu+Sh/NV+5E8ztNQza99kRcEoLBS+QvhYIsANf90hFH+oWxdS9gG7O0r358Kp+xXhxuGDQ16jMTj+n75t+Ew5ZG2plclHaIkQuNMz57gxueJ9LOfBqFg1XPc8JYrnN6auW4cvGy1OQPNWeu/ev+DMGUukgsCm26la5BdYgCoAb3j77nPUHC+yokLTW/l8ZSoXxqBxLaY4zhY7Xb5rskOvoFjGbcMG4QlUqO79aNDNmBiOMOWDRpO2OCRj1gdop8KSc0lQW6Z7YZCWYc8AWxKSvdHGyy9GjtwOqUjEqb7hy5y235UF9KSHK+olwzV9hPptCLCuTsMGSpXT4Fr4u0qHoS85OW8US2q5dMlaA3hqvFjFkjgtbsL8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e946bceb-ed4c-4b10-5376-08da7a35ded3 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2022 18:35:01.9405 (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: DU2PR01MB8093 Subject: [FFmpeg-devel] [PATCH 2/9] avcodec/mpegutils: Combine multiple av_log statements 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: kI+C0HjtiuaR Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegutils.c | 101 +++++++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 44 deletions(-) diff --git a/libavcodec/mpegutils.c b/libavcodec/mpegutils.c index 4cbc474543..395bd38ff5 100644 --- a/libavcodec/mpegutils.c +++ b/libavcodec/mpegutils.c @@ -100,6 +100,59 @@ void ff_draw_horiz_band(AVCodecContext *avctx, } } +static char get_type_mv_char(int mb_type) +{ + // Type & MV direction + if (IS_PCM(mb_type)) + return 'P'; + else if (IS_INTRA(mb_type) && IS_ACPRED(mb_type)) + return 'A'; + else if (IS_INTRA4x4(mb_type)) + return 'i'; + else if (IS_INTRA16x16(mb_type)) + return 'I'; + else if (IS_DIRECT(mb_type) && IS_SKIP(mb_type)) + return 'd'; + else if (IS_DIRECT(mb_type)) + return 'D'; + else if (IS_GMC(mb_type) && IS_SKIP(mb_type)) + return 'g'; + else if (IS_GMC(mb_type)) + return 'G'; + else if (IS_SKIP(mb_type)) + return 'S'; + else if (!USES_LIST(mb_type, 1)) + return '>'; + else if (!USES_LIST(mb_type, 0)) + return '<'; + else { + av_assert2(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1)); + return 'X'; + } +} + +static char get_segmentation_char(int mb_type) +{ + if (IS_8X8(mb_type)) + return '+'; + else if (IS_16X8(mb_type)) + return '-'; + else if (IS_8X16(mb_type)) + return '|'; + else if (IS_INTRA(mb_type) || IS_16X16(mb_type)) + return ' '; + + return '?'; +} + +static char get_interlacement_char(int mb_type) +{ + if (IS_INTERLACED(mb_type)) + return '='; + else + return ' '; +} + void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_table, uint32_t *mbtype_table, int8_t *qscale_table, int16_t (*motion_val[2])[2], int mb_width, int mb_height, int mb_stride, int quarter_sample) @@ -211,51 +264,11 @@ void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_ } if (avctx->debug & FF_DEBUG_MB_TYPE) { int mb_type = mbtype_table[x + y * mb_stride]; - // Type & MV direction - if (IS_PCM(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "P"); - else if (IS_INTRA(mb_type) && IS_ACPRED(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "A"); - else if (IS_INTRA4x4(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "i"); - else if (IS_INTRA16x16(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "I"); - else if (IS_DIRECT(mb_type) && IS_SKIP(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "d"); - else if (IS_DIRECT(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "D"); - else if (IS_GMC(mb_type) && IS_SKIP(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "g"); - else if (IS_GMC(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "G"); - else if (IS_SKIP(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "S"); - else if (!USES_LIST(mb_type, 1)) - av_log(avctx, AV_LOG_DEBUG, ">"); - else if (!USES_LIST(mb_type, 0)) - av_log(avctx, AV_LOG_DEBUG, "<"); - else { - av_assert2(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1)); - av_log(avctx, AV_LOG_DEBUG, "X"); - } - - // segmentation - if (IS_8X8(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "+"); - else if (IS_16X8(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "-"); - else if (IS_8X16(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "|"); - else if (IS_INTRA(mb_type) || IS_16X16(mb_type)) - av_log(avctx, AV_LOG_DEBUG, " "); - else - av_log(avctx, AV_LOG_DEBUG, "?"); - - if (IS_INTERLACED(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "="); - else - av_log(avctx, AV_LOG_DEBUG, " "); + av_log(avctx, AV_LOG_DEBUG, "%c%c%c", + get_type_mv_char(mb_type), + get_segmentation_char(mb_type), + get_interlacement_char(mb_type)); } } av_log(avctx, AV_LOG_DEBUG, "\n"); From patchwork Tue Aug 9 18:34:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37198 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp426054pzi; Tue, 9 Aug 2022 11:35:21 -0700 (PDT) X-Google-Smtp-Source: AA6agR7DjP0p9o16qiBZZcX16PDzgWPMYkpDahTXuI/ZBOdLjv+/qqVhQ+6A36BYB64uch5QmdQp X-Received: by 2002:a05:6402:23a1:b0:43d:9477:4d57 with SMTP id j33-20020a05640223a100b0043d94774d57mr22666914eda.168.1660070121771; Tue, 09 Aug 2022 11:35:21 -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 di3-20020a170906730300b007309e77858esi2734197ejc.575.2022.08.09.11.35.21; Tue, 09 Aug 2022 11:35:21 -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=sfYit6ca; 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 9B57A68B810; Tue, 9 Aug 2022 21:35:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2104.outbound.protection.outlook.com [40.92.58.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB9CC68B7FC for ; Tue, 9 Aug 2022 21:35:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WWaIsCU6KMUQ+FVNmhjNG88d8eU/NWB/4LevGcYsaY81oLMst5on0gbgru7VOESMDjb7/+OtIfnqn3oqUjLSggIuaSgchOhATja2E3wH57GFqAhDkw7+pQ63RXnPXLGKOZ6yzd0ZVHDcih8BhhA+Oa2DNgnTkOXIMEQmxxT+v6S5A1BjkkznzSAhlEum4jGNiHymBfDC44i12NQywqJn5XABXCpiv4ht/mcyiwWEs2V+PJKypfxuY6kjrrLbCxJmDII2dHN7PknoRAbt4KQF9RFTjlRsmjAwKJsf/1h475StkfT2UKkA2TlbVyuqquU91crJgn3GLqIkJvBC3UoTsA== 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=u826QoGpExWfEn09wWp2bhG31qW+KKBEvznGM8Xqb34=; b=k5uO7eCYFMuxpntD0cths9N37OeFmZajzZYihYFoL1nDXsxTaAwU4JYwqE4G24BKMWXegizhDja+hCd3mECHtqZAMLz7U55xQhFz/nGZ3U/2XtqOSCMX114A9i8h5vph9p2nzfS+4aH46SGtFZgv41DEMVcgs5+ht59gVKIq5tKOc7ZXf9XLQLJP6ZArEu/nkBQeDIoPARm6/u43jJ/LcDAbzta0wlHdYIWVspeyZ8ybYGEz8hidQT4Ob0lwFIezAV/8C2h7OwzaAeRGTDLqOPcZ1G7ehhsSEunACXSd0EA0wsm/DRbhNoieIfCgERZlJhmtZeSl8TvkFD2HOLeOTA== 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=u826QoGpExWfEn09wWp2bhG31qW+KKBEvznGM8Xqb34=; b=sfYit6caotFOat9RAa2g0wdjJZ4Kcli4G9Pbbt0Sjpl1ntm0GuDmBg7R9AvrzES62ZoOdng6NQoyWrX7PaNmt2yNdhf91Y0i+ypTWwHbUx8biHSsonVfKID8fwDgJwrvxoUvQYq+P5qPZc0Qe9afXONcWYXqy/P/zGW703ElSqKrBGLgEj/F16avSeIMlBKen1u4RJVOn1NSnK2r7TspMukF8L/dhNJxGAByLV1/AL4jw+jGUsHsddCuFz5RAwYfAg6Zs/yL4yG6P8VKRqdqe8OeiJmBLihMkLG66AWAIlIEnKux0Zz5UzaMAXkcpTrvWgv7CYt8OYVddKa/76Ha0w== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DU2PR01MB8093.eurprd01.prod.exchangelabs.com (2603:10a6:10:276::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Tue, 9 Aug 2022 18:35:03 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Tue, 9 Aug 2022 18:35:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Aug 2022 20:34:47 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [7MO0Ymf80ZVET/QLkx21koggT34RGRyX] X-ClientProxiedBy: ZRAP278CA0011.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220809183453.220687-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4892110-0a3f-4946-80f4-08da7a35dfa7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTC4ziyQch4o+p4arh48fV8IAHsZ+dKmdHwS+8yoZ91+YytfJMyQzzEM9imV2rRwPUt4s3Fx07mp+o2NjB3/LKmFCG0wfke3Ys2WdurlZTMHSRLYTClasD10E/iHf7TG2U0Bc22xpqUnJswaKizG+Fj6j8UXE2L1U0+26qEvop4+uV3dR724ZD6Hr8QylZPJ3djbP9wLfeRyqPlerGauYuIgp08t7kwMfovHrScOhhcwC5Y6STZ4DhshYxzUoRGscFIWHC5HCOMnBW0nxeZTaU/l9f4nIXzCdY/Uc8J3wByprwHlA7gSpMDYz0QNAXUsoA1U1iclcm/ZcrrHMrcyvhmGCz6ew86rsZaQi1xl8i18lVwgK4/8VxcY2wmoG/lSZb5hQU3aKqJnAYOPmu0MJ0oTMdnKRQ8YDwsavQyh0b9liHXGKJ+y5Z7pfdE/7XtKoZooodIRkKFZlWQpvntFNeGi0zSD+U3LDR2BpHGYMUCsVuuCiqBAPO0O+28EmTm6ZpLKu7QRsSveG/kRDzyffaL0B/cumP8rrTkb5eDOA/5FzYi4UrPTW11wPgCFCRIsiXBA4+MA6tpurqEa1bfiBMF1iCFaVslbFd4GL3GnH52aDBQ580LBFB41aFOcJ2vy6V8iiyNxO1OVPDTddzw3aX7p+fKXkOV580FQlAhAy1UIZiShaegg3erSvJQj3QOzlUEJMSVZ9uuhmt/cp6MBFqP46yfuUtGrJvghozgLWssTTHaVrSXJEqvkON4n21JG8s= X-MS-TrafficTypeDiagnostic: DU2PR01MB8093:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LjLTXHsFsBHAb/0fLKqByWfPyRLrDU6wrtKzsIg50PbrQmk6DUTvg2BEUnzkFp6m+71h7Jhpc6qtSdoNOSqzL2qfXJTqo5xwxfcWCmPwSjzBc8/Qp/pnVjuI8U+Q4RB4vrHeE0+YvIf+Sg5u9fpaZNeV6W74gVldzPSkAtAkoxeqjApDcS32dDhz2TJ1mZttLEPds/mX5CMG9+VndSJLiibVaatRo3UqPlqyC09UzUj7PZa75cquugbaQgc/98obZDeeADd/8UjsPRBWNo7LaGKOZkyV/6nGssvEumNOQrEajud07VxBJy2v/lwsNZd/6igWOgazEH4vsOnwq/cz3qev0NA14JSxqR4IcnLVX6S5sM+jrYBfQsOvzlFyaA5jmSEM7xYc7tt8LQLfiwC7qYOVtTv9qIq0PqLEvdSup4hyscMNt6Y0EpZNUC+UqwO4d6Mq9fNVj0e5tql1Ifg0jptV5t29jCmjoZfeYJPILpk8LQ+QTtaGYks88FhlmS5+cQUJfoaTGZgMc+bAEl40pTiLnaiV9AlaQg/jGPM+XZ7JzPmtV/o46euacm+M6UUC0XiFVGNksMUyIUJleVagn6cqwUrX7JIduqKWykXberAt4RWbezNDF/QEM72K4MwTyLFf97wqCIem6MBRXBJBew== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bCFOWG6C/DWxu98GFwV86t9GCwJK9wlQWClzLIZ7Dfvy9LccrJQhuVgru8pPWMZiHA4V5uagR/wr2FTZOQ1TT4MSEdrz+VkX+qmUj1eOpLGlsY6Pc34F+/6BsDkRde9BC0tlM7TuiiuAdHVkMbaayLnpngCvmJO5I5p7OqknHLuX4cgNxg2DfcQhVYLMR74IIqjaRHihHk7fodkdXHnkf3qzy90y304jVGBdmTEQSQnonSlQWfeLPQwpv5ombKnqAdbe0MQGof/WXzQEoT5+AKOHsclJ8oN/hXlVn3xKJ6CSHemK7IYB3DKGqzwfWEwza+Ii/hl/7/9I1TAsW83IoidtRI5c4YxLC/arWX85RcNOrMAX69atwp4dtAYsQW0oP/D5AJKECTGyhmVjclvVcG5CMzRfgnIDRUbkl8WTTgBkjTuiR9wQ5Nku3+psc1XbbhR27eQqMDLioZr5rp1uCQXqoqXHSKlRRlRl/KPoVsB2AwT+vf6lmiG1dIqscWLmtdrHm0VoiJn7i9POa+2jbsVdyLiSsygYaMZYXaxkTj0HDkm9olziSwuXf2gEkyMspJSIi3Y4GZkOpCKuHfQowIsGW/iohd2rlXa6VoxoJ7HouU/kg1yPhCPiK88MDFxD7axM0AB1/oGYrO0TMRyeUfBjd1rxMtNSPkde+nor5BgpeqoUebI2L4hBEDPcGTxB+SKP7HDpE26T840WnFBwPObwMQrW5Sq7J/qRtlOBqW37jIomnw0GJO2RCt2f37RZvhuhxKYoOyqvINpwip5I4rzaaPjslQAY3yZveDSbmKj2YxX2AEdPsDWsX4BaqRsglruGZj58sE1kEcDcMiLRk0ugD46uZ+wtwq5aYoVWvyGjw0Dp5peI0AoJ0RzUrX8mYpIxdjk8RZAAII9Trvx60URW8qzDnpCVCPkHKOf52s9b1T8hHG8MqGRTwJ2GaIBbrrXa/1ZDqbEDkEDtd7bGP9EGt1rD+yFHPFtyCEzyrM5B/QgLLXzloB40paevaOUfBpyPofEmtnuDrHypk1RTAkC+J70SaoyACxHNbkTN7N26cZRM+cPUjPZfTXMJC40X91Iw+pdl8IDhNWfYHU6coYDHIp/dpm6gTLeJuH+ekt3crRY6izB7ineBB7PN58DPllJBeE15Uuxzac6DxU4ABRT3/xAxawDLLqgs3xqCYEIVNoM+SR12iYiSuYaBbj7k0DGP0xvOTXioX/ZstKZmz+R76GNaVtO57tEtfRVYwQeCrlaii4fFZDq4d7e1iJv7Gy4At/KNq4FkhSGpuCNLYWa6wOvdVZG2k6VsSe6QTko= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4892110-0a3f-4946-80f4-08da7a35dfa7 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2022 18:35:03.2998 (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: DU2PR01MB8093 Subject: [FFmpeg-devel] [PATCH 3/9] avcodec/mpegutils: Constify ff_print_debug_info2, ff_draw_horiz_band 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: bIbXwMlMPFVr Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegutils.c | 11 ++++++----- libavcodec/mpegutils.h | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libavcodec/mpegutils.c b/libavcodec/mpegutils.c index 395bd38ff5..ff9418232b 100644 --- a/libavcodec/mpegutils.c +++ b/libavcodec/mpegutils.c @@ -49,7 +49,7 @@ static int add_mb(AVMotionVector *mb, uint32_t mb_type, } void ff_draw_horiz_band(AVCodecContext *avctx, - AVFrame *cur, AVFrame *last, + const AVFrame *cur, const AVFrame *last, int y, int h, int picture_structure, int first_field, int low_delay) { @@ -68,7 +68,7 @@ void ff_draw_horiz_band(AVCodecContext *avctx, return; if (avctx->draw_horiz_band) { - AVFrame *src; + const AVFrame *src; int offset[AV_NUM_DATA_POINTERS]; int i; @@ -153,9 +153,10 @@ static char get_interlacement_char(int mb_type) return ' '; } -void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_table, - uint32_t *mbtype_table, int8_t *qscale_table, int16_t (*motion_val[2])[2], - int mb_width, int mb_height, int mb_stride, int quarter_sample) +void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, + const uint8_t *mbskip_table, const uint32_t *mbtype_table, + const int8_t *qscale_table, int16_t (*const motion_val[2])[2], + int mb_width, int mb_height, int mb_stride, int quarter_sample) { if ((avctx->export_side_data & AV_CODEC_EXPORT_DATA_MVS) && mbtype_table && motion_val[0]) { const int shift = 1 + quarter_sample; diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index c92f9192db..386110bb8c 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -127,15 +127,16 @@ enum OutputFormat { * * @param h is the normal height, this will be reduced automatically if needed */ -void ff_draw_horiz_band(AVCodecContext *avctx, AVFrame *cur, AVFrame *last, +void ff_draw_horiz_band(AVCodecContext *avctx, const AVFrame *cur, const AVFrame *last, int y, int h, int picture_structure, int first_field, int low_delay); /** * Print debugging info for the given picture. */ -void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_table, - uint32_t *mbtype_table, int8_t *qscale_table, int16_t (*motion_val[2])[2], - int mb_width, int mb_height, int mb_stride, int quarter_sample); +void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, + const uint8_t *mbskip_table, const uint32_t *mbtype_table, + const int8_t *qscale_table, int16_t (*const motion_val[2])[2], + int mb_width, int mb_height, int mb_stride, int quarter_sample); #endif /* AVCODEC_MPEGUTILS_H */ From patchwork Tue Aug 9 18:34:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37199 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp426117pzi; Tue, 9 Aug 2022 11:35:31 -0700 (PDT) X-Google-Smtp-Source: AA6agR75T67F8u7jn8M53qN/juhsCA2L2iABIMg9l0DH7y0UdvsdvWq7mgj0kpkoNKVmF+m8igkm X-Received: by 2002:a17:907:c0d:b0:730:a85d:8300 with SMTP id ga13-20020a1709070c0d00b00730a85d8300mr17715489ejc.558.1660070130988; Tue, 09 Aug 2022 11:35:30 -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 gs32-20020a1709072d2000b0072a89cb4513si2663437ejc.494.2022.08.09.11.35.30; Tue, 09 Aug 2022 11:35:30 -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=DPYZzRDM; 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 A308C68B830; Tue, 9 Aug 2022 21:35:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2104.outbound.protection.outlook.com [40.92.58.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E602668B815 for ; Tue, 9 Aug 2022 21:35:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hytpmEJdBpcs75Waq4AYuXASJLEp8Pu8LfHOQv686lM5gdD3I+ZM4bHOf2aOQkjET73b6Qnm6+GRQrD+Bb5pVyK+6JrpZck/JMq3kTuG4eymOcBrJhGIrSWcL1IRD12bpvNfgZ6xeRsMrmCT71VO0Do4HkrkqULnNXnkKn2Lmwdhj0tpGBVWNOk9fuP1oAg/07ycld1DSk1q9mVp1hks9spyp6O5OUyao4i43Ih6e/gx23ey1M6HzBM0qjLZWei36+2XW7MFvSltUbGfG683DgJFjYF94Dc/yHe/kDLE3ABFWOSefwufo65vjERkpCVrWuXG56Kbyj7intEeVENOfg== 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=B9pp8kWjMllDWqK6Wrv1AV9L0lkuqwETTHm4uGNO66I=; b=H5q8xNzyVWmCcb8ag61rVgdyXYSlzspqGtOD39t9+KQ8eksMlirUBOBijDa5FwEG8lkXErQcssvOFmUOdg3M+xtv0wSd59tcjA+qeXLp/DSwmzL7NTcTrQc1d9gnwI+xV4aXsJo/XUeZfJaOljSPGGgwRERBIlJYsM33mDD5bIpUDn2DLrUil5lt99yF38C1PelG/P34WuTNS/xNDBrlnj1q6EXxXA20xm7wF45OZSaWAFGmq2SJh9uRMSbHxQSu57q5TLkoaCDDpkp9H6RyDPoKtvd1B4D6vCKJyDKccWD5QMrLSqNRZiPLH4P99GcLWaWVzfSQX9hMa8vSy6rWHw== 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=B9pp8kWjMllDWqK6Wrv1AV9L0lkuqwETTHm4uGNO66I=; b=DPYZzRDME8gvbBe6Q5P4K8Z1xmyvbyO9pKshg2m/LTJM+MNpzHzUkK7Q1xYVzUfsjYVG0RK2GWRb9TejaHNodx5ZngGLzByRB3Bncg4n3r9/Yfb5VRzDvma/d569xQ+pQs4NItpfhFNmOpo5hTtf6kynt0K+UYMQsVHiABsJIkBdRrLmKnpwe+6oRIoLIVqM5++Y6CDLVvvpdQMvgGYbZ4kk9FKCJXDglNrwVpfTlYFa9pwthhfvL34wTBg7MYBbMLvIAD8OOdOcuAAQkA+SSxPkP7mTm7P7sgE4GSjl56A0acRDMBIewTOohKPI0Fqd/dps3pusYtmw5DV+ixBASg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DU2PR01MB8093.eurprd01.prod.exchangelabs.com (2603:10a6:10:276::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Tue, 9 Aug 2022 18:35:04 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Tue, 9 Aug 2022 18:35:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Aug 2022 20:34:48 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [HIiSXOvyNl7zGMTf95yCC19ufVANqnQY] X-ClientProxiedBy: ZRAP278CA0011.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220809183453.220687-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6b52e75e-bac9-425f-c2f0-08da7a35e06f X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIj0MyIIwJOZUmiXbsIG48XeVdzIYw7o4KJYAkQgcbUP8R6LsK6NFKW/bjHEMwWp6wFVCrONFpW3/0Ad2KtJFYmAU7iW83hkBLHcRoAU+W+r4r3noBIduktkLQzFVK5+N30uAR6wr2Rg7kwDKKHCa0jFcW5JCU+o72XhDqSsrHGV4lLC7tJoaUK3MCiUyHrSMvpjG/46MeVGFDgXBPsBHZwlE7Kx34KG1X0mJjIB2qWsT7RbGxl7xOf5PNrhV2OpraDuYvFSzboHiw0TrezukYnJEJidBVnjtBFI/Z8JjiDI1Bj3XtbVCc9DASfGtUo7wanpu0Kede1gxrlwS9D0UgE19m3LXE5ZUK9NhGTJx+Tko+suckbOzwcQYB8GW9wRERzKIke8bZDfxL4SiakApn5bQ0BBw7Z0Gk43itFdMKX490b2Myy0l/07nwkB6uUUph7W5j35uWm35MfKkqpGkwhEEekAuuRPTra3nk4RZmg2chwVwBBvtKl/ZOqwyul6ZMacZ4uFwgbTEGWP3ZWzGVi2y2WeQB4Hwh1Z0krFhQcpAdhJNvx1no1DruQ5U/LQk9QYhREinmK+izj9LeshpszhzDuU9/uqC/+HPaUhWE861hFgWnwxYCBDAJqpfX4Rd5/AHv2bh67XO6EfJYwFdYBJx+RLhHIldaY8REx9DCsHs3xUbv888Z0NucssUfuN3Rx0Uhc2/ov+w== X-MS-TrafficTypeDiagnostic: DU2PR01MB8093:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8ZlPBRxes9RYTojr4BuyDHGNJJ9aip2lf+xnRvCFTH7nyOCrqqC02Y15oSH0gv81wvW/cTwG5ObIcybF/XH4ga22m930iCnjNmmxXdHKE30QM27p9aJob5FT5iMpWl4JS3heb2LUwVx1dS1nw4UoKXuj2e/kPKaf9FiLgQ8lrwbD+V2q0gqXSRnECF6VuTBqnsD9a8S2t+ykGbeVZGcqr5qXCL0lPREaQEeEw7Dd3inLpd4aYcC9fXdlIIlIDCvrInsHU+4aFS8eRjb+CImZvE78ICkHXuEhc52x7GqOXIRQHrpIaUORZ+1rwPqqa6AP0TD2/AbU2o0Zww+yLLWN5cLBPooiDl4GtStEQpPpg1tbHtYMupf6/JODf+l2IZapTY4qtDhH96cIX8D5N1GuzuGG2ejQ2IWNVQRgDJBbAhtCQTzKM7iujH4HzaxqcA1JPuOSljUKzbTK6TifRCt7L8D8KkGai9ARI9QUejzBgBRQC+Uhp/nOjjAJ0EaUHZxkXS3uLpG/fEfkDYAFFLvIEcd5NlT7aP1tCmDYCHTTsnTMyUvfTlkq20IcMP9/zF0GFN/mmF5fm6Corr+saTRs3dj8Fk0GGoZjE/Oe5n+VnF8n3ESl7kMm1BEFY9ZTGZ42DhWxQ5J6OhiHl+ABB3K1sw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i6vnYg6Er4jyeEtNZryEjXQY4w4urKdHlSTwOqtYnYroWAdxBkmjxZWzIa0bQnnlF6iwRcxjTcOExccX/rpQGsG5VLYaCQQl1IzYXGJivgHDt6MwLAZXAGqaNrEkJbwN/rXa2PIuQlW0rITHiJUsZUrfOQ6KjKgGhHktriUSUwX7w5cnwhpV+3Szrx7irLOYBdV1wLa2JxYsaaM162oZfVfSYwy9aezDrBVxgSRayRN17+Twjo3LlLH6+2/HfsuhaYClui3eZGEcpjXw7TYkVevhDtK/sx4sxTH9SVGhB4EOycVp39XVDoRNUihwYgy8TO+TPI0fXAzC2db1Jvscq6DsZLcLJu7xw4JnDGnFdTRwh5w84LPfLLmyUc/7jLzjbxLTFrXJ//7vri1HJzkapUh7czvjFDxXGP3M3Lhm9PIUaE6cXwfSqy5wpNkklwpRvNQAlSixS0Cgp4oB4B3W4KRiWE1jOWqyXSkKlvw9waBMl3fE8EOMvv2p0qPA6WwQaiNf/H72CfrE+iXKux+SnAPM7q66brW3S10Ufruyf/2kgS4r0OEfBxx2HP7IXSQpcj9kKL5/ezCqMy3KRawLzIpTsB94NhN/Zo0GpXr5QqUqWtc1s+vvLE4JuPgksHrTV1fYXzhYA8EgRY/9TQonvllxeEWbhKs45fK988JY88hpKkxTWH52pI8oqycmMjb+HmKK6+MnmWDI3ak6McqJr4LDSWg8VMYs2Ir3XJQWIi/SN36G0vwo93vq78HWe6XCmUAKPkzPTong6nMTWHOwHsPEaH0ItPRCSNADdBg7zMjwwdCENfT4HcsTr1xIoPteW/2uO8CwscFlSdxFzkFgS9oklMEAiaI1+e32a2qKYLpKQ6bXCeq09vImYLryMQIb8Scq/hf9kWS55v5P8WtIpLL5woNTrwSyuhafXVsnhXrKvSw0uGmTzodtSBhavGB0PPUYgvxtfPkHkWJdjiET2RhuAIAuU5V0uGIkKhk/j4PaCeUA0dzXJ7ZjkgUZPtoNXLKFvdxEG5DrkZXnHoR9A3MncxL0kkTrd34nmOr3h1MOwi2JPoTTju/o7GmfvuOk0H9norxWD+HfoJXH9MzT/YOBLGAIVGbzFTSLF1uGfx7iZwH0foPKk917MVVcF//0aHkGad2Pl3vKJbNO1B9XBrNJvpk6lAytKhrKsHDcxba8dQFIJ5PvZAz7wvyR29NwN1slm6uhPJTR7Mr9dRUV67m3z/lbnZQjAUwzU9ljiHhK7Ddok+tCoMYzkNQShXy3wYN8ac9Q3o0sU7uttL9XDsD/45RRbhmE6QlpsFHjWh8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b52e75e-bac9-425f-c2f0-08da7a35e06f X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2022 18:35:04.6278 (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: DU2PR01MB8093 Subject: [FFmpeg-devel] [PATCH 4/9] avcodec/mpegpicture: Remove always-true checks 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: u22NaPwKzMEw Of all the buffers that are made writable, three are always allocated and the other four are allocated iff any one of them is allocated; so one can replace the seven checks for existence with one. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegpicture.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index f32f8d061b..dc79662143 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -49,21 +49,22 @@ static void av_noinline free_picture_tables(Picture *pic) static int make_tables_writable(Picture *pic) { - int ret, i; #define MAKE_WRITABLE(table) \ do {\ - if (pic->table &&\ - (ret = av_buffer_make_writable(&pic->table)) < 0)\ - return ret;\ + int ret = av_buffer_make_writable(&pic->table); \ + if (ret < 0) \ + return ret; \ } while (0) MAKE_WRITABLE(mbskip_table_buf); MAKE_WRITABLE(qscale_table_buf); MAKE_WRITABLE(mb_type_buf); - for (i = 0; i < 2; i++) { - MAKE_WRITABLE(motion_val_buf[i]); - MAKE_WRITABLE(ref_index_buf[i]); + if (pic->motion_val_buf[0]) { + for (int i = 0; i < 2; i++) { + MAKE_WRITABLE(motion_val_buf[i]); + MAKE_WRITABLE(ref_index_buf[i]); + } } return 0; From patchwork Tue Aug 9 18:34:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37200 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp426205pzi; Tue, 9 Aug 2022 11:35:40 -0700 (PDT) X-Google-Smtp-Source: AA6agR7qQzvji6w0prbdYtlU10Trgw2AQcIes6qPfCVacHWIM/MB3ufnwYRy+cFxT0Y1B11MwnVP X-Received: by 2002:a17:907:7b8e:b0:731:4e73:89f2 with SMTP id ne14-20020a1709077b8e00b007314e7389f2mr8719324ejc.562.1660070140092; Tue, 09 Aug 2022 11:35:40 -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 bi2-20020a170906a24200b0073187f41b15si2147081ejb.224.2022.08.09.11.35.39; Tue, 09 Aug 2022 11:35:40 -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=vJjpnsuj; 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 98D9268B813; Tue, 9 Aug 2022 21:35:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2104.outbound.protection.outlook.com [40.92.58.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BD3B68B813 for ; Tue, 9 Aug 2022 21:35:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LWbR6TQzdtGQCkbGiaWgDDXNvwAf5wvUmsEWNSR1Eu5ZUg7jjZrtJ6Q/iiZkG0WEyP7EcCsxGI2G919Xlb4HbwhVHRzBdl7P0QypHkeoPy09YFjuvGDMCxMRDMkmI0OAfGhq3UCR4AMjAdAysZYF5u/C5BIFbNmlxY4BTnxBomFvu+GbBhPLkDk/MVvUDeHQyRao0cAp65ZHDsH+YkcJDAqHCzo3+Kbz/tGKZDpROiYdoCmJrYgVJ2hDC5NYx+ZBhQQBQaw0zSPKJ03bVnr3hhYgswmIV8d2QmCgYQ7DXR//kb4pM+9PF+mfJfuRV3edRLQGfxd8DJ2KhTv9TgagqQ== 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=NM6DfaYaCIISBtpbikuR+DlcVdDnEMnDYpX18LtHW0k=; b=P6StpCYnIMsXjSCkoqI44a8Y2K/ifGPB1Ju2SlzRKZSifFH8ZW1UuCgqg8pVgkETzDtSAMI09mBvbfGMocEoncxfGwM5lYIMu93+P0Qw53iUzARngHiRKsGptoB4KwvLbHZ+Ut5B3AY4HuCt43YWsGF4NzjOnTbFM7k0wAbPMDIOpEY+O5p2TTPTvoSTGdWz/LAbrM2yYiBRYKLp3K1AfoOVIwiboJaqwY7IU0Cyf4XQ7BEO5Pfe64OX+7eztu7sYhCVk84nlklGpGQICmz+n3paOb7hlRwJfCKp5iwGiub/7uxlNRxfo0W3tTT43upXHY0a0oS4E5j1TD4N019o5g== 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=NM6DfaYaCIISBtpbikuR+DlcVdDnEMnDYpX18LtHW0k=; b=vJjpnsuju4Cw0d+Xkvhe5KZDIaOi2t45MsXESbltO+HKghZfQiSWFItizqsm5zuERdatqrGRIbnVvshvJLjenbU4hHJjZkAmiugoHrgnwA2hiJEqJZDSxK8IkoZ7pMEubD7Tq0OkMuZg3mbNhAa6aSqsgEoW1K/7aaLcXRz8LPZEcm0Qmd9kg6oS/s4Yl7WFBsLjiE7n1U7JG7CeE7cOj1goJy6Ch7PAN/fuyvAoYqVmYGQZ/GSy6uB+I1qXcuQ1yZzdOONZwOH7yVZZaLdNMwQkdfPjL7HVqFzB9v/0wIHGLRCkzBGw7uj2pgLtWSBM8XDK6W5l9yp2dCQCN+aXXw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DU2PR01MB8093.eurprd01.prod.exchangelabs.com (2603:10a6:10:276::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Tue, 9 Aug 2022 18:35:12 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Tue, 9 Aug 2022 18:35:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Aug 2022 20:34:49 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ZKtinoEyrOj2YO2ETRg+fo+rTFu7xIp3] X-ClientProxiedBy: ZRAP278CA0011.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220809183453.220687-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 453b6e3a-0380-49a8-1755-08da7a35e4e8 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXow4yDQWpczRUJbygObe2vxN6Tvg6lQIkxxnH7ZOHThXGkEMvq/4vtoXSjRaxElWYQROuveQGiS12oamUnTvJs5RfAXNJlU1EBYdFQWdOLDLt1cfcOR6kQTYn97CcNrK3c33Oi+miKMvdpgK7bEF5186UzJVeE2TRKyMElWQYzVTwac3ycvl6a02VPSujBp35y/JAhULz3xBUDvpPtS1SRAZ+ApsTYeHR2urhOubvE9tAjur1UYPs6Xx4MEVm8Xn07NeeB8dxetaorum95Qm9wPadQtSRsAeoLi//OaU0jAwQgdiIghp+/WiI7pqU8TtcMgDzWKShHa1gkNs7xd2104D7p3w4fVIs6ebR9QJRLxbUkJpGdndSHcJcwVYv8MRT/s90sLr/tPsK5MetX+4IMXC6aarKvqnowgFdbzfNnQaNuWAi9O/nbHvI5Im5Uhe2lYWYE5bXwtyLTm6YMW45n7GicWbV0/OYZQUyQnTYGBC6zwRtfXpr1oZmxG2pbTuJDGQW264QrVkHHE6l8moZ5mNNwy3eVkOVgMHTZ9DxJNRDEg+egQEM/hB/yGgv2x8hEe6oGBiXtWxcn/Aamgqq8iMKUTCiw+3li/QsBVt6iz+RfkGUIsrrIDL4p6o5RD8WuYXVFsLqiQf6Ah2Woi09njp3amaMm0mfPsZDsdrXDorDtv3RfTrTfQg24TRnXwgrg+RgepQYLqHLX+A5TT2KoaAPZwipJB8k= X-MS-TrafficTypeDiagnostic: DU2PR01MB8093:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mPUnhS4MS4XbqMilN2Q4BtyCmxepBqQOpPKSD+cwEWNe6V2PO/VyFp+vNAufm7yw/B1gGmfkL2N45hFq9f68FBGNAtXUUTF7f9C0+wvBHCKRXVYLd4IxMt4uiJgNf/6eRWOBdnHFX3UPqcR5Fhme6FkjcJ9V8uMOk2Q8nyBFUcqYtiSv0TXYV6Pzx0AZ1i1CujH8GOLszjfipe/1vTBRYJYw+0A6BmMvviPywUiJ1Eoypm2vT3HCHQ50TVkDWxcCme3UP0VcOMrRtu7QmRSoKPNOlXYujGFmcYFl+BkxH3+W9KCcaGeVESWBqMpFYio3EyNe1J7qtf8hDtS/YN8tbuiFp+y4JAAzLm0KzQ0uZdoOTGjN7nyWImlU4r2NW5EBkI/SRw2Q93nh7SoXOhoQqscJ3mizvhxrfqfKx8gp5BbRGxkahPh6WxEqloCmOJ15dKCzcJjm3mMtmt8PEuUrLFKg+DemEyGZ397wQEhb1bBoCYIxn/XtGCmwYafF2ieOjZFrhcUFwfUfHFlhqzsNEWHhywuCvjz/R4dyLEmcDIz3VdqFv6idrsMTo2i6t/LgkRpIUVGVhjO05px+E6EHnsgE6beelmDhua5ApHWJh/xpqT9UwIqJe0rsoEb1/fOfkCEZypLGJ6OlZ/R6SDQSIA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PANL2NGhV3qJxCmFlGJIYXVPOxlibuF6qylAplEpwOzC//KLS24uj1q4eRnXvzrh/Ix25mGxzx5QG/XIgjifGONS7azo6Tx04Qr1RC2JoD3kSw1CJY94Y83Mgp5NekQkWydLmdfILDhrCf01RlBPSV3OOSW50KDvM6RC9ijWvUBS4yZrQ/jMRbuPl/O+dT8ig5R0JcrH4tJtmVYuCy8PKR1osI9K6w2Dyv8kvEqaIqeYdsxwt8wigFmckx4Ky3zdbZaFvmi5zJpOuV7X+XgYSmdCgXN3y8XXm+/9nCZTUTmDSBDCPfCQEOwgIdQEDoQdUY+vVHjTlqsKAw8RoViPXDntlAyaeG8xBU8eOPmxqje0/NVPYHhV7Pz7ue1ijwK09LjzCsiITKZRkJExft2KyNsCF8Z9+PgqL7dJyMWIzQKi5RpLAMqLNexkTO93NU6RyudJoEnaTdWRxy+SNEyD3TtlAUOWpXmIsAkVgiw6BNwW1W1hHw38ZL+vVusQDqkK7FiE3/pCz1QVclrt3RXrK/pmgZHztgCxAojLUw4xoHB8H007vJgOl8hVoEMZSuIvrtUscdMMTm4FvGEB9qLdCjalhrT8LunEy5hGJZGrMwbyzkA0CXFSeLWzfyvy3Dw0vh9Lk4JfDVQt/lFL+OZGFq1PhMWODMr3v4vZPgzBeV8ov10lEU47xLLJJxgTshzHAuSqaHZF/aunQlNddYTd8LzTGIOomjG1xdYZNbFgbe4WRh6NbIGlNbooU8zARjN6HhpyAaM8Z7F+ne+as62KlEYfJM4ZCcP8dpo3l2TvEaBeZZTtx/go+JAtnEE44oxhIHLphrNy+dPnb0Jnx0f+FzMlF4S4qNbVVSejyirmRzjY/9ahadeD/swvfKMsJff7PI1EOyMv4JysaQ+9a9MbSpP9QRx0136i5q8bpDy18J1eoMPw8Wb6tQX42OJe9Nh3dwNzf1z7OW1HnLK8P72QIQEoUKUrsmk+1jnIIZX5K2qH4IdWTwwIQkao3SigiwjvQKJB2mPv5IClE8D7yggb4doCBXRP7gENIcAab8nBNlWciaPgTKQpzeQd9jER1NRLglq/5Eb4dDVk9UjDkcS36XF3ptru8EoGDLCh2wnB2gC6M/FoE7JBRIPcJsVZL0Qi7ICsH0n1f57DMJJ0BGZV3LWh12qCHYgRlwD8WUMvPNURzVknWj6OSDuSuCJI8LtLu4VHNvjYAxsxTfmsNQNWWUsrl0fq4dEPvEDO2763RANhsm5KkcoYlmf4h62uD7S8WhCDMUoQ8MnO2UVSSV4evoYAaKoN93RYLrEVpu8Agns= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 453b6e3a-0380-49a8-1755-08da7a35e4e8 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2022 18:35:12.1117 (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: DU2PR01MB8093 Subject: [FFmpeg-devel] [PATCH 5/9] avutil/buffer: Never poison returned buffers 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: 0E8S+hx6ih/0 Poisoning returned buffers is based around the implicit assumption that the contents of said buffers are transient. Yet this is not true for the buffer pools used by the various hardware contexts which store important state in there that needs to be preserved. Furthermore, the current code is also based on the assumption that the complete buffer pointed to by AVBuffer->data coincides with AVBufferRef->data; yet an implementation might store some data of its own before the actual user-visible data (accessible via AVBufferRef) which would be broken by the current code. (This is of course yet more proof that the AVBuffer API is not the right tool for the hardware contexts.) Signed-off-by: Andreas Rheinhardt --- I already sent this patch last October, but didn't apply it due to lack of feedback. Future patches of mine depend upon this and therefore I am sending it again. libavutil/buffer.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavutil/buffer.c b/libavutil/buffer.c index 54590be566..e4562a79b1 100644 --- a/libavutil/buffer.c +++ b/libavutil/buffer.c @@ -341,9 +341,6 @@ static void pool_release_buffer(void *opaque, uint8_t *data) BufferPoolEntry *buf = opaque; AVBufferPool *pool = buf->pool; - if(CONFIG_MEMORY_POISONING) - memset(buf->data, FF_MEMORY_POISON, pool->size); - ff_mutex_lock(&pool->mutex); buf->next = pool->pool; pool->pool = buf; From patchwork Tue Aug 9 18:34:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37201 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp426285pzi; Tue, 9 Aug 2022 11:35:49 -0700 (PDT) X-Google-Smtp-Source: AA6agR5hjMmb3Cf+XdxpuYO8vkhZsVCcFMGruJOCl6UXnyjSNXd8iQVZZyJyQoyTXdO4tTvug/Wq X-Received: by 2002:a05:6402:294c:b0:43a:91a9:a691 with SMTP id ed12-20020a056402294c00b0043a91a9a691mr23728151edb.182.1660070149620; Tue, 09 Aug 2022 11:35:49 -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 nb37-20020a1709071ca500b00730d5c78b76si2986803ejc.961.2022.08.09.11.35.48; Tue, 09 Aug 2022 11:35:49 -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=tdx33wcw; 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 0528B68B823; Tue, 9 Aug 2022 21:35:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2104.outbound.protection.outlook.com [40.92.58.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 290AC68B82B for ; Tue, 9 Aug 2022 21:35:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sc1VpC5wR/GvS8QzcBPaGgAzzub1QWdDN20BXaNFs/qjRBrJ07HtLAKYIKK1A6HtBVH4qJUXCKo6rcAD3AKz091f6o9mZPqpOqUggpUJ37woakSdjM2ZwscUfy5zZQU7sv7u18Lb5ej1I9QjgNeYg3n68ueM8hQbavuun+jOzwlOOsgHrPGoa7Zv09iKfBr4KABMrzykWErHF+6skX+1/q8bWVPqUyVa+Nm+wUFnzrBalAyDK64ReAyqMwilPKkUd1TLGIe21VAv6t2xX0Py6zyJjt45cuKDG6fcELvDe4mgMW4mYUb/e3QmjV0yuviEowQrVOxDvTH5zhPoVLsXTw== 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=bO9+63grF14cMGBFNRTpfhWd9GwfBHbX26BddBYCJhs=; b=c5kr+uxUU/fczIEufifMuoKk5cVZjFgFuIzSalIpRoKAvQo90Is7n8e/yyfJNdLRX8sVSuFppCFKkHJmJyMQEzE+c9/SFyqHWrjZSE3pr1aJVKYP8y0pgmbWrGXt1pD52btzvWZzjZn+WIXGSuE2X00SM3zUW1FTN7lVl7mjPhrtHBV9rcSL8QI4/JQXS2TlfwZgJIXa61lW50PVOWrkF1yoprwVqD+qpgLNFpmzDrppMCzRjGEyy0T5IvyRBpGkNTQiOSbs9stZ6IrVJq/JpmBIbSrUEtRgUlqH4r6HQ3mHar9PC8FilPEpvOv1j+KzobZq8ZWAhY548AuKH4KjJA== 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=bO9+63grF14cMGBFNRTpfhWd9GwfBHbX26BddBYCJhs=; b=tdx33wcwF8wRjTfvxkqig4pvh3urtQId74It2S9nea9aq8L2ddguZ6BW1n/wnwJkqxgtrXU6mP4uwNv+Klxx9F41+VKLTm/k7O8SRLNipkuwDa2t/Rm9VAuM43Au+RkPFgIMLANdvOky2AXRKUBhK+W/+9yYKuqjl8DXK/oCdF4ruJpJLwjx8VPptKIhXC2pFUg9fb5ub8UibAim+xpqlURX5RT0o9+elcV03/N6uHIVlsMtUYPJRmn888ZIvgrz4OzljYN2zzSreTcYQgu6mvJ+Gn+gjgNg9nPxzE2uJuoJfpj3Qejn97qz7DZvzpzvMRL2mDjh6bxsqxErMv4kRQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DU2PR01MB8093.eurprd01.prod.exchangelabs.com (2603:10a6:10:276::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Tue, 9 Aug 2022 18:35:13 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Tue, 9 Aug 2022 18:35:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Aug 2022 20:34:50 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [lPWFHCZFJkx1i66covjWBbJ7IIN7RU0G] X-ClientProxiedBy: ZRAP278CA0011.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220809183453.220687-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b683a0e7-ed0a-42b3-48c8-08da7a35e57e X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEufWrdt/smugth52Ftjs6mlccw89na3oBW043npCWyEooQqc9Hc+0v7YH0CO7CUW/b1btz+jscvwWH/khsPEHNHtweLbA9oW9NfqVMebC6geEQnwbHIcgHIlrhAxHbglHVdWhVBLZw76oFOSxl8QQhzTJ3WniBTbI4ffLQCl+4QFVVW7B3CsRfuSTnnDhcrkCq+BzxH5NqIuSNvfqkC7ux/8sp2K1VuKXjjHYBf6n2r8bronqXeBA7YltkmO/KekCH2wVomBB2CHuTjFrEJrxI6CF3L0YcSQV0pZlOabAVnSnxmgbsKU7fY7pnbS4oPtkhOwo8awP6U0pqIi5WEM3P0XdtV9qtGi4k6MqmLG3sbVRYXqj+o63cU3u9CwGrG1tkp808mWetE6UEnBhLk+h1nsK40nkE/sQOBaTRUd1phkWc36qUGBECefSPLWGyKyF/pa1rkKWbVglk+DInjX6E7tXHUfm7/K6COAU631f6j/y5Lt2JZu0nLQ/47xb7XVBOt4JXs2XkszwrelNP0OelTUsYiOvEbOUxZYvSNExul4m8fxDfvtOGV6/Td2AscWzV5wJZuWJhQIj3E9FYCQwnwqmATt6YQxNGCTBcTzNdngoFj0mZICmN5B8CXPTXCALSJKYbgjN65A6BItUhrVOpCbkryLMJ+wDdr/X+CAf+tVDS5tbdIBbGIgo7OswHj2lGduimDPiWX8hN+D2VE3hvpJS2Y613uPvs9j3BAiS5k8wzfnNW++N2l7L6N98zAuQlp09PW7Cg/QmgZVSa1nSvs X-MS-TrafficTypeDiagnostic: DU2PR01MB8093:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +4bxvF9LHpk9CHfWaSpQnQOw9LzAdofA3oYjfLxtzAkY3RmjUotaVwa8un0SFxlbfogAGaPB5hIulG+uei92hoF8fdMjP77s5xcgSKqQz/fvELqyMZI7cImBfpNfn5LY66vZY09FzCRdgZQzLAQCPULaUCmfgzqnvqhxXIggW3xwNQ9pLs+4twjpCd/82BtW2/pDS+yQzni69rreInbY8PVWxqjNPuNZwNNrOTcuJW+QxMgKc3qxG5GKAkXxk+es5NgGIjToLXFm6LeoFgKPxDTgUMpiUtm68LB6W58PVyCCkjt18ueoxrfjp//b8+xtKjuJujeuIBPt93NGqNroHO2Y9ZWFQe6nH11zCbICFaaTLfPbBCr6ALF4HeFN2Jknoe7z77PTcbFUh1dn+9vhJI5utvzgDDPfblShWCe3UC6fur9gxoOp2dQ43aIPlmrl8VMnAYSt9EyNgQpK8h40lTrukomfTYQbvhbLJYVcb+pSoeNIBTDHis/e1OTCxX782h7gDxcsJQ52gMJGwptE9N9llnjiu4lqegWDbRRu5fqz5y3yG2DRydEYVxlNf9cj08LgflS+sygU4FXkjO6wM+ynUGiIYhAhxUYGYGpuu3KQ6sRrcBkiIYJDDzz11QtYRcjcuOjNK1nFN5eDMLX5iQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0US5D3Y+aMoTaSftdtHSRY7tkpm96UailMOMh6T+/4WtmHtu4mZgaMcFVb5cy+8Q8l9wg87RQAGii9D5g0QDtiKjnq2lWSBEM1Jn1XRD9Hyu1BI5Jv43SKIphapbe6d/uAIv1XCP6Iu8y9zrvBlT74Iel9IhtNp9fAFBka+Gmd9eywGndVMSFdMnXYDQy5vkGC8zfzjbrjDNFTSy1Oik1Hyvcv0XD0fmXt68LBwmIecztq/XIvDCiWagYzMEkrnwxSsbIhpMknZp60qip6bgNpwM4Jszjc1ORws2Tj04AbbUFAqCbPy1EdAUv0azEpz/OInO542Vgm45EPaDD4kUQpOtiOS9FmTTou8qXhgmKkpDpWe7JzmRvKwxPtbO7VnJgBzYe1pZTxPIWGHTPHsPGBb7bKkJajzebciJthtlxLVR//uzuOkhMds46GTIEnYLp/7hBspNjvx/m6quozaujI5qkzIIfu4YT+xU2fgExMyRY9zpzHQujEoh7CzoCt/XGUv09abZI1rx4rP50AF7Swy7uTw6wJ+xrX+BolBEeKE9aHc843BBqUcwaV4tnUVKCnKyNtKhXYVlL1VIlUJFRJdlnq5vaNEgSEoEGNJee6qjg408gYchM2Q29ll8VgKHxQo2joZa/NGUBjilZNpSnCsheweDLD1A3gk19cp6RmDz35XUIGFX7kNddrzFMXSituq96NbP60V2U2lT349IFOUF2ZRRnQQ6fXqbmpH2aW0k3xfuYW7T/6fizdQi+QmMqGWsy04jniscy5kOmC4S+mhbT4Xrr7XRObo9575rEVx66NyYIEcBs95a5aSd7OFjxnOYRA8ApVoI5lN3PEmL0yX6w7JbYi4w7dyK1XHjHr355sCjOfbZP74r+/95a8aaezPP6c80fYeu+AGnLCOsZZdctSIq9rFw175ATVuseen/EuI2eNVyxPtkSnuApRMzmylMeOzAna9q3LXRkl5eD2LQXpNV/tiYWlxqK3f46c8KhmDIsaMxNW+8gK+SuSmUljaD0sf+u8PDQt9/3a+vepbxEdLE/Z+ajRe4G+7lCoCHMZhtFibxFjAXhVveHTT+GN3fDWLmtWRy0GU6yQPmMzHdP+mIeXPZL1dbcF431s/tUIke1Enqo+M0AGpUfFDljgAD7p5IxYan7dJ8PvaUFU7dcmBExBhh9/bI7NhWckgb8aD0lQphJD57PAs4919E4BhW9gj9AH+4VTeFmoE1nuxCItbAF9qvp/dD+u7D4OVwiIDVzx0QhKLpinqlchEyVP52pO1PWBjpqRIRreP+CGIE1zD1WmcZQCX0l9E+4LA= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b683a0e7-ed0a-42b3-48c8-08da7a35e57e X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2022 18:35:13.1741 (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: DU2PR01MB8093 Subject: [FFmpeg-devel] [PATCH 6/9] avcodec/mpegpicture: Move encoding_error and mb_var_sum to MpegEncCtx 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: 9DtDv56KphqG These fields are only ever set by the encoder for the current picture and for no other picture. So only one set of these values needs to exist, so move them to MpegEncContext. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegpicture.c | 5 ----- libavcodec/mpegpicture.h | 5 ----- libavcodec/mpegvideo.h | 5 ++++- libavcodec/mpegvideo_enc.c | 25 ++++++++++++------------- libavcodec/ratecontrol.c | 17 ++++++++--------- libavcodec/snowenc.c | 8 ++++---- 6 files changed, 28 insertions(+), 37 deletions(-) diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index dc79662143..c57f149752 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -376,16 +376,11 @@ int ff_mpeg_ref_picture(AVCodecContext *avctx, Picture *dst, Picture *src) } dst->field_picture = src->field_picture; - dst->mb_var_sum = src->mb_var_sum; - dst->mc_mb_var_sum = src->mc_mb_var_sum; dst->b_frame_score = src->b_frame_score; dst->needs_realloc = src->needs_realloc; dst->reference = src->reference; dst->shared = src->shared; - memcpy(dst->encoding_error, src->encoding_error, - sizeof(dst->encoding_error)); - return 0; fail: ff_mpeg_unref_picture(avctx, dst); diff --git a/libavcodec/mpegpicture.h b/libavcodec/mpegpicture.h index 62589595d0..a1455ee13c 100644 --- a/libavcodec/mpegpicture.h +++ b/libavcodec/mpegpicture.h @@ -71,16 +71,11 @@ typedef struct Picture { int field_picture; ///< whether or not the picture was encoded in separate fields - int64_t mb_var_sum; ///< sum of MB variance for current frame - int64_t mc_mb_var_sum; ///< motion compensated MB variance for current frame - int b_frame_score; int needs_realloc; ///< Picture needs to be reallocated (eg due to a frame size change) int reference; int shared; - - uint64_t encoding_error[MPEGVIDEO_MAX_PLANES]; } Picture; /** diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 47619c1976..1ddf8034aa 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -236,10 +236,13 @@ typedef struct MpegEncContext { uint8_t (*p_field_select_table[2]); ///< Only the first element is allocated uint8_t (*b_field_select_table[2][2]); ///< Only the first element is allocated - /* The following three arrays are encoder-only */ + /* The following fields are encoder-only */ uint16_t *mb_var; ///< Table for MB variances uint16_t *mc_mb_var; ///< Table for motion compensated MB variances uint8_t *mb_mean; ///< Table for MB luminance + int64_t mb_var_sum; ///< sum of MB variance for current frame + int64_t mc_mb_var_sum; ///< motion compensated MB variance for current frame + uint64_t encoding_error[MPEGVIDEO_MAX_PLANES]; int motion_est; ///< ME algorithm int me_penalty_compensation; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index a34fb66eac..d45e15a039 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1783,11 +1783,10 @@ vbv_retry: ff_write_pass1_stats(s); for (i = 0; i < 4; i++) { - s->current_picture_ptr->encoding_error[i] = s->current_picture.encoding_error[i]; - avctx->error[i] += s->current_picture_ptr->encoding_error[i]; + avctx->error[i] += s->encoding_error[i]; } ff_side_data_set_encoder_stats(pkt, s->current_picture.f->quality, - s->current_picture_ptr->encoding_error, + s->encoding_error, (avctx->flags&AV_CODEC_FLAG_PSNR) ? MPEGVIDEO_MAX_PLANES : 0, s->pict_type); @@ -2792,7 +2791,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ /* note: quant matrix value (8) is implied here */ s->last_dc[i] = 128 << s->intra_dc_precision; - s->current_picture.encoding_error[i] = 0; + s->encoding_error[i] = 0; } if(s->codec_id==AV_CODEC_ID_AMV){ s->last_dc[0] = 128*8/13; @@ -3370,13 +3369,13 @@ static int encode_thread(AVCodecContext *c, void *arg){ if(s->mb_x*16 + 16 > s->width ) w= s->width - s->mb_x*16; if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16; - s->current_picture.encoding_error[0] += sse( + s->encoding_error[0] += sse( s, s->new_picture->data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, s->dest[0], w, h, s->linesize); - s->current_picture.encoding_error[1] += sse( + s->encoding_error[1] += sse( s, s->new_picture->data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*chr_h, s->dest[1], w>>1, h>>s->chroma_y_shift, s->uvlinesize); - s->current_picture.encoding_error[2] += sse( + s->encoding_error[2] += sse( s, s->new_picture->data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*chr_h, s->dest[2], w>>1, h>>s->chroma_y_shift, s->uvlinesize); } @@ -3416,9 +3415,9 @@ static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src) MERGE(i_count); MERGE(skip_count); MERGE(misc_bits); - MERGE(current_picture.encoding_error[0]); - MERGE(current_picture.encoding_error[1]); - MERGE(current_picture.encoding_error[2]); + MERGE(encoding_error[0]); + MERGE(encoding_error[1]); + MERGE(encoding_error[2]); if (dst->noise_reduction){ for(i=0; i<64; i++){ @@ -3570,8 +3569,8 @@ static int encode_picture(MpegEncContext *s, int picture_number) for(i=1; ithread_context[i]); } - s->current_picture.mc_mb_var_sum= s->current_picture_ptr->mc_mb_var_sum= s->me.mc_mb_var_sum_temp; - s->current_picture. mb_var_sum= s->current_picture_ptr-> mb_var_sum= s->me. mb_var_sum_temp; + s->mc_mb_var_sum = s->me.mc_mb_var_sum_temp; + s->mb_var_sum = s->me. mb_var_sum_temp; emms_c(); if (s->me.scene_change_score > s->scenechange_threshold && @@ -3582,7 +3581,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) if(s->msmpeg4_version >= 3) s->no_rounding=1; ff_dlog(s, "Scene change detected, encoding as I Frame %"PRId64" %"PRId64"\n", - s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum); + s->mb_var_sum, s->mc_mb_var_sum); } if(!s->umvplus){ diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 53930f147b..4829172c2c 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -49,8 +49,8 @@ void ff_write_pass1_stats(MpegEncContext *s) s->misc_bits, s->f_code, s->b_code, - s->current_picture.mc_mb_var_sum, - s->current_picture.mb_var_sum, + s->mc_mb_var_sum, + s->mb_var_sum, s->i_count, s->skip_count, s->header_bits); } @@ -880,7 +880,6 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) double rate_factor; int64_t var; const int pict_type = s->pict_type; - Picture * const pic = &s->current_picture; emms_c(); get_qminmax(&qmin, &qmax, s, pict_type); @@ -929,7 +928,7 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) if (br_compensation <= 0.0) br_compensation = 0.001; - var = pict_type == AV_PICTURE_TYPE_I ? pic->mb_var_sum : pic->mc_mb_var_sum; + var = pict_type == AV_PICTURE_TYPE_I ? s->mb_var_sum : s->mc_mb_var_sum; short_term_q = 0; /* avoid warning */ if (s->avctx->flags & AV_CODEC_FLAG_PASS2) { @@ -942,8 +941,8 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) } else { rce->pict_type = rce->new_pict_type = pict_type; - rce->mc_mb_var_sum = pic->mc_mb_var_sum; - rce->mb_var_sum = pic->mb_var_sum; + rce->mc_mb_var_sum = s->mc_mb_var_sum; + rce->mb_var_sum = s->mb_var_sum; rce->qscale = FF_QP2LAMBDA * 2; rce->f_code = s->f_code; rce->b_code = s->b_code; @@ -1003,7 +1002,7 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) qmin, q, qmax, picture_number, wanted_bits / 1000, s->total_bits / 1000, br_compensation, short_term_q, s->frame_bits, - pic->mb_var_sum, pic->mc_mb_var_sum, + s->mb_var_sum, s->mc_mb_var_sum, s->bit_rate / 1000, (int)fps); } @@ -1019,8 +1018,8 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) if (!dry_run) { rcc->last_qscale = q; - rcc->last_mc_mb_var_sum = pic->mc_mb_var_sum; - rcc->last_mb_var_sum = pic->mb_var_sum; + rcc->last_mc_mb_var_sum = s->mc_mb_var_sum; + rcc->last_mb_var_sum = s->mb_var_sum; } return q; } diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 72ed39c78c..a295ff8085 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1527,11 +1527,11 @@ static int ratecontrol_1pass(SnowContext *s, AVFrame *pict) coef_sum = (uint64_t)coef_sum * coef_sum >> 16; if(pict->pict_type == AV_PICTURE_TYPE_I){ - s->m.current_picture.mb_var_sum= coef_sum; - s->m.current_picture.mc_mb_var_sum= 0; + s->m.mb_var_sum = coef_sum; + s->m.mc_mb_var_sum = 0; }else{ - s->m.current_picture.mc_mb_var_sum= coef_sum; - s->m.current_picture.mb_var_sum= 0; + s->m.mc_mb_var_sum = coef_sum; + s->m.mb_var_sum = 0; } pict->quality= ff_rate_estimate_qscale(&s->m, 1); From patchwork Tue Aug 9 18:34:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37202 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp426350pzi; Tue, 9 Aug 2022 11:35:58 -0700 (PDT) X-Google-Smtp-Source: AA6agR7vdVxRCp5PjezLqndu6YOE34elncHv1MSOyejSNGBjDOE0BnXX2yxbb5cWel2NcqcVDzbL X-Received: by 2002:a17:907:1df1:b0:730:b058:ef95 with SMTP id og49-20020a1709071df100b00730b058ef95mr17732972ejc.600.1660070158766; Tue, 09 Aug 2022 11:35:58 -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 b9-20020a056402084900b004408eb05e0csi8106032edz.167.2022.08.09.11.35.58; Tue, 09 Aug 2022 11:35:58 -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="Pwo/4mLH"; 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 F40DB68B8A2; Tue, 9 Aug 2022 21:35:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2104.outbound.protection.outlook.com [40.92.58.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 586AA68B844 for ; Tue, 9 Aug 2022 21:35:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G0Wr4CPVbuqgH86+c59sfIn6gzGTmfua3hxWzQ2NMy6+Nr6SL/STOkNA/dsXXORv1DNG5EXkZ89NX+XKxJmFvkYSlL7v5pzS70O4PFzvtRELQx/5MWeGQDZNhBT8HsWo+Jm8dBuTYpca+FyW6sDhlAv4D5lZ4CJhwkjWhe3+j2rCPn57ogL/tyNkaKmK3OfRoVj5GEP7PUiLmqIuj+IPpBKkMc1xP035BFTkXGDFKIMj1NZjz5yONP02X2v/SxJgJ3KNvnyY0YYY9TgWYcbkz6PI43lKyHDwqUl/x+kMGktNKGfazKNrHkrmcjFXUsW9dSpJANePi6WgbXA2eP73QQ== 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=ka0b8jKBg4EE0puHCPbYA0lzBtJPraFrTZAKWmI/BA0=; b=RlwUaqJpoifsiEqh9F5JLEYmEyrD9oTHltYJyeXEyP+r6p8VaUr2f8SCwOEhlyLJfqTDIw63AI7BSxJ4Tikh0sQkvjRRt4+tbcGohP5O2Oc9zUjjdvFqLe1EYa8k6iMYKOKCwN4HuwWw6uUb4D39TuZuUy1/zYBEcBOUrDPtN/DIUTPCoQNwU2FlX41A1jG6ybRtZyXtMzBxqy8PPTEv9eqbsg4/yZjg/tuFislGsYLNdtlGCsLa7yRAzFx5oorFITxkLcULsiExmDYpwceyycuy0ARJdSarIITIJ84MaF03FtWoBn4ZnLsivcaTiAkAII7LFDZnLV5o6hQoiZSz6A== 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=ka0b8jKBg4EE0puHCPbYA0lzBtJPraFrTZAKWmI/BA0=; b=Pwo/4mLHtu/lNcePcrJNhXRD25fq+juqpG5tXFuKSERDvz/VOG98mHKxhEooAmYMnfiTooU130cGouwc2RJl/O0/jOYM9Ux8xcZboHaTQSSatPrElWfSp/cludkmq5VXxnCDT70Y7bd+udPTPFs9i+jBMHG+naQEEDzVGl39zi0bAnGjU3l7Eyt4JegcbJD00jl2ARLbqIXHIqL+iaj4M2yIgFr8UbnC13ekiP0zyjM+iVeJfKHx/4iXidjRoYd2jUg4mvlF51sNN18E0TKhrdA6QV94r6E5y1x4CkLMVur0ALQyZVza8fBrx17W+lwNad3RKw3gdXM3liZg+Fd09Q== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DU2PR01MB8093.eurprd01.prod.exchangelabs.com (2603:10a6:10:276::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Tue, 9 Aug 2022 18:35:14 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Tue, 9 Aug 2022 18:35:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Aug 2022 20:34:51 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [DuYt8qfjcB12x5T3gJ0A3VTvJS1hGAGN] X-ClientProxiedBy: ZRAP278CA0011.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220809183453.220687-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: afc132f4-0e0c-453c-3ce0-08da7a35e638 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXow4yDQWpczRUJbygObe2vbp2W7EnD0O4rq+QffmGgEJNWSTw3Nc8TDx3jFissE6XbMgmOBwLJ9AdNoQU+6CwBon9/BNJIfipTDE1xKUxIBNd9pP0U5bdDXovhi70u/fZJfbxXscBJp3pM2lPTwF2PHZPpIX3Mv8LesnIaKyan46luugoPGsaLakZ9K3o2rSuNA1RLnR+H37v0hKilm8Zd8V1GtaFpAnc+zad80LtlTkx0pOskmH4vuvVcwpnfmcTdK2VbI5MnlzIAx2cVBmbdeJum06Qtv4sVxxX2dU66vXil6PDmOKrYdRXxqLMDSzgF6H2ACQCsaiGhZbxUkv8w6hrs/R57xDToHHtIlHT2qiMd2G6vekfqwxabSktgfL+8JRZ/lLDHOWuwFxskWO4ehSgRhOlcVdtl5Upu+Vx9Ctth9OPbK3BQZ5v3nbWQ+F2CqRZeycaZoWkCcbyYs18vFPn7PUk+6DGJCCFPBBF86RqqEQDGYFx9xda3qHF2zoFQE0BPvmofA74FdetsDH7nlW6DlaQrTkBCG6gxFq5sC9q6r310yPcZcT8ZRG9eSxZdWX2qRKHtvmXkeaUirw+fdTSRySAXG6ZXnFKvh01PBf9njIv47cs25HOv4DcnB0o4MPOGcNBaKbqCp4bzEjGeQV7il7TsY37qf06iyRYT6XhIoVy3D4FAeIUNFEGzHoBl+Hf8F+rOVY6pRebWp6EoMmpJWUQFVww= X-MS-TrafficTypeDiagnostic: DU2PR01MB8093:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mwdp2UuWkEr23htr2qCw4FK05EeWeoUOpCzaSAnWodvwnesNUHMFThNk24/6ThPOSsdeBihFkbNbEeZEYhfyOoq2AqQZe77SGKvdCQcctOo9cfEzFfkx9/jOCjwe+Wff/bwV2WUpxJBpGEOs/QxixCCZnI3XnlMJk8d5DcaXQ1WcbSu6VPBn0c8Lngch8gUdiI5V5pgNXFDI/QD4tTlx6+6D0qdqJ7iWwJfGAOKVfPqEmsnND0WO4Oa69CInrrYpUr0/ZmIRWJVAsDn+u83qSWDT82j8dSVdnBTNqa0068wRRFDh9Ov/FgIYtiXOo6RXlnNHxDNb2o8sm5wUkJyGYTlM04c8QBV4jCtposGUhqxGv83H9XDKZlnm+WF5Nq2Y9wic/2h6LMOOLgU+j4EndTuywtdh/EHvkLs2NuwHhe+3lxSsJG+RED2FP9iCkZFAyYRvKX72du5ADAOkxGxa7Q40v0SwOxHEdlQ2mJPTkIIMOgGtEq10kem1AJD6TFRIU3rdUtiEY4Ntk35tLczY5KIg7rz5WD/ZZi03lvBZ4VcGqMks1WqfdVnCzwmt6V40x1f6qcCWAqLyebZoxbgwns0q/Gqw6icTQtfXs6KBbhVDk0qLZsTO0fLCXHFGSnAJ1XajGidNRCT4+ZFboyt0IQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RgydhHTJl8beuldSbzYflXI3U8UdpN42wpHw25HKZWrTHsH22nHGCN8+ZtDnOIXqeGoinPniAJbjiTXPSKMA09muBmCDV7s92QmWM/A4ZXHK+y4JqrFKrJqpT0wBHqs0RFo5LVkFSlFnQQjB4c8+hU1MkDt7DAM7zTFxMaRfgxq660upu0YnNx70jAJq3ZijnZACzv6/io+c1Y2vye/Bs8zPRKwgdKE7d/8tB6faDOD8+miC/x6AGLcwQ74LHKvBsdrDk612yhEULGIZzCUhamEZLRi8wMD71+NKTBZ2oYGGPVDckCEB0ieNq5ZA+A0gYG3Xc0WOHUVVSkNoWQlxHcMvqI4k+50rfid2HLIEHq1dNGUO/RKhOj3NDKRe7+nLU9bd3Z/24DRR/FygRVx57lVmCP8D5ThZ5pcEXs4dAQxHvu2NkUzIFqyRXSj4SNYFm4XVeX7oMl/2GPSBte8yIhETrHXaNG35eEvGtmTErfPA4RXPKp+rzjZIncPfp+tCl5KzDB/TxtFBxgahcHId2g/HyCBx0vKbHxGuQPLBgcCvxijbYkDUNXPGLnu0pFTRGkVOzGxp83pSFH4Z1eZ1k9VTFF2cqjDCBdloVNyTdDqsXFQLVedwzM5FEXZ6ba0Ta4V4+DMG0vxIzK6WQKaT5jTf077v1O5Hj2YvtpNYRwDgXdxmBtpYpMcbbkgisDgrdfHID0DOwvtGyqZGFWC1K933IwGXXAD1t8JPTVeoQavGLZ8bsi090gxI16aJY05ba892UCGqhxH3pYwnZ59ElLkF4CEfMiKqWi8BBCWuSyYhB1Qj1KzFxaQ2N/hHS0JxNrpoq3OEUIp5xTEPwIlFq+Rz9/uJJglKb8pIz5vsRUx8GNROews5/OAWSVUzCCy8rJBr7Q9K3PeVKHWjAHL6qt5pfJBPrH6A02bcQIQ1BHHb5d69SSQS5qCeMK2QoDR1T29nfRYO4vCe8jeZXlFbDDLWgZ7qoVMRrKoIy1uv7F5sVRi/wFUVYa6ZkCd1IdKoXbCxY/oxvzKfYeyQ6IW0595H4+Wvbl5hn3XDCv7KjOFTGuU+iyuZqipk6wWO8qfUZ44Sxui2YgPpJgX/bcyAWnvaNSwRb459yKbwspH0a3/vePX76KkafO85BFo3NC+Q8PRVNPeIUB51RhZblsEc0pLhV0MLm0DTU2rNbTF6fEV0LdCpmklyXpnIcfFqNjhWpS9847n67sTUlOe2juEnGOtRDKzQLqSX64lGMQqYHnOv7Ndl+lph3S5iw+MH80qUQiRG5I2QcSMhlRsKDSiftSvkfvg/0J/1Da5/2Mi0+YM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: afc132f4-0e0c-453c-3ce0-08da7a35e638 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2022 18:35:14.2990 (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: DU2PR01MB8093 Subject: [FFmpeg-devel] [PATCH 7/9] avcodec/mpegvideo_enc: Don't copy Picture unnecessarily 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: ZEC6oFCYfCWJ Also add const where possible. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index d45e15a039..2cd4db27bc 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1249,15 +1249,14 @@ static int estimate_best_b_count(MpegEncContext *s) FF_LAMBDA_SHIFT; for (i = 0; i < s->max_b_frames + 2; i++) { - Picture pre_input, *pre_input_ptr = i ? s->input_picture[i - 1] : - s->next_picture_ptr; - uint8_t *data[4]; + const Picture *pre_input_ptr = i ? s->input_picture[i - 1] : + s->next_picture_ptr; if (pre_input_ptr && (!i || s->input_picture[i - 1])) { - pre_input = *pre_input_ptr; + const uint8_t *data[4]; memcpy(data, pre_input_ptr->f->data, sizeof(data)); - if (!pre_input.shared && i) { + if (!pre_input_ptr->shared && i) { data[0] += INPLACE_OFFSET; data[1] += INPLACE_OFFSET; data[2] += INPLACE_OFFSET; @@ -1266,17 +1265,17 @@ static int estimate_best_b_count(MpegEncContext *s) s->mpvencdsp.shrink[scale](s->tmp_frames[i]->data[0], s->tmp_frames[i]->linesize[0], data[0], - pre_input.f->linesize[0], + pre_input_ptr->f->linesize[0], width, height); s->mpvencdsp.shrink[scale](s->tmp_frames[i]->data[1], s->tmp_frames[i]->linesize[1], data[1], - pre_input.f->linesize[1], + pre_input_ptr->f->linesize[1], width >> 1, height >> 1); s->mpvencdsp.shrink[scale](s->tmp_frames[i]->data[2], s->tmp_frames[i]->linesize[2], data[2], - pre_input.f->linesize[2], + pre_input_ptr->f->linesize[2], width >> 1, height >> 1); } } From patchwork Tue Aug 9 18:34:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37203 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp426408pzi; Tue, 9 Aug 2022 11:36:08 -0700 (PDT) X-Google-Smtp-Source: AA6agR4svehqppvcHVIzKqrqzbWpKM4GnMoJuokv3FVQjfLB5vNIaZd0XGYSpdb8Cgy68WMliPPv X-Received: by 2002:a17:906:3bd2:b0:731:3f03:1697 with SMTP id v18-20020a1709063bd200b007313f031697mr10298794ejf.289.1660070167775; Tue, 09 Aug 2022 11:36:07 -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 g8-20020a1709065d0800b0072b53b3f4c5si3004250ejt.217.2022.08.09.11.36.07; Tue, 09 Aug 2022 11:36:07 -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=Tba+WsGt; 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 DA05268B8B3; Tue, 9 Aug 2022 21:35:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2104.outbound.protection.outlook.com [40.92.58.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7321968B876 for ; Tue, 9 Aug 2022 21:35:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J/nvJrdm7HTSiRSQ+8n2dlbXaRxM01UJU3UyWLx0KEGZjOjh0z17PmnnlNDvAdPteZ0KLpLsXG4Y6Dzmu0Fx39FmCrPExnErpDmw+NATfOaPdsW28x0PDfgd1q6v8cx25gmoCB5n7acsmYQbSRjILJfb7fUqqlKFCEq74/RLwYh1KIZly4utLq5bzqGPTOPA5/WVTfWyTisFg7QA1nFlajC5I7G8LWZqafAdNjrJ7Q3Bmx/CGthFGr2wjdrWy5MFOOcbGc9WUJqt3UGtVin2Xg1oBzguXY3lGA5zlq3EedRZXKKyU5oVPYzKpabVrZWHk3F5g10JF2Aq+9tfKmg9ew== 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=N1lZSJgkECG5qbsFa6P2q2BsS/DLMBtNJazXGMTFRF4=; b=MTuQA0UCajBOgjfOcv502AXLCdPncn0w+6f8wzefjD06YiGJ8HISt9L20bEBMYLenbA3cpq9gRLYLPrnvcm/S/bqAsZ7q3oUOHEsFE3QHv08JvRkHQeBUvgC6LlzYThKc/Yu2cFegDNH9WcMmke8tDufsTLcKlBxcRvV1/4d7qVg/04RMDTOjoMmjg+CdvpknQqpijvUI64fuH+Kgdkw8ocs3JFZs/Yc0OJxmGn4byjs7abbV7cUgJDpKb/6qsi0d957eJHTN8wa5SLtLxuqhDaIQI99nu4Xbhi4BBGJLFGAR62vA5mOa0wCY/RjojPz5bivIbKkCXhoP8PDncz9lQ== 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=N1lZSJgkECG5qbsFa6P2q2BsS/DLMBtNJazXGMTFRF4=; b=Tba+WsGti8FeEv1AdAj2aFX5L1P6MzKdHcKpp4D9eMhoyctg+yzmRaLeG3y7QKs03I2m5RAPooFOwvLAI4GGNq9rGp5fJfMRfIzftW8H9507RZHI9i6d4BuLdujgD/dLAakgBbkSN7/U89Lml7FRi4BjpFApTUqtXquCJx8YVWrA4VGRmf9clI9bE9srEUOGRMICF31WT+bkKk12fSlvZMQSlh0tRJnDwtGmy+jYlNlogra94T8KUIwTrDKk4QVX4SYau+FSzKygGTFTGd9/HAkRqEwbWhYiuB5kVDPeqWyaFG473zqZ/EWQvtHH4oqf9lmaVHFxS54yu2eSIprpqg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DU2PR01MB8093.eurprd01.prod.exchangelabs.com (2603:10a6:10:276::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Tue, 9 Aug 2022 18:35:15 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Tue, 9 Aug 2022 18:35:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Aug 2022 20:34:52 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [dqtHOe+XuI4Y9qxYx7KC950Gh+yhHbeD] X-ClientProxiedBy: ZRAP278CA0011.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220809183453.220687-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6260cd9d-5624-40df-e329-08da7a35e6e3 X-MS-Exchange-SLBlob-MailProps: dEG5jEBie8m4xY3IIKV+jzf30RW9fSvmFPcVeb8WTw0WHNnxKR15uZ+lexUQ6LCabNZyrB5ZJiHsYvOtmWkEPQHtE23wMk6OPyBknjoX+VNoHnG+F7cFHIy28KkuPnMBjaQb0G1g/R3P5GnFsIK+xUYohyRUOM1AsbdpMfMT68LofMQxyhw7OYLM/4F7ZuGD0o/OYZAgztLWk2fmUOCbCVxYBN0kmn9qrQE8zpUcrRGKHFLVseoSyqnCooQBuzzTv3x5MqQ3f7r2LH+IG9ZZ1fI/1IWb43xh5c/uSQvNZ8nKoq+tObmsaGIGLrbX2E7Eh1sUhEczYRE//FGLPgstfmEf0u2qinh1adKZctyYFhIRHIETWzqF1tAwUKYo1qgGxfDdSNk7E6WUoP5a3yc1nvCMgOkPYUerTdFC9SVbcnss/MCeOoeCAfSJTKumOjN6PwDakpgvgk5oGmF+xo6YxWJEtScNj4S262o+lUVeS5ZyNbPOJJhCW3sGNDe+U+BP3fGcr+TJ7lGJHW7DrVYVOYA/Xt323mb6Gc/QrLp3ruk4RjpxfhJ8WjUh4fP+xNk9GnS/r/swtUqaQWbYfExF0VD7U0an2XEJbDrTsUxBGW0UwwOap4AQFEgl4gJRXGsYSeG/uH78C5TkseThcO8fGG1iPgMNuhaWqcWd0vWiT1ecq7LoC6ekEQ== X-MS-TrafficTypeDiagnostic: DU2PR01MB8093:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OK2kbz7VtqI48s/7ORYTxQTg3tiYgfe0aMB4HUUlH5pUI5JRnkI3YlLaXGZ9DHEDWkAHGcKf/HG2yn6pbGEnKS2cRoBxoEzzWTHToiYQ8a5EwzQSE39oWvlH/uRv4HxNL0O9lbVhuKZeKNHuDuSHNYH07WB39vFU51kTg8zlw7H+XiIYRQRkqLvciHojNCA1/dUHgtqpaEFvTKaIw0Pj780m9JN3pt9EtjgsP8WbhmZ7C4HZEry0FcVXTS8YpqL+ekmPZq0Yylso2dM9vXhuNHsP802tiY6fZDz/OXwi6aW7S4nkfSRyxiD6IYNg3sS/itFEqxq2X1GUxeaTI1rKll8/hAITa9FVeETRJQBZ1YL25/msV8IiSxy2karvKB+iQtKjpZeoJqjzShKDEO5bhmIswu4JwNr9qPcGvc9Tn0v6VIGgORXUf6f1oiTMLBCHSRIYQ3XFX7/3hzSo5QNCsfB3+oMBRIJIimvIx8hGO8fEIGM4/5Wrd9DBPQRq/Gwy2qv2CYyFEYd8W6wd+8WxK6/I/jxtNC1tNYmWeNvZv184MOK+Pf7wJcwvC8VN12O4cJ1zB4O4Bt/WciYso8fsojPiPotnus71U9AhO0H1suo267/oWzK+n2dJGp3A5PKGqZWsM0YSYq2FzD/IWDEaIw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Kp2+lhqY7LZAKG8kfdYjdd2cP2xckSwlo7othzilblhoQVsyOLmEXfet7qdX5DPmR1cy/ihqhllq2YZ+yckYtxsJRL5aMkxsvJb1UxQJKtq+WwRr5V9W65FX7o/m2mjLFhKOriCoagdG6ATrLLXYOzrnFae3ZOqmeLnW5QLk/yIlc23SVdbI4rUEcD1r8ULYHWqdxMsUEGCL/pC6YL1qjNt3/BJATiGsYrFtfeZ2iNkm7TCi4rdBVZH1/qTiURPMixPaFAM7KC9UEFHpFgfKb/E2DdFqYCOYdZPIB0UrIOAIPvuQdEmaUwopT4gs/TYqynmDxykJBgVxYJWuXmlEl6VtdYf8rbuDtF2FlCALVt43CVGE5P77JmFaxGn8IIvH8kbnnhSEzZ4vvfo3DLglA7VjHDFWuRk3eXPQC5GLNZHCxeGFJDZ+k0G9b4WzAibxKwgCBOA4CsxETOpNWE4j4PgUYVK10pDBMvHi5pjBCFLE73AFOXMfaRFmQB+57qT49MgtvM9Bs05KHAM6JKxhZEGziQ6OQVEKKdt2/QNYMsCtIDD5aia5oH+kFU0uJPrxoVKE8Y0aRJvhOHUzT25ympn/dDnlYLPAAJ7QJRiW54/fSZ349p/bwk5NR7QUIxNilgh66KMcEg2oZuj8Jew6s3lozcnui/rOhXJDD8oVb3GM+ttOnWqi2LhL90armBPrO/EbebbPhJ39pLJOU4g6eqcRL4OOvpIhOCMuVgmOVO0+2MBoe7WaGuhXobVpqSbOAPwMcwLmE15ZMlJ697eU89y2qMYY1+nSaC2LSxuh5ZjlL+5qfwzXo3d+ognUPQxSz8dvofYEgI8ekRLmq+Bl+Nmbu19IxFrQ80p70ZaYqrY9H7WIqmRR83p6shZGInHZMm6AASsVojfLe0tjbm+yOE9uRNCMjQb3QJC9Qf3A9//lyAQeEQFk4V4KvLCOgissiQPx6WkG8e0COLriffPO0gJQzgGCmVP+iwfYb6UhixYG41sfrcvHWqvFLz1sjXMjei1fqyvCwwernW9JUIQJ2j3YpW9Z6u9Yud7gGx9wIhl+b93CO0afybuS30zt4tzHGQM4j/n0bzMGTqwV7hS7MCXYBR3XyRI6tRmXfu6X+9sKWuL2tTTUpWkmiakI/6TklucVh+omwHD1iFm0RTXwaqf11ULLuVNn6O4OW3zUw53bufg8MGJPpzoksyVh4W5R7KsaTV51bAhmq3VHgGx1N2/dsnMPibQXJ2CDdosPfZ18oDtZ/12i7tMEq9giAbPtirnb56woOGR5+msVP9uShaHjDenJMAdKwwcVEi54vgo= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6260cd9d-5624-40df-e329-08da7a35e6e3 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2022 18:35:15.4864 (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: DU2PR01MB8093 Subject: [FFmpeg-devel] [PATCH 8/9] avcodec/mpegvideo_enc: Remove redundant check 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: UvFzahh6F5aA Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 2cd4db27bc..4840d80fe8 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1252,7 +1252,7 @@ static int estimate_best_b_count(MpegEncContext *s) const Picture *pre_input_ptr = i ? s->input_picture[i - 1] : s->next_picture_ptr; - if (pre_input_ptr && (!i || s->input_picture[i - 1])) { + if (pre_input_ptr) { const uint8_t *data[4]; memcpy(data, pre_input_ptr->f->data, sizeof(data)); From patchwork Tue Aug 9 18:34:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37204 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp426469pzi; Tue, 9 Aug 2022 11:36:16 -0700 (PDT) X-Google-Smtp-Source: AA6agR5FaJWiFMYONiXPClM0LB+KBpiGM3bRDy+zAOYxvSUl0WW8SpfnNmscjXiZRKDo9vNaJ3pM X-Received: by 2002:a17:907:7fa5:b0:730:5d54:4c24 with SMTP id qk37-20020a1709077fa500b007305d544c24mr18026476ejc.641.1660070176166; Tue, 09 Aug 2022 11:36:16 -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 e18-20020a17090658d200b007305b0156c9si2591691ejs.576.2022.08.09.11.36.15; Tue, 09 Aug 2022 11:36:16 -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="QMN0cp/Y"; 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 E4B0C68B878; Tue, 9 Aug 2022 21:35:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2104.outbound.protection.outlook.com [40.92.58.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D70F68B844 for ; Tue, 9 Aug 2022 21:35:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jCp+DI4zooeoccplrjf3A1KvgPzh30qVugJ74UwJEp3KyM0kxZDl4GFPP5KNhzcAmApK/Nn7n8RVYbHWvGhgfwnNkjZ0QfHS34++qpsnrODbUE0+JhACrSeXZ7h9YjzIcAI+e91ccEdjTvzpQQep4h7EDEWqnvgLdPMng+BC4VP60byn2a6atfoCpO1OXcoyxgrLI0VwxndnobvEZVjCG6gsq9Iszs5iwJuLhU8rXiYGC1LmGp/37bJYmG/tSZl7W5FEOhoGW92qFPx+nMCdByA7uoZo3AbKaM4hLqY4bbW+gCiUTzmfpCA/RNVO7C0RX2TEe8IGMw2wdxl8A4qV+w== 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=NOHOGNniDJ4vxJykrKqn8ZZWa8ijwTYR33d28WFLwA4=; b=awlB4VAiZfGzoRt2TzeLYJzhM1sMtNYEGwAqhwOHrG51tfgPV2D7jBKlkqSPJUrJ7xRQLT4MAPXjWHW71NOL4HMFBbibAFwp3WE685lUonYItQ+fhTyHzp1wFQnhZ6A4t0NJhmh3kqKzcJiWWhSUqqzNJ84VRFf8cjlrpDVUj0aUtzU4/U7zpSgePlAhX6wikup3RtqSxYPsusqEx9lTT+NPEuNKR3PXN4krMa5+TH3d/VTwpMQ/tAAJ1W299pKoXjMv+OdcfJ25qqORZ+ECg+PnMmjKRR9ntZmkiqTrPb4YxOg8DUKpTIIYUe2Ep0/u0do8iBM96TtmE3Ap0eT87w== 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=NOHOGNniDJ4vxJykrKqn8ZZWa8ijwTYR33d28WFLwA4=; b=QMN0cp/YcTcA+EEsg+K0cYmUPZzUR+0qmNI73xTCdSH8urL0RWuht6GV+uX8bon7W+jfGOXxZhFFKnlXZOS+J9KjQ8qxmupnIolM2Zjg6Xk37UgCuPGD9ZPhXCR987WoLCTa+ECDYdi9u/svjqDqn6LaaWqQknQo2F76UrJuVpKOfxwNTqIg9+Rb4Kueqx0G7RodTbb/aXtrNLptH7gcqBNDbUtDFeR0ghywgBR/6p/HYlGLRKDLQqOcwDG7/VRlGPlhHDm7RMpypNg5DKRWzXEaEfR3aNeCwBgtQeRNp8d12mAztYVfrAurniS6+dcO8+kYpivigBTy1Zwy++Yekg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DU2PR01MB8093.eurprd01.prod.exchangelabs.com (2603:10a6:10:276::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Tue, 9 Aug 2022 18:35:16 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Tue, 9 Aug 2022 18:35:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Aug 2022 20:34:53 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [fQc+lnj45yqv2SStkupeNldEzL4SPxP/] X-ClientProxiedBy: ZRAP278CA0011.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220809183453.220687-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ef830491-0338-49b1-4e08-08da7a35e794 X-MS-Exchange-SLBlob-MailProps: cF9fn+9l+fsupuiEf/XXeuDuPLo/XkQy4Y8pMJ9Er9xUt78ODxTty8L6ARo/yn5EbmIwDyuWXd4qYXZxUaJys+ZheOBAEkqkudCaK8OkqLNh7C3BoycC0aSozjt3sIS4taidBHcqTjQbt8YzZxdSHxWl/RccZprS9kK+3klFVmXi23Um3LBvp87XIcRUQ4Hwp9CV7Ol+Tzm/axy04p4h5KauIBFjC0rmVIPxWmbBjzTRrtTax5xuSxzgtgdJwFt9E/ryGtJ1ppiXmpb1vt/O8wxv/1RhiGyZv1bc1YJHDCCC8y5qEkjkr8S8tTIFEP6Lc4vBzs9fCmSRdiwcicneMoogL2ZcEUVsPBHtG21mlMqOc5Lxjb0FF0izSYtG7a80K2RJSEc2l6ucBQS5JapCHYqrvQ7hTQUAJAjHEpbl+MAy7/yb/uDASo1jf7gMW7vIX7uTmCISje5/Lqg9yEOmT3iRC8bJucn1MqqArqU2zXarCeOUjqNvZhmz3xgppeKexwpCy7R409yEmTNV2ClA/7Wzu0TAalENobVo7qNalwbh5ZUOGjhWkouQhdaAqfJGH2j9FrmvA67oZH6BMN0y9C8iTtm3Z5gTSND13RTK7krz3BZnZ4uk+YLI5ga6gWhW X-MS-TrafficTypeDiagnostic: DU2PR01MB8093:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t8W6qLdJu0C1tz2RWc9aLdLkBQYjMugY/QuUgv/tcjJFG4j7RcRPnndyTNtRc74ugrfGFrLM2Eu9Su9MdZYHbkLUJf3ksV3TjJdI7h62fcBckPSp2QQUZDF+/e+vhuUZ2ERbNpBVxORrJn3ugUGFzvZUywgUHiofJWVXHdhGk5Nv0K7ENV3e5Kss/RixsQeJE+wRgA428kWF0CmIWVqbNB9JpG7hID02Qmmu9j4rh5DRW08w8JiStg5QlLDDPDlszpBC0s3vIajdkmMhSBhRGBvpYV5syLmX0h6FIrd1Ol3tSMubrd6ukqfEJR38uX9BkSo4yTVv6j83ZwGbsYVJiYWtJcf+4UtvGF2VkORW5VyUcTbFwUQpm4m5TYUWxeS+8YjgWlpu8x+FPIw+L41YrGOrPnT3I3cuoSRDwlSn8giAojLGe/smoIpe8OkuRtbxaY4U9iq5trEV1AsZQjtJRjP7CVCVyY7bKykJTTWfRU1lK6CGmDek5GKVaRH8+Gws5S1a2B2XWyrJdlb3II+GWaYu8QPfNtXFp6Gm8atCmRu/g2K8JAwLtkUaViVrEe4nTbCpkr231QOGjYBD/2DcWbFCe2IbmmvdewCV58ASV5exLce+WmRxt7FEDnNVRWvMijEq2bzQCyUCOc60EE5+eg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vCIKtqoBWun7o1xNVRkBgUv3uKqL3ehHxZp6fcY6XdAuBUZVddssJ7jUbpCKaFuM44iO6kHjXw7K4+YsfNMxx+v+BXcOBwp94EeWVw++eMXdOmD6Njjavp7JryVkHCGunTATJK7aZP+WM7/duT1CiFGKHGph1bHk4qUXNFzTsXMS202YXjQKjvF3riDmS1ayTYeatIy62CX9jgX1r915YqWu5lq+GhJKzfk22apdyuGKdEemXGM50ryT0gzANXpjNku3518G50hWOMZjKAK2ALKzNDfa11jDQ26M4p0ONJicpOZ7A+COePYxa06WUZcSL26dRi7KpqNClzYq4aYIejVAxKFjEAYFFoBCAgX8+7GFa9u8NXiTl5agxYLnoJ/O2DMmktoXcKuYDun8jg2r4yDgIcOewe1S7oAFhRDw2UJ+C47m19kbaDHi78T7Ao8cRfwhUVvSbhoLrOzmONaGqgb9hhQmem6ZmmkcK3gb6XwqyPcEKw1OzsUozaFhtZ2DxeW7Rhu8X+WcNuKjn/3QJsUffxZtJSBTw0qZpUtg+gYuHxar2aJAIH9qtS/jaXS2bTOwh7vCChPJ037cEQMQmeYTk11flJiAZon3OzaU4BR3VBt17QEOKEdEscLpGRv+gyYf9Y8ert+1DH86Dit2crTEojp+F1kempTqE2KRu0GEM/W4pGghQ6yiU42+iHn85m3aHazeRhrZiMhWsf1Lozdkd8BBOkgYCSgiUBq/Dgp8R2vpxB36as0zi2VqLQiQnidvyE/wrM0+uO/c+lAJ7mCHXjXVU0Am0+sq9lluw6IeOS4N+/VI+IOdYelXxZA+9zJSL1B3ovKBX02nMMRpaJoyTHVHJ4UaAe+IuHKj1dBkPT6vQ4Z8IO/F+l5Mr1fwsSfN5Tnyp6M0X1ilBQmH4X4zH/PMJJ68Jb5NciRExFz0ZtnnanX5wRKGcjHlC81DrDLzSYbYPHvVxX+q12wQr29CVCVXAhtGSXvniRyi+b71jFj7JXj0ofH2Zofv6q+3jzi75uF30vnxJC2CHh2htRqh34WJSq72iTchBB5id+kKXBiIJhiNEEizTzZYUO4T+J40o7ePVsItMUDJWdfSdBlwaByfnXVrY+sDlkDehNosFAHvvQfV8hE0imIklEkVknNqKp3ioPGgkfYlAHiwdfnLVnjG74uK2QQYgps9iX8NIwNYJAR/eGolvLbmMm1wbXmYbUvJ1NZxNJ1KhjolyKlusE9gCSeq4seGrq21nzdKEAVFwyQzn/tQcnTDyGeaXnyIiNdaseClfSkKuOLulqjB5+duiyOXSHb+1LQavwo= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef830491-0338-49b1-4e08-08da7a35e794 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2022 18:35:16.6739 (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: DU2PR01MB8093 Subject: [FFmpeg-devel] [PATCH 9/9] avcodec/mpegvideo_enc: Remove redundant cast 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: HeRviRIR91BB Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 4840d80fe8..63fa0663d3 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1154,7 +1154,7 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) for (i = flush_offset; i < MAX_PICTURE_COUNT /*s->encoding_delay + 1*/; i++) s->input_picture[i - flush_offset] = s->input_picture[i]; - s->input_picture[encoding_delay] = (Picture*) pic; + s->input_picture[encoding_delay] = pic; return 0; } From patchwork Tue Aug 9 19:55:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37206 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp463261pzi; Tue, 9 Aug 2022 12:55:54 -0700 (PDT) X-Google-Smtp-Source: AA6agR4uJ7xhuF4stLGPAqBOFC/CHRgVAOFYPSioVbwGqSG3//omUpm5kB11fipBl+g7QohCMAuc X-Received: by 2002:a17:907:d9e:b0:731:1a5:8c68 with SMTP id go30-20020a1709070d9e00b0073101a58c68mr14345369ejc.365.1660074954493; Tue, 09 Aug 2022 12:55:54 -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 du14-20020a17090772ce00b0073301a22cb7si640491ejc.294.2022.08.09.12.55.53; Tue, 09 Aug 2022 12:55:54 -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=V7O9vRXA; 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 ECDED68B808; Tue, 9 Aug 2022 22:55:50 +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-oln040092075014.outbound.protection.outlook.com [40.92.75.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 729F068B650 for ; Tue, 9 Aug 2022 22:55:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nTVkZJucwRO8HvpqIEbMuE/iKLQWE8DrHc7zCde1OfjvGc30ePNOiDsl1z64uioe+kb4A3981lSM8HAKCGtZRlb26+00QDbloCHdGdDKVk0/bjqJ+TbvhyjwI/L0OkYHTvHuBX/kH+L5gbNSYL8u6ucMC5w72oseX9qMdkZGHEyWO/2UjRAreVzWjHb/YE2Qg0XGFYjECKnLLamaFrb9lnACzhvj201jrBhWPrJdE4sVoFyTxeHDjjida5O2JJSPG6K/zlSHg2X/aFDrGI+SUeWny+RyuSJPhXpDEtLhbQFjzq+HO4KdoSerfrKQYPfEL7eV739KeHx5tynsME3suA== 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=6mY0LpxVc6PmK85ACk/U2U/0sfrJkegWpK4CcAjBE5Q=; b=hS2Hd5egdw4KdMJ1+xp74aXABoWtZWDUH4Dz0De80M4f13cotMcIfoc4k/9iANd3n7vGwLsLJMWoxvyJipc/heup2JN3ITe25LLY2BhLcE54xNxGd8/VdbKLiVhEmM/zLx7GRjyrHmaFCBOW6k+TZ9eOspycpLOjEvrZRIyMl7JiY9Es2tVTDhC5MloIpH2LW5q3lnZYaAxz/N7VKwQHEl474eoIfMfFf+5S1tgMi7mkkBVn+sNBkc9uV4Jtr4hsmhw4TXy/neOYzZCOLi+be4r6pDHG5Vd9wJuAglQf9c4/Bs5gF99BomjDTwjWPKjxPfplmWgYg4dvgADo5l1HEQ== 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=6mY0LpxVc6PmK85ACk/U2U/0sfrJkegWpK4CcAjBE5Q=; b=V7O9vRXAPYlqUbat6G+UuH7fD+zpESUEdN4pCnR4nI6b7U219mAOywmMDezuHo0lQKESiTLpIjXKVnftk9igtBRVTZAPX9Te51kWNiaeQnz5mbyyO8Lnoq//RR2XxBEfbDlXNx+a5je1p4RFMKWinGavn4T8BJQi0C68q9botpAAtKsf0BuvIyvl/H9JKY7Ys9jc5VONP6FC6EvU8xs80UqVEgXygp5raP164iTr1gfVIV5hWjj1Usx/p66Z7VEhATf+dJmPq9TIEniHt70uNb4XOEWPoDcVt5gWmONYrqun8K32H/J4o17E7JpSEPHUxg5y6IcCIQaeC01j6oiGBA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AS8PR01MB8276.eurprd01.prod.exchangelabs.com (2603:10a6:20b:343::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Tue, 9 Aug 2022 19:55:43 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Tue, 9 Aug 2022 19:55:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Aug 2022 21:55:32 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [MNzDNJ80ly2wsgh12QS+c5jCgwrzdwvk] X-ClientProxiedBy: ZR0P278CA0019.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::6) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220809195533.361307-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dc549829-45ab-44cd-ffe5-08da7a412449 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTC4ziyQch4o322A/V1AY5qaUN2lY0rncuO8Iqe3tS0kXrzr5l7yKferufzEo22bkGJz5pTz7lFdbmBLJmGJ41UIVByvq3+lufnw4OHXgwBe6SwxQ/v2fY9m/5CJo5y6jZCKJY3letxM87uiIuGx1qTmGitcbCMdSS8LqLS6RkvuPzm3yYgRKp+mj28cjPedWoQwWRxOiZCeQ4oxHMEX+LlMxlMfSJ1+imRk/1Kwb1X0FmbRZ3ZjM+YV5lhYZ8FaDsKOVSWcNrxqGDKeTRe3RPzMaeQlx+Rk5si71eYnyjtOT1ikUwgQWCiC00J5VMXWQEBtsZNOEOal2qVeHRF1AFFjYpUlivfvCzPGdwnyaMFQekhLLPXMOglPT6iVCrx+XhaZx8hcpDWa7hijlwJuuzK84oojtZVWwvtlSdls3wPGEo2SObH5Khqls9G7/Jx8hA3uQ+SgYtV/N9qPLXbhfEhNyIQPN/MtwJ14FSrATm+ZVmj53zpLkAxEKwEuGfFP+QnMS8KWokmYzL/J+WeStpKeyDmkvoAyw9BHSQ/9HT4q19mnFncGSCW79ABkNqxXGr2YR8H6BBo48NfwqPoYgBjsi+RAWSCQb7Fd4hk9hHE21phFeF5FFMc1+Qt6E+iyK0m+yWewfNruISY+BY7T6Y6gbDcH118haHz+YCNMk6twk7zG6m9+KMZfgvFd5+uPibWBvVj4svuAJK2aZ8WXPxmBKF8lZS5Xbz2YbFDCtqIJaNnZdQoJ4iUSMOSYDVrZck= X-MS-TrafficTypeDiagnostic: AS8PR01MB8276:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TGyz6N4QpGhG3ae2scGrBPsdXK11a/jxvWIrz1ZfDoDzUd+Mbw9L+8AjO34ih/fvMsBwNB6LFrQQtrRz1sqQ9JcpEN+WxvNW0Tyd8fOAqn3PRGsD1moBKbYhZCXriBOzXKj4DDPSa2bGkcsiW3iRvyTgT3brzTDpYXh082m68uwxhvKPtFvjUWF9Cs0ExV/ujilQDeNOTVTm9E9kYX5Y4DEA6P6d6cQvfLzwvyzpmhDbrJLUAJM4RCAS2/5q5Qf7f/UjX/E+JeR5BZOEszWnalPVMcZgn12g1uZnxF7kLJWkJkXQZFsOowWgoNea5yswjjWRvgJKBOPc9/YyQoeE6bVsmXMgqi3nEeGE6GyieMntMMTOXIQ07XyUqxSoLuwzIWY0pVhJ+3Kyd3Q60vQK+xFf340UhNqCRQjBgJ5kEmQAkvzwj01je2JCTk1fJhSK+CYtr9p3SP1ZSqDfI9wumEoC0gnvQT0gKhYzo7XbXNoPFfuaqwIMb+5Dx47D09tVuY1eACvWsk8lBBZjwbkCr8SUNJUMjEsMHbRNNDvGV45H7yTUCzze0ESaXWMvMyzvt4BvumuwITOTdqSHRWQNXUQ0A+hXHKFViaFnZBFxRv712TvVfyVgdq7ZSIkaNnkK3nXe2mifHc5PXnkQ5ioKVw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Wxd/dAb/LsyJeUIjjhIhQiV0HIoLMi8FZskDOcKnMk4i2DZ5lxzjmSHAJoMOJpsSFoRG2CzYOUWFpthEvHNvO9g2Z9NYuZTEZCM07R3kZGjGykiUL+UpNAR2xOzNS+oejdmkdq1vZ2MLehsbVIf6I0DFxt644CG5AFq33dm9PXDkU2cPhl1FQzk7ar3dG8SJEQd6KSMiayLzgSJIyDUQdUhBWtTA7Epss6rnsjz2FXpn/YC/3jsbiQcpRLqedgzECxFnMwwKsWZs05h9XUR/3TMqsCjUiuJivqb4IFtyI/jnHsBaHmfw3haoqpuSVqSNq0WbZCJDcUsj2Zms3DEng4SHybYkHU1KaLPzm+ngO4A7/jgZgqCNHCEG7KooSpfXStbecFmNCP4/KPr7yyxGwMpWHZMSa2NcA5TV+YM37ZjkxWkjfx5XfT5DOVMObVsHJtk2Wj3Nj8gAVXKMEUHEH+4K2CBujlZ9R9Ctao21dwUsjU6JVVg4Daqm64dUy2/Djntc6js/+aNCpAKfXEyDkcx/WWrCoErK7CAUMUeunXP+prGS0l3l4P6TAAIuZL0S39PYBUFKWxz+sY+tRimKIwm6LoDYGSYCzy3aNJ29IyAtskhMnrfyrr4hQ6kyeH9kLqhtt9hlrM2HSCE7Xr7yDxF1G13YT1g65a+Nqxzfm2v2+1gtVEu+wCPzS30GPqI7KwZxtxnU8Moe2MZGphTm1U/NiuVlAHJcy1hIkUQo0o91Vif4cvrsSLQ7hAz1FYV0QL5J6imGt+9YG2Be5qUp6oxrI4dbUxj7bDrT+FT/0m9GDO/qmeygTItzMcWLYFJ4nJb9JcOqN5PtgmOALQlkU88zn76Sh7PF42Guqp9s/7n7aNtW9k5vz3gZQTy/cLJu6RFhyfG7zPj4g0jwS7iyt+YpnYwA2kehX+VGn3AZoG78TF9kJ3xeAGQsv7aPcvpg2tS/S9MpkMl7Mrju8q/qdtZ6O5oKYz7fXEVgZmXPE38td6VlEzXkztmIPdRiDO5zTQSDGuX4QL73zZ1/lCDwHH0AA7pg03XMw8EEsJ/wag1SX4aQ5P1uUBwY6h1lF8HmCzpN3PJoyq/eE4oS9iAmYBbtp2n+TAoETQNIHWv9TAyNV1OXTfOYXh7GsjcZQzwLr33UwThneaDp8NTAi/BkeeWOlWrNcnSZ+ttPjZQqzFd9Mp86nsvfBlQEOVnD6RTSq0k/1V2qGbkcUNtXpvG2VAYMrZCM62U8Fv1ByYVZ50tsTnTKHhTCzoncu6pU5e5sx257GOBRQ+AyoWvm5cUjrTx4n8c4zqjEDZHTOpZ6/Kw= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc549829-45ab-44cd-ffe5-08da7a412449 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2022 19:55:42.9451 (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: AS8PR01MB8276 Subject: [FFmpeg-devel] [PATCH 10/11] avcodec/mpegvideo: Move setting mb_height to ff_mpv_init_context_frame 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: dSAcl3B5qEnF It is the proper place to set it, directly besides mb_width and mb_stride. The reason for doing it the way it is done now seems to be that the code does not create more slice contexts than necessary (i.e. not more than one per row), so that this number needs to be known before setting the number of slices. But this can always be arranged by just moving the code that sets the number of slices. Signed-off-by: Andreas Rheinhardt --- Unfortunately, there is another place where these values are set: ff_vc1_parse_frame_header_adv() sets mb_height; it might change it by one. libavcodec/mpegvideo.c | 32 ++++++++++++++++---------------- libavcodec/mpegvideo_dec.c | 6 ------ 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 1405176c06..ff08168362 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -526,6 +526,11 @@ int ff_mpv_init_context_frame(MpegEncContext *s) { int y_size, c_size, yc_size, i, mb_array_size, mv_table_size, x, y; + if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO && !s->progressive_sequence) + s->mb_height = (s->height + 31) / 32 * 2; + else + s->mb_height = (s->height + 15) / 16; + s->mb_width = (s->width + 15) / 16; s->mb_stride = s->mb_width + 1; s->b8_stride = s->mb_width * 2 + 1; @@ -747,28 +752,12 @@ av_cold int ff_mpv_common_init(MpegEncContext *s) if (s->encoding && s->avctx->slices) nb_slices = s->avctx->slices; - if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO && !s->progressive_sequence) - s->mb_height = (s->height + 31) / 32 * 2; - else - s->mb_height = (s->height + 15) / 16; - if (s->avctx->pix_fmt == AV_PIX_FMT_NONE) { av_log(s->avctx, AV_LOG_ERROR, "decoding to AV_PIX_FMT_NONE is not supported.\n"); return AVERROR(EINVAL); } - if (nb_slices > MAX_THREADS || (nb_slices > s->mb_height && s->mb_height)) { - int max_slices; - if (s->mb_height) - max_slices = FFMIN(MAX_THREADS, s->mb_height); - else - max_slices = MAX_THREADS; - av_log(s->avctx, AV_LOG_WARNING, "too many threads/slices (%d)," - " reducing to %d\n", nb_slices, max_slices); - nb_slices = max_slices; - } - if ((s->width || s->height) && av_image_check_size(s->width, s->height, 0, s->avctx)) return AVERROR(EINVAL); @@ -799,6 +788,17 @@ av_cold int ff_mpv_common_init(MpegEncContext *s) if ((ret = ff_mpv_init_context_frame(s))) goto fail; + if (nb_slices > MAX_THREADS || (nb_slices > s->mb_height && s->mb_height)) { + int max_slices; + if (s->mb_height) + max_slices = FFMIN(MAX_THREADS, s->mb_height); + else + max_slices = MAX_THREADS; + av_log(s->avctx, AV_LOG_WARNING, "too many threads/slices (%d)," + " reducing to %d\n", nb_slices, max_slices); + nb_slices = max_slices; + } + #if FF_API_FLAG_TRUNCATED s->parse_context.state = -1; #endif diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 7caaf0596d..93ba4e31b3 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -208,12 +208,6 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s) s->next_picture_ptr = s->current_picture_ptr = NULL; - // init - if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO && !s->progressive_sequence) - s->mb_height = (s->height + 31) / 32 * 2; - else - s->mb_height = (s->height + 15) / 16; - if ((s->width || s->height) && (err = av_image_check_size(s->width, s->height, 0, s->avctx)) < 0) goto fail; From patchwork Tue Aug 9 19:55:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37207 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp463362pzi; Tue, 9 Aug 2022 12:56:10 -0700 (PDT) X-Google-Smtp-Source: AA6agR79CW7IkAGI0gF3HY0efGKmpW3LCJVKiQZdgQpfd1YoEdmvcbjn++nOtjvtCaRitCXHd3C0 X-Received: by 2002:a05:6402:f0e:b0:43d:61d6:bff9 with SMTP id i14-20020a0564020f0e00b0043d61d6bff9mr22844529eda.78.1660074970339; Tue, 09 Aug 2022 12:56:10 -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 i5-20020a0564020f0500b0043bca9c457csi9055502eda.396.2022.08.09.12.56.10; Tue, 09 Aug 2022 12:56:10 -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=g5kNltxo; 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 125DC68B865; Tue, 9 Aug 2022 22:56:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070021.outbound.protection.outlook.com [40.92.70.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8EC0068B842 for ; Tue, 9 Aug 2022 22:56:01 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eT9YRHn+1dzadqopa8+N7j5z+y4LBX9OAmLbBTzwH4KRyvl7GtkmsiwBPWa52OHAFbKjyfGdLaVPQNecAZpyIKtBEsz6beCu2BS/keCAibS9axBtw3KS0sv0rBBOUM+KVSkDICsIrJoPsoOZiNvypPPGWm/etn2DW0vYv4nQ8k4Tt2R/jICRIckVKKcTsD/a++3i8Kn0Yc4Eb04nnjDAVIq3wlc92d5T3JCfvy/cWT6LyfHyWG4x7XJnpcPM2dUtFBKH5m5KnbeXLc5dV8hDjDu5tFlBr9tS/ui/SvYo2bIqLXfRP8vmibNxSGR81r1VfyhHXdwN+XDh2DqE8pkYAQ== 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=bKFwlv7HJjKwzYo9TeT1VZGdlwAF+iZMst30GPx1mfc=; b=SJPYvGvovCjC/EiaA4/KAOAHlCSh3xPeE2mWEI4qNJvDC7qShFqiRE7FgvX03QSEWGICHwIVJyO3kKzDRyyi4urUaURt/c1KtAAbPxbIP4vqnTIcp1o51adU1N6hl+9d8HN4mTAJOH5Gc33Euz6xtYb+zI0uSQKCJzWcmkGp74zGyVNn3AQhW9opfZ2rNhtX5zzzkeScEMLHoEZ07qnLe+Hy58tci73ejfRHqRuEaR31GxOfCgG+drSD7xvv0MdGSX3GyiwEpZJ8qDr81Z6ne3PWjmEuxuMDGjb4/5b7xkmHX3PIrfTcBW++YZzlyZUik8Vjok8X5U67eTqhsJ0arg== 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=bKFwlv7HJjKwzYo9TeT1VZGdlwAF+iZMst30GPx1mfc=; b=g5kNltxo/zt63WHpixqUy54QyHNM4XA3n9djuagsydC8I7cnKNIRXLhU3KQMetEkmre3ZK5L9DSJpKeiNYEn7EMd31DA4UT6Wfw6dSfSYR9Qu6fiOTqmB/YTG1ojaggsolzvMG6hiIm7tyrp4hc/BwMaAU86PrqZW7U0smKDfYLOiKzHA9dRbAnhkMSAgS62lj4pHSdBwxVc1JsQza5jAmYHf0PAIZf9T+KcOsusw5eDnIYvcFjUgOcsoI/1SitZywrCRY8qGfOFkGzjf6gZ3M4EYQ23ixEvWfWEzEXS0P7ZgmWXtS32ycKlUIkfpbBdjIyFjrAKUn4becqu0F/lUw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AS8PR01MB8276.eurprd01.prod.exchangelabs.com (2603:10a6:20b:343::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Tue, 9 Aug 2022 19:56:00 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Tue, 9 Aug 2022 19:56:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Aug 2022 21:55:33 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [KWzC+efZvgs97KLhZhYhgBo42xDEMa3M] X-ClientProxiedBy: ZR0P278CA0019.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::6) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220809195533.361307-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c72ff33b-a869-458a-cbdb-08da7a412ea9 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIj0MyIIwJOZWCIBXLCCWNsflyGI7BGF/5nct7rO3je3cLSpe8VbdbwMDTLcBKPZGRf6upd4RCwnN2uvsCTyvsobP07Km1m7tRTolh4hGanbkqHoFilEest4TqHelglvHGGlAPfjd2/pNUBmNp6p0l+zpXZmwTAx69sU3V2aqMIJFcP6YT2N6ClvgeS6Se5GqpkGGHcME+PskuuwtXO7KAffh9/JLtOVET3BFgXr2i/ubq6Q+mQH3E+wbcPrIIuDjP8hAIfMB1uSawbnQhgu4OaVztRkFV91z1TE3AnAH6tPhcXIQBkkeMcm057XGHDhUAcfUGsFyDFvlRkQAoj5Uvtzf+DnGnFZ7XCfHGCFyM9XFgkQ2SZGOslewLZ7WQMlGs5SQTkaM1kJb/w1sGJYVxKKlIV8YRMa/6EFKDhA6zdTIBlscNUrSRUAEHR6ARaHNqJ0WhplBuyJkomcntRcdeAu2X6145px34J8DrPToxjHR0cCqi7tidQJjGpzN6FPMJVjFTRkajGzp51gV1H+NQdJ/vMbSPOMwwxASki4R8yxpbZ9dB0/wLsnack9kjiyV1HuAiHlE2QtaB9CombBlSIqo4QzaSSXNJCj8lEJZkC7LGUzauszcb3ajT+p8Gk+CrbR/VMOuH+2KKGHnMdS3D11BZqCp0pbtlbNiUeaLEW68ASY/B+iCcmNZywDNR/1LKnaaqd94DA7A== X-MS-TrafficTypeDiagnostic: AS8PR01MB8276:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kIUJG9Wdc6A4hro2fnAT5wDh5LnvS7tIj/6N966OIfBrombTB0E7OSfJdEymQXOyiKvK7EQkKOMq7hL+vw37VaFRXsSOSrWXZCzAXJKICuHH8fAqWtOsjHZj5EmBl2r9OM8hHwI6RrrRNEajNoNVboouYNm8k5zhvpcSt3Ut0xvgDwVgUY9tbXv8+55ml6lX8MIWb+c49Jyd4sE2QvYIVvRg/Y2+SxfJZ2pH5LOCPIo2dxFkzNNq144tAoft7PLq7inB0rli1WQBLZ5DMeusMMTycDpa6CrKqGv4+VHYt734PRFOrZL32j/BRvIdYY0DSwfDOl8s/pe+fHshKht0XlimzGTrDgXsw8r//YyLhKrfkruZfZrbHUfanI6nRPrgv4tYhNHFxabHbEhuaNVQP3WkuA1Fyd8E+ganAMZqL0jIV3E9kr2f9sCSuzdU0+KTcTiyhXabSR+tZq6eC8z6vni3nAKaCZ7wd32k85UdFwU8TDKhKaHBRvXt1s5ABVXrL2XDOkHNIQqzhhFoKUfHQJWWOdWPJP8sxixi9z5fmWjeeCn7jf45fyHxy32SsDdNi3JpsI4LZYQSSTx/Eru/OL1rXf9P4Utwikp/vIbVg+M/YZ7veXMYcxLAp7DP1kaECT7haC5x/wS9bti3QIHLgA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ap7Oo2WvYrbFxj9DVvTZFBvJspnMcdyaZ72TSwzCy1I1/sJ7NcovLb1vx3z4WJ6wrUnrS8+ToYi5ecwE4sC0j2NdqMGNltz/7QuoGVPAdZ+JHGrZ7a/ftqMyKry58HbrsemQcahjXCIq2psO3NzFasm/oF0Kk8RuonBaBtvcXbwJVylfrrRKfAWIJFqm7TKbJUC+DAnQ4aWPGakDh/b9uzlk2EhjmaJBRfeB6aKPETL8rDQdq725bWuYhdGKTMzntf8hButaDXDuQKYmgOJRIys3vCOyZZliWnwnozUts+vyMIXRbDZ2tuZU5fgvkgdwH4+01WuMERCydHpl5wcmCx/xKFDB20Vqhs+TNAK/8h3++Mu6PfNX5tzZ65aSAQBZlAd31E/v0AKGV8Hi+A84QqIRDyV+wT2/iJs/xpoQXT/owJOd5mnn667dowiWHsmcsAyhZhonbeLqUBMu48nVR/rQKvXQ+tDJYyX3PWs6CzBfitvyvEShKSfvhpToUaukkaTdrrRi9/DhlZXE+pOlHHxU18+UN6KB+WQrwYf5NtzanjRBvwlgzd7bseHVqqniJgkOTRXlGrMgc0aYimrW2OechxRh/HwgMZt7Whz2karS6mENA2FBQJzFk5ze6zsXGP3Vldt1ukBBLeDYvfZvXMrcK+uIEAykJUdHgJE7D/6avn+AHIdoxlxhIVikv31mZeH1zZL/9UXGBCtx5rkLJnZsZN8BzVU1dI7p4s1L+aBbUIVhGlWt7O4YdHmUHyrbiYa+LZXtPyr2eE+uUpuHdxTfTVyL2ZzxTne4y+mB1dCNOB/k4IPgzNAYW0GzrL7UlXXGrYtLYDAmYn2c4N3ARVLzwnE+C0sY5E/N/PzrVATitAlwJJe2K5zwtx+IltIWQQZ+5gxK/isLTsPmd5xTRT0j91367XtPpDKthxpJxC21y8g5A7w2Kg/PnN2BchmnOzEMCmArkRXFWpPryAId+iWlCqnx6E2C17YEt68J/KGa8jMJwWGiJnIncWZoJNhsHdU20kVIMjAgc89fYGZHEhtJDPxtmY3tXXv7Lee7eY3ITQ+Q+JSrSx/1le6Jr9kl3ekRtvWGfuQV5TM4qqR/DpEtisWPTKv8EjRLa60TWFLa6VFuIjN9aF3RUrp65FX8m/5+HORfvSPyUZnbbMkD2G5nmla9B8+K9RVi6CtqxiBwDm740XYsPyWSpPcRjzY7hlizAJhVwH8jPHsrYIh3SzW0928+pIoE2kg5fwE0fBIajGj5B1cgcbzs1maFPQNLAQ9bgq9evm3UiijqL4nH1wLkponuRWmaTVZnSKvWnKs= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c72ff33b-a869-458a-cbdb-08da7a412ea9 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2022 19:56:00.3188 (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: AS8PR01MB8276 Subject: [FFmpeg-devel] [PATCH 11/11] avcodec/mpegpicture: Always reset motion val buffer 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: TEboM+0htfN4 Codecs call ff_find_unused_picture() to get the index of an unused picture; said picture may have buffers left from using it previously (these buffers are intentionally not unreferenced so that it might be possible to reuse them; this is mpegvideo's version of a bufferpool). They should not make any assumptions about which picture they get. Yet somehow this is not true when decoding OBMC: Returning random empty pictures (instead of the first one) leads to nondeterministic results; similarly, explicitly rezeroing the buffer before handing it over to the codec changes the outcome of the h263-obmc tests, but it makes it independent of the returned pictures. Therefore this commit does so. (No, this commit is not intended to be applied. I just hope to arouse the interest of people familiar with H.263 to look at this issue.) Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegpicture.c | 4 ++++ tests/ref/vsynth/vsynth1-h263-obmc | 4 ++-- tests/ref/vsynth/vsynth2-h263-obmc | 4 ++-- tests/ref/vsynth/vsynth_lena-h263-obmc | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index c57f149752..2192f74cea 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -280,6 +280,10 @@ int ff_alloc_picture(AVCodecContext *avctx, Picture *pic, MotionEstContext *me, for (i = 0; i < 2; i++) { pic->motion_val[i] = (int16_t (*)[2])pic->motion_val_buf[i]->data + 4; pic->ref_index[i] = pic->ref_index_buf[i]->data; + /* FIXME: The output of H.263 with OBMC depends upon + * the earlier content of the buffer; therefore we + * reset it here. */ + memset(pic->motion_val_buf[i]->data, 0, pic->motion_val_buf[i]->size); } } diff --git a/tests/ref/vsynth/vsynth1-h263-obmc b/tests/ref/vsynth/vsynth1-h263-obmc index b7a267a8cb..aed283ed53 100644 --- a/tests/ref/vsynth/vsynth1-h263-obmc +++ b/tests/ref/vsynth/vsynth1-h263-obmc @@ -1,4 +1,4 @@ 7dec64380f375e5118b66f3baaaa1e24 *tests/data/fate/vsynth1-h263-obmc.avi 657320 tests/data/fate/vsynth1-h263-obmc.avi -844f7ee27fa122e199fe20987b41a15c *tests/data/fate/vsynth1-h263-obmc.out.rawvideo -stddev: 8.16 PSNR: 29.89 MAXDIFF: 113 bytes: 7603200/ 7603200 +2a69f6b37378aa34418dfd04ec98c1c8 *tests/data/fate/vsynth1-h263-obmc.out.rawvideo +stddev: 8.38 PSNR: 29.66 MAXDIFF: 116 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-h263-obmc b/tests/ref/vsynth/vsynth2-h263-obmc index 2cef7f551b..c0dcc3239e 100644 --- a/tests/ref/vsynth/vsynth2-h263-obmc +++ b/tests/ref/vsynth/vsynth2-h263-obmc @@ -1,4 +1,4 @@ 2d8a58b295e03f94e6a41468b2d3909e *tests/data/fate/vsynth2-h263-obmc.avi 208522 tests/data/fate/vsynth2-h263-obmc.avi -4a939ef99fc759293f2e609bfcacd2a4 *tests/data/fate/vsynth2-h263-obmc.out.rawvideo -stddev: 6.10 PSNR: 32.41 MAXDIFF: 90 bytes: 7603200/ 7603200 +3500b4227c1e6309ca5213414599266f *tests/data/fate/vsynth2-h263-obmc.out.rawvideo +stddev: 6.19 PSNR: 32.29 MAXDIFF: 111 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-h263-obmc b/tests/ref/vsynth/vsynth_lena-h263-obmc index 5b963107f6..78d7cc7277 100644 --- a/tests/ref/vsynth/vsynth_lena-h263-obmc +++ b/tests/ref/vsynth/vsynth_lena-h263-obmc @@ -1,4 +1,4 @@ 3c6946f808412ac320be9e0c36051ea2 *tests/data/fate/vsynth_lena-h263-obmc.avi 154730 tests/data/fate/vsynth_lena-h263-obmc.avi -588d992d9d8096da8bdc5027268da914 *tests/data/fate/vsynth_lena-h263-obmc.out.rawvideo -stddev: 5.39 PSNR: 33.49 MAXDIFF: 82 bytes: 7603200/ 7603200 +737af7fb166e2260ba049ae6bc30673d *tests/data/fate/vsynth_lena-h263-obmc.out.rawvideo +stddev: 5.42 PSNR: 33.44 MAXDIFF: 77 bytes: 7603200/ 7603200