From patchwork Mon Aug 15 11:49:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37282 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1224414pzi; Mon, 15 Aug 2022 04:49:52 -0700 (PDT) X-Google-Smtp-Source: AA6agR6pLqez4loT5CBUP7kHo8icxisl1kLOH4L7FfRxrc8k+jW/fLf1l4Nen/bDodtC4/+suKQR X-Received: by 2002:a17:907:3f85:b0:733:3f0e:2f28 with SMTP id hr5-20020a1709073f8500b007333f0e2f28mr10046176ejc.376.1660564192533; Mon, 15 Aug 2022 04:49:52 -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 hp25-20020a1709073e1900b0073309f33443si8112871ejc.636.2022.08.15.04.49.51; Mon, 15 Aug 2022 04:49:52 -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=Ic7iG0lQ; 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 BDF29680134; Mon, 15 Aug 2022 14:49:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068060.outbound.protection.outlook.com [40.92.68.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0F3568B7DB for ; Mon, 15 Aug 2022 14:49:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CDGGCmPyFVlqCRwy3nZX0IAuVyOUvuoOpY/fNWcoNS4IXyoiLW737tH2HYEOp0dq/lhScfIwrk29R3EjhM53Lo8hXkleuG0Pkhlm6omjV8/nMLVvGq+bN+a2rO5UkZwIShe+FtDjf8aTyMki8sZPcB0qXCnVuTFqNqbcgONBuNXCQrqhumvz0KpI3puZ6UBY7vk4VmwGqnYJ2vcGqqMQN1wEWePamPumxgwwUrS63PqD1i8WSlny1mgk0jWwq8RyJkKtcCTkOHv0O4oO1GTdStZl0GoyJsRAuzfDprfXr97LX3VtpPu4dSSetFoMGu712gnStemzwn23snTkEr46Mg== 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=UVh482OH8wV60jfxkfsBzk66D0qmR+G5Yo3l0MD0IZA=; b=aYo6boSpYElkoDG6yDCWdbcPxkjww7v0ci/N9vDpK+lGn8SWQ0TrwZixWAoKUU/JXhLc/lwoVmEIieVhmRJCBlMeeRSIjAZ+f/M1hFuhnTPwmA28SsIGnIAplDliBIj7FShnUlnkoTvbtRt8DY+ip8C2ex6FU1yhbQd5UIA6XZQSByYFOoib4qHgPOwK2N2LDg4tZFUk12hievnWaSVyuLsH6K61O7r1mvTtWo5SXZzQBLFJ2ZF5hLKMtF5vYK7S2gqwWP/BbvZEfSpB7hkOeKNEcC4a59wGSRDBTzKoWove38ncGSVPZyHii84lKyndR5RwHmwROQKD0wP91Gmmzw== 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=UVh482OH8wV60jfxkfsBzk66D0qmR+G5Yo3l0MD0IZA=; b=Ic7iG0lQynXtusk/OJSq3fpgEdCzn/gsVlWchAc0QWd7oSRywI2cRdxEjnpMN0hkAxf31Tw6y6etVS0qsHzi4DeVlH3BNxUxnbqy2eUJ/xKd4lzcyeY9lJRcrEuMihmgcCqNEMxA0TfjChlfhrsHuPh8aYUnFWBcETaQitRWtTACV68C0PuYF2xMeRwd5Wuj8btyx46xFplwDipMqVLXdZ7T6nLh7nxoT5HC3VAZkh8z8jCLHIW0FgRHmJIcyn4OyVYtbD1UkcDqylmQvq4WqqlV3hSFowosT4LmvLBGXsbjWleqPTl2cByVSDm3vlELPFWAv2Q1TFf2nGP/teG8HA== Received: from HE1PR0101MB2219.eurprd01.prod.exchangelabs.com (2603:10a6:3:2b::25) by PR3PR01MB7937.eurprd01.prod.exchangelabs.com (2603:10a6:102:170::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.10; Mon, 15 Aug 2022 11:49:39 +0000 Received: from HE1PR0101MB2219.eurprd01.prod.exchangelabs.com ([fe80::a552:4834:4a95:2c5e]) by HE1PR0101MB2219.eurprd01.prod.exchangelabs.com ([fe80::a552:4834:4a95:2c5e%6]) with mapi id 15.20.5504.028; Mon, 15 Aug 2022 11:49:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Aug 2022 13:49:24 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [fzs6zGds241vGwNDDY+VfwYTjadfZQIZ] X-ClientProxiedBy: ZR0P278CA0180.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::7) To HE1PR0101MB2219.eurprd01.prod.exchangelabs.com (2603:10a6:3:2b::25) X-Microsoft-Original-Message-ID: <20220815114930.2237233-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fc70ec22-73fe-4041-8132-08da7eb43b95 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXnrnTKVombr7KBDDtrDfGKnTEP5W+9LPj2RVdG0iL1M8zrye05DlHKKY32fHd7tvjI2Bxh4Wh3D7njN2/Phuv6cWcdRBZER2Oawe3aGgP5YKNexS3kUy2A/z5w5xCphHt7JvCwsZkrcTQ5uck19EYoAmOOVS3omhbIG3MRFCWLo4+v0dTX4fJTWabGLRWTiT0cfSgD99eukGnsS09KJCj+d0578lWX36apJeoFCM/o8lufWiku22peLh+bClT0ZVLlPtH5or5HlrJecKRkea5Z/vmkdrK2TeJjTEW0TD/juqVgLUIBqz6tKy90aPcK+WyBRJQm5rGTdleIC314mCg3ii3ERtFZEfiEVWfCDbD93npf9yoiQvhIjISnJuK9KLi/idlE7SEeOgsQbmYR2v+cUN76FrMOBAwS51PB3vXYrIWbnLSBj6YKtsnrQpa7do7WEHRILJUZOyT54/x5iMsbKD3ApDAQNnEnYVOfqrd+VXjNIY7skLy/1WM98laF/tA2kMI1uadyDcxAHrH2vL7vHxDAkjWIBVqR089mZsNr+pFdLqovMUc2qDudTxDxvTWUy0nWMHcHGwVYe5yrlixr7JOG60kCfzEj7HG5trgFzIdLOBhD38SacaSPv4VJiYf3fvdMVSXVsjdDUF+06bBjVnjjS/mO1LvqqBWeLzibyS8hqUhFNu24zu4wEaAgOCKdECjcz/UaDExjI6v91UMoNuXYF651I4M= X-MS-TrafficTypeDiagnostic: PR3PR01MB7937:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a+C81TLdSalELK5nZBAlM8uU+VlcBN0QyxINYQbrsfo9DXL/cEBZyRs2UUUvn8Y0UFppTHxGBcKSoQG4y3MEKByLfP6Drt2Vz27HT9K8A6CxcP7msyymo+dqzv9P5envmhWROY3GRmG20pvdcyDoiPji46kqtsDOzsWyB7RmxzJ53dty/8oyn3YMya6etycjW7C45696BL6/Rx59NtoKEpy9sOwaHrnyq2HmlqIaUnKV4ddvZneWmpNWRKoaimsPvrPMGg9/QRaJx+ofjMkTE9JEDK0n3C/IL7Y7v16V8uZdDk+V6VNzeX6K2LDTZ7fXOrjD/7mi+R45g3XAMOVpZni+wsy2k/I5V05CJL/tWTEj5ug06YUeK5W3yqrisJEg9HnfsPkGXzPe8lttq90AKhO88LIVubtt4TKSNr9jpUT+GFv6mY3Yv2SSbsG+ufjNLKGjvDepmHvxT7UeyhqIe+Jxpb6ADNiEATESVsFVC64Vft8hpSnoVXNIOHC3InJNEApm2qScQG1YDGzeG/7pAkid5qud4BAkBy5PrWT6w0JPGolc0ijDiseXm9qwgN3EV8GrDJ9PbSmZ/zSokq0KbavIe2YgB4RFhN0fZHiCPLtTfSQ8rPbEVKc8kfAzBy5B2lHLJTuBC8a8p5/qtqfSyw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gAY3s7ht0r1jFhhbUBdM/a1FYxXdBkQM05dvgj8Komr557Yk3A9G135V4hkYA5K/0DSKzHUaHaqGwAU+EsorDcySDtKqkBnccmYDvxCOGkCkvSKFxj/ehaTj7wmrxRTgPr2RF5mCX60d9xnu36osiOH6KoO+ASM5G8Lnj7UMoI3nyhGmELqswVfaCLOG4IMFFTgVhUQWN/2LRs3EzvzPttDAmkGONJe7vjct0f4YzIY8nL38zi8JWoXdGp0gvePeZlTYoMg15/j2OwSV3IZoFltXvFWzfxNQ5o8GDiMjDJbYEbdZeEXZlV3dbKVruLlaWKIvyALzOixJQ6Z5PbTMRXqIqmE42tO8+iaF78YVd+67nM+KvgA0VZmzkzCVnmI4x5Usy0hT3nGcC7hHp88NsFO8aaVkZpCt4nXWRRpELFFrYpr/RjtnbVn5+PgE09kHha99jlvgu76+mVIc6mjlXG5vSg8ol3KgEPSo2ReSiABAF8fCw09uHF2hQsXOOstFp5JVzz0EEUF3jNl5pL9Xc3nK5zDRTzz0O6JIu64j41nIW5bbN5GrZtEYsKHbyA8AE9b6Hcs4mYCytGZQisVIiT4wVtnx1t4oBsDigIRcNxmvWnc28ePMw2JeDorcdxgJh4oy4iBeqsRkhkPAjE08ySIPLFwQvehzyoz/1DwAXhefZFYBDVVq+O9sr3tzZd05qx3xR63VYjVtfMYJHSWcGZtiB9eZMRpgLAjvx1IAx0+NIc3oICZti/4kjTiLJlP0lh+jtQbWCfr5Q+SiakcPhmB6PcmwGBa7+/ipMRVhk2JJAsVjqy/jtRtFHWcyLEkLb39WzuQ5rriG1GPGSW28rW9tD0Scjhtt1wdev74d6u1xh95r3vZ2w/fhMzvZUg//3k4/4KIMHT3yTS9zy2rhukc5fUccSyZQmJbrBKX68iI5By3PaRV0OxBV37/4XDjJ3T6biAYQJFlMKbLCisBDiZxRu0j+gYes9UQ1fLXKPDDbrb66TxshobA1TySFxG9lOdZVPToe3wS7K5d1WfnRO13SGzsERjfDSEsi5kj7LlikMrmq6oJVRe25AMBcXaY0k1M8cdJ1uSZHDPuZSSBEybooOChqc+bsAYdsxYh2xSEzuReu9xiwoXW/puCP3lMD10DouuuOWfg5b7H5h9gXr3mAMhN3ZXJxtgygcezTm6nslIBszRSyHqydwF7a88MvNMtJtCzlIMKnuPZKOrm70ig1nSgJY/bbKdGv+y4ZkzWWg679c1xTYiDzln+lCe0Lc5xxFMXORMkQGK0fQMZ5heDUK5cvP1OLghi5oDN07DM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc70ec22-73fe-4041-8132-08da7eb43b95 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0101MB2219.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2022 11:49:38.9275 (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: PR3PR01MB7937 Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/h263dec: Remove redundant code to set cur_pic_ptr 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: sLiJQQvVeeaN It is done later in ff_mpv_frame_start() (and nobody uses current_picture_ptr between setting it in ff_mpv_frame_start()). (The reason the vsynth*-h263-obmc code changes is because the call to ff_find_unused_picture() now happens after the older pictures have been unreferenced in ff_mpv_frame_start(), so that their slots in the picture array can be immediately reused; the obmc code is somehow buggy and changes its output depending on the earlier contents of the motion_val buffer.) Signed-off-by: Andreas Rheinhardt --- I'd like to take this opportunity to once again ask anyone familiar with H.263 to take a look at this OBMC issue. libavcodec/h263dec.c | 7 ------- 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, 6 insertions(+), 13 deletions(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 8db0eccd89..a65f16caea 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -543,13 +543,6 @@ retry: return ret; } - if (!s->current_picture_ptr || s->current_picture_ptr->f->data[0]) { - int i = ff_find_unused_picture(s->avctx, s->picture, 0); - if (i < 0) - return i; - s->current_picture_ptr = &s->picture[i]; - } - avctx->has_b_frames = !s->low_delay; if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) { diff --git a/tests/ref/vsynth/vsynth1-h263-obmc b/tests/ref/vsynth/vsynth1-h263-obmc index b7a267a8cb..a9d0b166cf 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 +f5048b5f0c98833a1d11f8034fb1827f *tests/data/fate/vsynth1-h263-obmc.out.rawvideo +stddev: 8.12 PSNR: 29.93 MAXDIFF: 113 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-h263-obmc b/tests/ref/vsynth/vsynth2-h263-obmc index 2cef7f551b..2275b6e446 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 +20c4dda7bc5b4da28611a8c731cfa1c5 *tests/data/fate/vsynth2-h263-obmc.out.rawvideo +stddev: 6.08 PSNR: 32.44 MAXDIFF: 81 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-h263-obmc b/tests/ref/vsynth/vsynth_lena-h263-obmc index 5b963107f6..a18ef8e9e3 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 +acc9705f4c9a019c2032a875a6a715ae *tests/data/fate/vsynth_lena-h263-obmc.out.rawvideo +stddev: 5.39 PSNR: 33.50 MAXDIFF: 77 bytes: 7603200/ 7603200