From patchwork Mon Jul 1 12:16:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 50249 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1739757vqv; Mon, 1 Jul 2024 05:18:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXbX62ZywvLMd7aeNe57twM9rv1ljcP4INlikt78xSlvLu8L56h4qJIA3bygJf3uzqzejvYt2JBK1wedCQx7m4zbU2oZ0DRp2uq2w== X-Google-Smtp-Source: AGHT+IE3l/qyT8IM5eDKLxVlZ90dmiQAZ11zD19XZ/eBQdM6uYbZPdDahHwmG3AK/ZIDao7rx1G2 X-Received: by 2002:a05:6402:35d2:b0:57c:671d:8455 with SMTP id 4fb4d7f45d1cf-5879f2b807fmr5471779a12.14.1719836286772; Mon, 01 Jul 2024 05:18:06 -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 a640c23a62f3a-a72ab07530csi360541466b.538.2024.07.01.05.18.06; Mon, 01 Jul 2024 05:18:06 -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=Tk4xI4cD; 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 28BB468D7D2; Mon, 1 Jul 2024 15:17:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2029.outbound.protection.outlook.com [40.92.50.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6EC7A68D785 for ; Mon, 1 Jul 2024 15:17:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YkwxEFV8rERGTcEWS1hTn6YrxH2ZgmDgBxgkTgs1u5DEjFUvsRowKQ5KV3Ujp3xGSC0u64y5TftsHR4pa4F/mYtH1zbpXX1anTNP3JB5WeWb9MUIB40KgTaiA/MJOJD+5pzBnusMoWpV1ezXV9V7jo72JTUvfrx7T1x+GRYebmMUl01zZ3JlVox+0e6bK+OqVfVQSwh68yy1EcFAdhNT55k2Y0iPZqFOPv4FH2tO+Gj9lp9zoTuvfwIhubR08d2QPcYNXXEyPksyeTNdceUA4dTxJY1vdFrN2OMuo3j3hfAA+IMgnrA2yzOs5cw/0jrbUl3YH5cNLzjpMBlyDSTPCQ== 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=mlvFGV8lewBnu+3LGn5WBSsbl64Foo9NK37AXtcxbr8=; b=YSz6boqEDNnjfr+834C+ApThLfH23X8wDnyRj0TY12Hp1f37gOZyLI5mDj/9TkXCzLqdJ+2h8EkPwVZJfaNrLpHCYprmWvQiZOZgxLqHYfA4mlVcQwtQQv2DW5F5ZhfRzTPFnfaCFSNVPpkprXd93Ylik/uioz9lCaZ/tzOdb2uQKb9udheXpBwMRg0vWVVlHIohg5HJbLz2kO03k0N23asPQX3a5CQCqMlZp1BolISLVbF0/pdcihlst2CKGiv9wgY/q0rjhtHN5UyO9j2YNAqkDOdC2ASeaE1VPtKw/EmHNMtW5I3lxia25CbGxzqUIogxkqzMqlDtg8OGL0sHOQ== 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=mlvFGV8lewBnu+3LGn5WBSsbl64Foo9NK37AXtcxbr8=; b=Tk4xI4cDiFyPV2psT7ZGACYQFI44mJ/nQINL7G+E0cYp7Hump75roDpcFiv8QG+Vcb1ZLmHVa8/cX0VTw4Nley08AnYvlHbEzWJJWtaILeJ0d6LDFcKHRBHKWIWPoTScXpNQlhWJNaE/MO8E4b730OblAVstdv+UWPo+tOjSSJRjEgHlvwthx4ULGmeVyvywaTv0/vQItQk2SlmKP7Yme1TnvC2uyDFuqEo9atyUr9nYTj5u2ovwqqMax8c0dSvIqw8SZHeaKnpqJY0OJHrLb0ppkjYCNVsup9YDzD1UjacUsW94yIKFmdUzP7eDUFhRkk6xmhuTi4JXsUtZR1nfBQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0481.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:349::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.32; Mon, 1 Jul 2024 12:17:27 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%5]) with mapi id 15.20.7719.029; Mon, 1 Jul 2024 12:17:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jul 2024 14:16:05 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [17A45VaqP/pxYeS56zLmr2d+4XSdvMkj7hGNAzql4Bw=] X-ClientProxiedBy: ZR0P278CA0149.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::11) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240701121610.3560848-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0481:EE_ X-MS-Office365-Filtering-Correlation-Id: 78a0bb76-1a40-40e1-0d5b-08dc99c7c59b X-Microsoft-Antispam: BCL:0; ARA:14566002|8060799006|461199028|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: imr9GJ4KLPdI705pH8iyJIWpBtLMSjOm23KcMqO7b0roco4JVUFk72SchaUgfu/XS2i/zbDKFHTqrDUTN/4NMu6YtxQT+UU66WQIoHPjFTf7zjMeQWHCOTHkIJbPuAQctuEOgLteHdvq5mDhryKZF2hhZyh5s1SW2Kk2ERUM/3iMDEaCZGD5/H7SXwtPDPDEAAAr3p8gL8D2AKuNzsgxAC0dqytU2QtPncdVBhg3l1g0hHxLvZNAh880Ew0D3mjIScbRfLAOkDgx8AiNqUdP80KGelv30F/HoWOCuSxbRrcx9QjnjNYKcNaa+DjlhvDOsBWWk0RwteNUDFbU1eZeuXFM1YJMVDz64/q3qADeV3X6AdSVoIhHXePYPi0PpoU7sZsJdBiRGxYOfi6IHEkDZhXrobDf6XC4xwnG1jHV76OEauqD/z+XJgPhmTOnpLQ8P98qsf5YRdB6xkI/bA6UeJ2t66jqKeqo706LF0pt+/39SVutooWvL1dc9GZh74tpEnkO7XM/hfuAeCCjLiIJNhR6H2+3p5pXYVXBe/8g2vKlR8HbSJaJZ4WyWW5rFE+9CVGDYdBMFA2JLRZRFRrJM5koS/zA72Q9WwdTtnTbjb0GLl16Q/tqsWNh8cLD5HKS8u2jio+jL6GAoaeMjgZtJA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jjEP0N3hNgYVLkYbLw36n0VHbQ/8nDAUV3A59vHJg6J+wS7DXJTT8qWPM6OS+lbIn2Yt94G29gKqwJzDAGK1eNF4L0MVhs6CxkOHXyoc7Guuhl91dF7K6e3FKTvw3Nz3I6amJ+Ubv3pzuxdtRkbM+fcoIfaaAJyG4Kgf1risZ3qXNUUiHNCi3/S2w21yw1BzKaBIsPCeLNZ1xUvvQlZfQGKaEENs3fMqt3S+WOo3LZ63YvfB5O+4xsFGP4rJ0inH3BCiu1yB5Cv4yHuPaSamW2AfKAS2v8BUZB+BOcfqD82MXwv8E4WJ0ZDx7gSsu87bau2+MfgVYviFgAYjCt/b6gjMkjj3SdT/bD6Wtnb2x/ZNK6jrVr1PiK/m7reAUTwEF4y/RzHXj+V/k8uTd2mcZoGx3QoiXabAji2CZny4EMUWHrXFQYeQwbQAfbgXGbSEurGPtvWGUoi8yz/ZaLrt6zcs3DcMrO4Lb2j7hQ5AMCKrAvHlSJb0Ou+YhU+waL584cIhdTcGI/eSlBA0aCvXEzgGSAeZwz02FOP7bjofpsSr0Wyluy4Dr8Acuzu/FmKltNAC/gTERnjpTTTzfka7ZTJyKTmM6Chxftxxl02Hr+up8M/f6iVRH8JDPfNOgyo9HIxOPUgmokDEYGXIlyCr/l4sarZaGCLfZIrQLEDKX5Ij3EKVo2wuiuEluQWIhXpMHwznsnxFUt8SVIkm4+d6I+K+9ddcCUR2i3ttBxQpQIjyv/UZmNhjuzcT5VVoWS6ZhquyAe0m3d+u/QRDAPr8Gzqqj64mVsNa07NfodFDkxIU/CZPXsQK35JJVpSRhmk3Cizqv0RZgDNm/xnBTMbOknohxGP9ut4H5wCOZMjdIHMtEsT5FqINVJ1b4sdTX5Sfd1Iuv63iGcQRkWIfyO/IATKwOxieorZbwTgqvp/nck80semwwbFQnVbwCM/FutAh5tavQQ25oyW4eF6YNtyKCMXHiNHkL3MMAnOnK6uMzrgqAOroJiN/aYPVHXcoewPZ3PqMJ5Z6a5jddkVWfJf0bK+gkhIMVVKCxWVX36AXM0TAAofKGDibcCjeR4Nr+EDHtuHfyLHgLUfdCqKBm5wduEtfetg4zbvblS+G9r+kP5zphgFDv4lpdeOx4SE8ZOXeV0Uc/vjKw3gpjzr2ytvA9EzhLJf8teuhoEZciSiPM0Q+21HfpgLCuxZD64FXCeVpS5PWTrUbs/WGSnqsbgD8s2OvSMlZx8EDTUS4y+vKnmbA3sXl0hYtTRk2jMS5yDPDdBJAHhSm4QtcjH0csoTBKg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78a0bb76-1a40-40e1-0d5b-08dc99c7c59b X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2024 12:17:27.4335 (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: DU0P250MB0481 Subject: [FFmpeg-devel] [PATCH 08/13] avcodec/mpegvideo_enc: Don't set qscale_table value prematurely 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: vct0c8t8CVTH When there are multiple candidates for macroblock type, the encoder tries them all. In order to do so, it copies the keeps several sets of states containing the variables that get modified when encoding the macroblock and in the end uses the best of these. Yet one variable was set, but not included in this state: The current macroblock's qscale value in the current picture's qscale_table. This may currently be set multiple times in mpv_reconstruct_mb(), yet it is read when adaptive_quant is true. Currently, the value read can be the value set by the last attempt to write the current macroblock and not the initial value. Fix this by only setting the qscale_table value in one place outside of mpv_reconstruct_mb() (where it does not belong at all). Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 8 ++----- tests/ref/seek/vsynth_lena-mpeg4-adap | 28 ++++++++++++------------- tests/ref/vsynth/vsynth1-mpeg4-adap | 8 +++---- tests/ref/vsynth/vsynth2-mpeg4-adap | 8 +++---- tests/ref/vsynth/vsynth3-mpeg4-adap | 8 +++---- tests/ref/vsynth/vsynth_lena-mpeg4-adap | 8 +++---- 6 files changed, 32 insertions(+), 36 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 99e31be463..48d26f37cd 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1105,10 +1105,6 @@ static inline void add_dequant_dct(MpegEncContext *s, */ static void mpv_reconstruct_mb(MpegEncContext *s, int16_t block[12][64]) { - const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; - - s->cur_pic.qscale_table[mb_xy] = s->qscale; - if (s->avctx->debug & FF_DEBUG_DCT_COEFF) { /* print DCT coefficients */ av_log(s->avctx, AV_LOG_DEBUG, "DCT coeffs of MB at %dx%d:\n", s->mb_x, s->mb_y); @@ -3365,8 +3361,6 @@ static int encode_thread(AVCodecContext *c, void *arg){ } } - s->cur_pic.qscale_table[xy] = best_s.qscale; - copy_context_after_encode(s, &best_s); pb_bits_count= put_bits_count(&s->pb); @@ -3521,6 +3515,8 @@ static int encode_thread(AVCodecContext *c, void *arg){ mpv_reconstruct_mb(s, s->block); } + s->cur_pic.qscale_table[xy] = s->qscale; + /* clean the MV table in IPS frames for direct mode in B-frames */ if(s->mb_intra /* && I,P,S_TYPE */){ s->p_mv_table[xy][0]=0; diff --git a/tests/ref/seek/vsynth_lena-mpeg4-adap b/tests/ref/seek/vsynth_lena-mpeg4-adap index fe841ef973..7777491651 100644 --- a/tests/ref/seek/vsynth_lena-mpeg4-adap +++ b/tests/ref/seek/vsynth_lena-mpeg4-adap @@ -2,45 +2,45 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 6855 ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 6855 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 161318 size: 19176 +ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 161352 size: 19191 ret: 0 st: 0 flags:0 ts: 0.800000 -ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 75056 size: 19178 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 75104 size: 19178 ret:-1 st: 0 flags:1 ts:-0.320000 ret:-1 st:-1 flags:0 ts: 2.576668 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 118696 size: 20018 +ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 118586 size: 20060 ret: 0 st: 0 flags:0 ts: 0.360000 -ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 35800 size: 17261 +ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 35840 size: 17261 ret:-1 st: 0 flags:1 ts:-0.760000 ret:-1 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 75056 size: 19178 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 75104 size: 19178 ret: 0 st: 0 flags:0 ts:-0.040000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 6855 ret: 0 st: 0 flags:1 ts: 2.840000 -ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 161318 size: 19176 +ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 161352 size: 19191 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 161318 size: 19176 +ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 161352 size: 19191 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 35800 size: 17261 +ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 35840 size: 17261 ret: 0 st: 0 flags:0 ts:-0.480000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 6855 ret: 0 st: 0 flags:1 ts: 2.400000 -ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 161318 size: 19176 +ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 161352 size: 19191 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 118696 size: 20018 +ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 118586 size: 20060 ret: 0 st:-1 flags:1 ts: 0.200839 ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 6855 ret: 0 st: 0 flags:0 ts:-0.920000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 6855 ret: 0 st: 0 flags:1 ts: 2.000000 -ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 161318 size: 19176 +ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 161352 size: 19191 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 75056 size: 19178 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 75104 size: 19178 ret:-1 st:-1 flags:1 ts:-0.222493 ret:-1 st: 0 flags:0 ts: 2.680000 ret: 0 st: 0 flags:1 ts: 1.560000 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 118696 size: 20018 +ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 118586 size: 20060 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 75056 size: 19178 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 75104 size: 19178 ret:-1 st:-1 flags:1 ts:-0.645825 diff --git a/tests/ref/vsynth/vsynth1-mpeg4-adap b/tests/ref/vsynth/vsynth1-mpeg4-adap index 67705f0f43..d3ad12e921 100644 --- a/tests/ref/vsynth/vsynth1-mpeg4-adap +++ b/tests/ref/vsynth/vsynth1-mpeg4-adap @@ -1,4 +1,4 @@ -0f1cbbdc3f9b91f2d9ac3d1fc2cf7d4e *tests/data/fate/vsynth1-mpeg4-adap.avi -325518 tests/data/fate/vsynth1-mpeg4-adap.avi -1e6c596f9f491fbf15920ef1bace7fb8 *tests/data/fate/vsynth1-mpeg4-adap.out.rawvideo -stddev: 14.12 PSNR: 25.13 MAXDIFF: 184 bytes: 7603200/ 7603200 +3b4fe7ad106cb112364d062b20ad80a8 *tests/data/fate/vsynth1-mpeg4-adap.avi +325594 tests/data/fate/vsynth1-mpeg4-adap.avi +96c5a7759413ab24afaa926abb3c5fe0 *tests/data/fate/vsynth1-mpeg4-adap.out.rawvideo +stddev: 14.11 PSNR: 25.13 MAXDIFF: 184 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-mpeg4-adap b/tests/ref/vsynth/vsynth2-mpeg4-adap index e058cd1ce3..140b17649c 100644 --- a/tests/ref/vsynth/vsynth2-mpeg4-adap +++ b/tests/ref/vsynth/vsynth2-mpeg4-adap @@ -1,4 +1,4 @@ -9465ef120d560537d8fcfb5564782e01 *tests/data/fate/vsynth2-mpeg4-adap.avi -203004 tests/data/fate/vsynth2-mpeg4-adap.avi -d7851ab1ca9744f8e618a24193e5ef76 *tests/data/fate/vsynth2-mpeg4-adap.out.rawvideo -stddev: 4.56 PSNR: 34.95 MAXDIFF: 84 bytes: 7603200/ 7603200 +21d205e0f42ce613481b202d52593225 *tests/data/fate/vsynth2-mpeg4-adap.avi +202870 tests/data/fate/vsynth2-mpeg4-adap.avi +1c45877fe27fb5fbfcdaff4a1da94de4 *tests/data/fate/vsynth2-mpeg4-adap.out.rawvideo +stddev: 4.55 PSNR: 34.95 MAXDIFF: 84 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth3-mpeg4-adap b/tests/ref/vsynth/vsynth3-mpeg4-adap index 6386f13466..70a25831d9 100644 --- a/tests/ref/vsynth/vsynth3-mpeg4-adap +++ b/tests/ref/vsynth/vsynth3-mpeg4-adap @@ -1,4 +1,4 @@ -6b2f641f2e68b11b992fd6ba1ed66a21 *tests/data/fate/vsynth3-mpeg4-adap.avi -41012 tests/data/fate/vsynth3-mpeg4-adap.avi -3483a2032cb02c3a37f5e43b128e59ed *tests/data/fate/vsynth3-mpeg4-adap.out.rawvideo -stddev: 5.79 PSNR: 32.87 MAXDIFF: 49 bytes: 86700/ 86700 +10512ee1a666ed95643557e1cf699363 *tests/data/fate/vsynth3-mpeg4-adap.avi +41100 tests/data/fate/vsynth3-mpeg4-adap.avi +9ba2c3cab3f08d2a345b849d0b30e3e1 *tests/data/fate/vsynth3-mpeg4-adap.out.rawvideo +stddev: 5.79 PSNR: 32.88 MAXDIFF: 49 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth_lena-mpeg4-adap b/tests/ref/vsynth/vsynth_lena-mpeg4-adap index 91edafe9b0..912b9b2efa 100644 --- a/tests/ref/vsynth/vsynth_lena-mpeg4-adap +++ b/tests/ref/vsynth/vsynth_lena-mpeg4-adap @@ -1,4 +1,4 @@ -633da125f46391eef33bb031cd728f4b *tests/data/fate/vsynth_lena-mpeg4-adap.avi -187598 tests/data/fate/vsynth_lena-mpeg4-adap.avi -21312bfcb28c40299fb27a5b03477f8c *tests/data/fate/vsynth_lena-mpeg4-adap.out.rawvideo -stddev: 3.63 PSNR: 36.92 MAXDIFF: 71 bytes: 7603200/ 7603200 +5af033cfe87bc2abf688b602e5a1a35c *tests/data/fate/vsynth_lena-mpeg4-adap.avi +187652 tests/data/fate/vsynth_lena-mpeg4-adap.avi +515efcfb456cf7b460f356fe0dc7c808 *tests/data/fate/vsynth_lena-mpeg4-adap.out.rawvideo +stddev: 3.63 PSNR: 36.93 MAXDIFF: 71 bytes: 7603200/ 7603200