From patchwork Thu Sep 5 01:54:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Osamu Watanabe X-Patchwork-Id: 51352 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:f31:b0:48e:c0f8:d0de with SMTP id kb17csp103746vqb; Wed, 4 Sep 2024 18:54:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUgD1iW6PitzJzQPaMsNeCKM7VPj2Or9CvFdrLmH5edRSXsy1JNZ7rzRZX6MVlgS2POMSKZ7hgMnpenLHFrgjrU@gmail.com X-Google-Smtp-Source: AGHT+IGrAtBspevKvK+oPHeAPf7MvVLO996+AQErVJu6MaFQrf2mTZLyENZDP2y1hDDvhaZxWG6a X-Received: by 2002:a17:907:3e92:b0:a80:a37f:c303 with SMTP id a640c23a62f3a-a89a357825bmr702297866b.4.1725501299338; Wed, 04 Sep 2024 18:54:59 -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-a8a62469dc0si69526266b.1053.2024.09.04.18.54.58; Wed, 04 Sep 2024 18:54:59 -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=@takushoku.onmicrosoft.com header.s=selector2-takushoku-onmicrosoft-com header.b=Cb5Ykv2M; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 51C7A68DCA9; Thu, 5 Sep 2024 04:54:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazon11020073.outbound.protection.outlook.com [52.101.229.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B3A3E68DC13 for ; Thu, 5 Sep 2024 04:54:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=X5v4zx/4CbmkQO5WQZz0KbtApifOy4XdIRnSiAW1tQG7Ct8tZr2zduKgK6OmHba4Gsz3HLdyDaj8d4nMQpI/aXhxO5jOHxAqfN1JkOE4Pjm9izYerufROXKqkS/zb8/nFXrAjUh2FcXhmyYYH8Y+ocoi5swolRJPx6uqPWwFk0/tDFTjCPbjCCDkxi/NszmAr/TJdadKN3i3eWPF9lu4jqtZ4hJZ55JcLvt8F2Ai0OGCFFy3hvDHcZL78auaDuKdqt9Pz/HQ/i7Eed+PUFBlhZk6Mc7HEx56aZ1ywCmzLaBuUF9nQ0Pwa06+pmHFmy58+TizusrJN4fgpDTmKQywWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=ILsyuVhyqNtoBWUzJedQwUFGoAQ0U0D6pjRmPCuNBZk=; b=dK+Evic1t5KOjQswhQTsDo8n4eNXp4itwdDE+I3UonjNXmwrRKEqUWE/CfC9cemoA2yzeOVLITocXQ5BZp1e10Mbw4MvGgyQ+Y1PzAjSpeMfPuqT4pos9t4xOkmAUaeTEW63kNpqkSLcIFcMeJkO0v+V5S6zu21Pcuq7S85mO6tJUWuNDwlGzyWvymwvbp9j6rQ2sOC7nvU0/okncPMGHpnttXjJXA7ERRlyKq7CP02ucp7Hsg06nTkrAGRooijpvfvSZsrZSDdhx60CnlNr4IQvmEI1l5pkImONl/I2BAisrzjhXERLOIXfJ4UsS47Hos9v8/FQIFAoRLTmAj56yA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=es.takushoku-u.ac.jp; dmarc=pass action=none header.from=es.takushoku-u.ac.jp; dkim=pass header.d=es.takushoku-u.ac.jp; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=takushoku.onmicrosoft.com; s=selector2-takushoku-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ILsyuVhyqNtoBWUzJedQwUFGoAQ0U0D6pjRmPCuNBZk=; b=Cb5Ykv2MqDHVR88zCilHZTd429E7oBEoadMhEZ4GSBkS+Tmr+BoKpcziewV50N96EjN9voh2dE/PJnXCGOl5/mMXPvRFrbNKERjtZszq9E81GTMLBT8uz+FHAqz2ofIfDhLgXAa1siLBXPjrqUVQwc3lNFBn3YoRkFbSKgi5V5w= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=es.takushoku-u.ac.jp; Received: from OS0PR01MB6001.jpnprd01.prod.outlook.com (2603:1096:604:b7::12) by TYRPR01MB12319.jpnprd01.prod.outlook.com (2603:1096:405:100::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.27; Thu, 5 Sep 2024 01:54:41 +0000 Received: from OS0PR01MB6001.jpnprd01.prod.outlook.com ([fe80::181c:c1f4:9b58:f6cc]) by OS0PR01MB6001.jpnprd01.prod.outlook.com ([fe80::181c:c1f4:9b58:f6cc%3]) with mapi id 15.20.7918.024; Thu, 5 Sep 2024 01:54:41 +0000 From: Osamu Watanabe To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Sep 2024 10:54:35 +0900 Message-ID: <20240905015436.78024-1-owatanab@es.takushoku-u.ac.jp> X-Mailer: git-send-email 2.43.0 X-ClientProxiedBy: TYCP301CA0042.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:380::10) To OS0PR01MB6001.jpnprd01.prod.outlook.com (2603:1096:604:b7::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS0PR01MB6001:EE_|TYRPR01MB12319:EE_ X-MS-Office365-Filtering-Correlation-Id: cddfb74f-262f-4b9e-3a47-08dccd4db497 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|52116014|366016|41320700013|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 05Ji43xR708jhLsYoKsiJYHkZO0hNN1iAuuNzbVkG5iWA9grvErgD8nsQMpD36jdwpjHj2D7X3Y6aN4JHlj4JmEQkLTzK2aXB8MuZpexOkQ4UpUBZ3Zqx+WVIwVuV4/XkPX+pxyXp8NmcCNMdm0AnG+9eHhq+v/yLgtWA3sJ5RKnN3hruUc4YZKeICFeVThJZ/QG5p432pRKlee8h1RalYYZsiNYZZWXpbv9yD/CJbkx9g0vNQixtcfonqaYnZJIGmReVReYVp/6M8QL5h75o/QCr+l4IS+C7Ee/dd0y+NEy0pXw5JoP0zbehZaplFx8ZwUdnsNBTRERGAPXpkQPWzRhBXsSFy/knzfTakUL8PH+tHgxSvMvnWo6FGWPFPrasQFAOe4Dl1NyKCNqS6UNY+/DY+UO5Jqv8BaZArOwF52/B9yxyi1SHkG54mBbQ326tGT+kSF6aeHyx/aME2dYxF0BmtQ4RvLgIh3xP6Z++Ya+mEg+yiYk3bjbv/OsB+WQEEQx2GF3hN17HuTf/BPu4w0hPwdG9Y7o/0IuNBSap309XsFnFBHCGL6qBIy5iqhTqvFkAQFC6GIHin+HEZbtjWHav2hJfdfCyxzW1Hy5GpgZEpEg+bP4JIU4NwKPnCn4rkfCQsqN/5F0YSAx4izsmKs17sFB3zQtJCIoNEEXeRfrJ3ES/H7yd9vNxbYvgWKlFOPfMwv44TRX0Cb5kVY77x6kTPsjMTGxnWaPA3un1qU41vneh3GJJMe3GavnAwxJqHRl1lSxjyJKxpt44/yBpQGoeRSHvP/J3nQjQag4N14LqKw1bC2NaAoB9QnhtK8FGQhKRoKM97jj/5dNd1Tjnf6dtlFcNuI4Tj8LdM9QYUFm8bt04Swxz56ik35fJKtjFSxDmnThkWRyKUu9m38pNDSSdNfzytQsKK1U2+2PHW/z4E/LD0oQyEcrJ0PyZ18d1fkP9jpRodMpkHW+FTKrw0fO14dunslu8CfHtiMuP2TbyvVPkiVgaMmNt4PAF3hBZLIme25u/cjiyBYcDlNUjx0ixIvJceZBYya/LbtGMYRhHHRf4CVdtOmhM7GPQNKxBN9A8LmrgEpqCdU1gyVI6I5PTj58jMkSkR/rODDRTN60KvYQ5aJQmhRehFkwzi8c2AF5z32Vqt0IluCFNJG9lqTYQDPEE7Z5BTUYTlM70I0lKrp+rrJ7+omOxV8wkbjUsvVbUWqKL4COOZ3KiKN3vO/a0cpfT2PY/JYQ1i6Wt9UAQTDqX45wKyOdE1hguREXcJAaLc2om3ej8mL4L4Hl2o8H6mbVQjqM+Wjfzwd8365M35oIJcTgb2vPh3BMqTLnbO6oQniz3xYud6p0E8I+iDghjVgIbETiAtTPX4970tA= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS0PR01MB6001.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(52116014)(366016)(41320700013)(1800799024)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: E5VeRvEFvmn8ZhFp/wb1D1gk1o1Qi0M5L3Z/ZNaMQMDcUE/UdTKtZXQTUt+7BvPauOBZrLX4eQiIjrU0JLbolkmBS5485/maS2EPmA1zwDw4BFN4QTbFfotiaPfWiGyVZfSttd6iW5KTUSuxgMPiDIX3vQvWyt74faPgP6f+Q+0pXrNsqa20xDT4QCX2WuT1Mz3r2B/2LrBzMcuvZgHlIvfDgHBfJcPjnzUwQ/vtXc2csU8CKL3hltgLOZAkZETq2nBkcrv4LS3LLDZU2czljZAGoinQxiO9BL8kZ1lHrKuk0rflqAvlg9xuZ8G3SD2eoFmgmjB3SFvdMfl9g0uvbMZ/6YdwylItj+2GALnemjiRYno/4DDdaWYPUg8o7LiJN7oHFAgk71smqrciFU9mtJbFPB4an2VP4bNVI49xak2NhSPm8NUTZ6xlJLhy+itftAUvjXHHWs9o0evBPo4nKTMAnm/EuspCo+6bUwqplHp0Gi9PWc4fst1qpIQftFRmbj+kChvqNP0h7GhFhSfCsrUnOVl3L7cAUhAqRzi2fOpXIBAY4tYgNNl5xCK7S1JHku15tX+y+5zw8jyn3ZizADw9eQLvsQmF+gtcRSG4CE0B9sLFHVVxlYZ8nfZ4WLTqyyrtBIaZkRV3Vd6oX/kU5RNtVpe52XEbDiVdy5IcdXWJzcr7h/0KqEFvTnkMYcvPY3dXohGKnhjbSlC4Lp6QVymIJtzs/TxYOAPAXMoZjIb9tgZhrDeKRAhh3zShqUcTX2DM8kL25Ni42VanBD2yiENOzzrNEiakkjJt5+BjGT0/ylv006+C1eRTGRxNpc/L6tznc9HqdmX7lu1K2/QMKgIyB6vItBWgBfOhdF9jGmdP75T/fYuL8SNZU37KMaky3tqyDQbTdtgDH3o7cPolhVjBHoKatDGV/Wd9+YhpeKl50ehfqH5+/kXS5AJYqA7Rn0BwvRaR/GbTRfo3axsO2kZrvTLgLLMGEz5I+IRu3auOQmovnTogTrE8Blb6dmtYMW6F0w7ff3D20o2xHt+Q2YVDXrkgcYqDtVHSbp5p/ESvm4pUI0oQ+ySijmWgf/F5qX92GT7ai0FDlyTHlSp8PcupCWa70aeIAxEj7n3Dw/Bk8g7wQerRGYqdj6RLYIaTCfGhtUXi1G7LdDjBFx0em82Xcj1EPHGzoK8CQLCk5MAAlSVr5Nyh7lU9/IdGiYlL6mRx1JGZqRIq8K6Uq7M6brUAtOd1BnnZVFzOBjTGyzgCa9TNbvec1ckn6w42JI+FVUx2X5jeTvWbWhqi/AcpjZrgHPu/6V9w6UyXAaDHT+ViAZrlgPhfyOoasYspGrKkhRGZn7y99OaVqXzwsbpabyYcots38bWRxz40US2517/aMY6TKdTnqOqHlN8OpBOpRIFHnP2j8jyS8g6fM3u+e6i2rz+5zaILzSOBFMJCTO241/3+Xax4hG21ZhmEIdnOyv+7leV5CU9QG8oM57Q9vlGqsa8s02THBF0YzSTsbL2puu84FBSy5tREBhCWc0rDzNBpwwIpR5BCbQEhhWJ3cEVDMX83p5qQws0sVtL8K6qgy/Oh4q5c0XMcjSbouYEm0P0g6d5ppZHdT4OMOGSDxw== X-OriginatorOrg: es.takushoku-u.ac.jp X-MS-Exchange-CrossTenant-Network-Message-Id: cddfb74f-262f-4b9e-3a47-08dccd4db497 X-MS-Exchange-CrossTenant-AuthSource: OS0PR01MB6001.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2024 01:54:41.7037 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 853333e5-13b1-4738-ae04-bfb589cf2665 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +8Ii7cutdEsFoBss6bet3quH4vQbLuOLpMs80YMk8cO4tSrCxQseQLYe/1ucQnzEHfaeAkEeiU3oPJA6Z9+FtlUbDbwlVZ8dgeHfSeFrno8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYRPR01MB12319 Subject: [FFmpeg-devel] [PATCH v3 1/2] avcodec/jpeg2000dec: Fix FF_DWT97_INT to pass the conformance testing defined in ISO/IEC 15444-4. 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: Osamu Watanabe , pal@sandflow.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: S50cdYNX82JM This commit fixes the problem described below on the integer version of the inverse DWT processing (FF_DWT97_INT, https://trac.ffmpeg.org/ticket/10123), which is activated with `-flags +bitexact`. - Problem - The tests for the following codestreams were failed with `-flags +bitexact`. - p0_04.j2k, p0_05.j2k, p0_09.j2k, p1_02.j2k, p1_03.j2k, p1_06.j2k. - ds0_ht_04_b11.j2k, ds0_ht_04_b12.j2k, ds0_ht_05_b11.j2k, ds0_ht_05_b12.j2k, ds0_ht_09_b11.j2k, ds1_ht_02_b11.j2k, ds1_ht_02_b12.j2k, ds1_ht_03_b11.j2k, ds1_ht_03_b12.j2k, ds1_ht_06_b11.j2k. Signed-off-by: Osamu Watanabe --- libavcodec/j2kenc.c | 9 +++++++-- libavcodec/jpeg2000.c | 7 +++---- libavcodec/jpeg2000dec.c | 4 +++- libavcodec/jpeg2000dwt.c | 38 +++++++++++++++++++++++++------------- 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 91e66d8104..ecd9f42401 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1384,7 +1384,9 @@ static void truncpasses(Jpeg2000EncoderContext *s, Jpeg2000Tile *tile) Jpeg2000Band *band = reslevel->band + bandno; Jpeg2000Prec *prec = band->prec + precno; - int64_t dwt_norm = dwt_norms[codsty->transform == FF_DWT53][bandpos][lev] * (int64_t)band->i_stepsize >> 15; + // Shifting down to 1 bit above from the bi/nary point. + // This is mandatory for FF_DWT97_INT to maintain its precision. + int64_t dwt_norm = dwt_norms[codsty->transform == FF_DWT53][bandpos][lev] * (int64_t)band->i_stepsize >> 14; int64_t lambda_prime = av_rescale(s->lambda, 1 << WMSEDEC_SHIFT, dwt_norm * dwt_norm); for (cblkno = 0; cblkno < prec->nb_codeblocks_height * prec->nb_codeblocks_width; cblkno++){ Jpeg2000Cblk *cblk = prec->cblk + cblkno; @@ -1457,7 +1459,10 @@ static int encode_tile(Jpeg2000EncoderContext *s, Jpeg2000Tile *tile, int tileno int *ptr = t1.data + (y-yy0)*t1.stride; for (x = xx0; x < xx1; x++){ *ptr = (comp->i_data[(comp->coord[0][1] - comp->coord[0][0]) * y + x]); - *ptr = (int64_t)*ptr * (int64_t)(16384 * 65536 / band->i_stepsize) >> 15 - NMSEDEC_FRACBITS; + + // Shifting down to 1 bit above from the bi/nary point. + // This is mandatory for FF_DWT97_INT to maintain its precision. + *ptr = (int64_t)*ptr * (int64_t)(16384 * 65536 / band->i_stepsize) >> 14 - NMSEDEC_FRACBITS; ptr++; } } diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index d6ffb02319..2d093e4705 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -260,9 +260,8 @@ static void init_band_stepsize(AVCodecContext *avctx, band->f_stepsize *= F_LFTG_X * F_LFTG_X * 4; break; } - if (codsty->transform == FF_DWT97) { - band->f_stepsize *= pow(F_LFTG_K, 2*(codsty->nreslevels2decode - reslevelno) + lband - 2); - } + // scaling + band->f_stepsize *= pow(F_LFTG_K, 2*(codsty->nreslevels2decode - reslevelno) + lband - 2); } if (band->f_stepsize > (INT_MAX >> 15)) { @@ -270,7 +269,7 @@ static void init_band_stepsize(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "stepsize out of range\n"); } - band->i_stepsize = band->f_stepsize * (1 << 15); + band->i_stepsize = lrint(band->f_stepsize * (1 << 15) + 0.5f); /* FIXME: In OpenJPEG code stepsize = stepsize * 0.5. Why? * If not set output of entropic decoder is not correct. */ diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 2e09b279dc..6af8c764d0 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2136,7 +2136,9 @@ static void dequantization_int_97(int x, int y, Jpeg2000Cblk *cblk, int32_t *datap = &comp->i_data[(comp->coord[0][1] - comp->coord[0][0]) * (y + j) + x]; int *src = t1->data + j*t1->stride; for (i = 0; i < w; ++i) - datap[i] = (src[i] * (int64_t)band->i_stepsize + (1<<15)) >> 16; + // Shifting down to 1 bit above from the binary point. + // This is mandatory for FF_DWT97_INT to pass the conformance testing. + datap[i] = (int32_t)(src[i] * (int64_t)band->i_stepsize + (1 << 14)) >> 15; } } diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c index 34e33553f7..6994809ac0 100644 --- a/libavcodec/jpeg2000dwt.c +++ b/libavcodec/jpeg2000dwt.c @@ -39,7 +39,7 @@ /* Lifting parameters in integer format. * Computed as param = (float param) * (1 << 16) */ -#define I_LFTG_ALPHA 103949ll +#define I_LFTG_ALPHA 38413ll // = 103949 - 65536, (= 1.586 - 1.0) #define I_LFTG_BETA 3472ll #define I_LFTG_GAMMA 57862ll #define I_LFTG_DELTA 29066ll @@ -234,8 +234,11 @@ static void sd_1d97_int(int *p, int i0, int i1) extend97_int(p, i0, i1); i0++; i1++; - for (i = (i0>>1) - 2; i < (i1>>1) + 1; i++) - p[2 * i + 1] -= (I_LFTG_ALPHA * (p[2 * i] + p[2 * i + 2]) + (1 << 15)) >> 16; + for (i = (i0>>1) - 2; i < (i1>>1) + 1; i++) { + int64_t sum = p[2 * i] + p[2 * i + 2]; + p[2 * i + 1] -= sum; + p[2 * i + 1] -= (I_LFTG_ALPHA * sum + (1 << 15)) >> 16; + } for (i = (i0>>1) - 1; i < (i1>>1) + 1; i++) p[2 * i] -= (I_LFTG_BETA * (p[2 * i - 1] + p[2 * i + 1]) + (1 << 15)) >> 16; for (i = (i0>>1) - 1; i < (i1>>1); i++) @@ -276,7 +279,7 @@ static void dwt_encode97_int(DWTContext *s, int *t) // copy back and deinterleave for (i = mv; i < lv; i+=2, j++) - t[w*j + lp] = ((l[i] * I_LFTG_X) + (1 << 15)) >> 16; + t[w*j + lp] = l[i]; // ((l[i] * I_LFTG_X) + (1 << 15)) >> 16; for (i = 1-mv; i < lv; i+=2, j++) t[w*j + lp] = l[i]; } @@ -293,7 +296,7 @@ static void dwt_encode97_int(DWTContext *s, int *t) // copy back and deinterleave for (i = mh; i < lh; i+=2, j++) - t[w*lp + j] = ((l[i] * I_LFTG_X) + (1 << 15)) >> 16; + t[w*lp + j] = l[i]; // ((l[i] * I_LFTG_X) + (1 << 15)) >> 16; for (i = 1-mh; i < lh; i+=2, j++) t[w*lp + j] = l[i]; } @@ -301,7 +304,10 @@ static void dwt_encode97_int(DWTContext *s, int *t) } for (i = 0; i < w * h; i++) - t[i] = (t[i] + ((1<>1)) >> I_PRESHIFT; + // Shifting down to the binary point. + // In FF_DWT97_INT, the binary point of the input coefficients is 1 bit above from the LSB. + // So, we need `>> (I_PRESHIFT + 1)` here. + t[i] = (t[i] + ((1<<(I_PRESHIFT + 1))>>1)) >> (I_PRESHIFT + 1); } static void sr_1d53(unsigned *p, int i0, int i1) @@ -471,8 +477,11 @@ static void sr_1d97_int(int32_t *p, int i0, int i1) for (i = (i0 >> 1); i < (i1 >> 1) + 1; i++) p[2 * i] += (I_LFTG_BETA * (p[2 * i - 1] + (int64_t)p[2 * i + 1]) + (1 << 15)) >> 16; /* step 6 */ - for (i = (i0 >> 1); i < (i1 >> 1); i++) - p[2 * i + 1] += (I_LFTG_ALPHA * (p[2 * i] + (int64_t)p[2 * i + 2]) + (1 << 15)) >> 16; + for (i = (i0 >> 1); i < (i1 >> 1); i++) { + int64_t sum = p[2 * i] + (int64_t) p[2 * i + 2]; + p[2 * i + 1] += sum; + p[2 * i + 1] += (I_LFTG_ALPHA * sum + (1 << 15)) >> 16; + } } static void dwt_decode97_int(DWTContext *s, int32_t *t) @@ -500,9 +509,9 @@ static void dwt_decode97_int(DWTContext *s, int32_t *t) l = line + mh; for (lp = 0; lp < lv; lp++) { int i, j = 0; - // rescale with interleaving + // interleaving for (i = mh; i < lh; i += 2, j++) - l[i] = ((data[w * lp + j] * I_LFTG_K) + (1 << 15)) >> 16; + l[i] = data[w * lp + j]; for (i = 1 - mh; i < lh; i += 2, j++) l[i] = data[w * lp + j]; @@ -516,9 +525,9 @@ static void dwt_decode97_int(DWTContext *s, int32_t *t) l = line + mv; for (lp = 0; lp < lh; lp++) { int i, j = 0; - // rescale with interleaving + // interleaving for (i = mv; i < lv; i += 2, j++) - l[i] = ((data[w * j + lp] * I_LFTG_K) + (1 << 15)) >> 16; + l[i] = data[w * j + lp]; for (i = 1 - mv; i < lv; i += 2, j++) l[i] = data[w * j + lp]; @@ -530,7 +539,10 @@ static void dwt_decode97_int(DWTContext *s, int32_t *t) } for (i = 0; i < w * h; i++) - data[i] = (data[i] + ((1LL<>1)) >> I_PRESHIFT; + // Shifting down to the binary point. + // In FF_DWT97_INT, the binary point of the input coefficients is 1 bit above from the LSB. + // So, we need `>> (I_PRESHIFT + 1)` here. + data[i] = (int32_t)(data[i] + ((1LL<<(I_PRESHIFT + 1))>>1)) >> (I_PRESHIFT + 1); } int ff_jpeg2000_dwt_init(DWTContext *s, int border[2][2], From patchwork Thu Sep 5 01:54:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Osamu Watanabe X-Patchwork-Id: 51353 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:f31:b0:48e:c0f8:d0de with SMTP id kb17csp107075vqb; Wed, 4 Sep 2024 19:04:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUrY5qgsSIJBjfJ8m0TGsjckMI6PMABWz1Ew9HrTZWX0dOaKLZ9rDTJJ2HBqHp5UkbwlRH7BFQG7lu4dd1IZg1L@gmail.com X-Google-Smtp-Source: AGHT+IHOGFdbpOjHuXM00lfM3t2qlpxKNSnskua4Qx2+NwN7xEc14xJq+UH/cN6LYvRYUkVDHLI2 X-Received: by 2002:a05:6512:b1a:b0:532:f06d:b12a with SMTP id 2adb3069b0e04-53546afcdabmr7728654e87.3.1725501850874; Wed, 04 Sep 2024 19:04: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 2adb3069b0e04-5356916d3f9si737364e87.386.2024.09.04.19.04.10; Wed, 04 Sep 2024 19:04: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=@takushoku.onmicrosoft.com header.s=selector2-takushoku-onmicrosoft-com header.b=q615dTAN; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A9E0E68DCEC; Thu, 5 Sep 2024 04:54:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazon11020073.outbound.protection.outlook.com [52.101.229.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 756D168DC4A for ; Thu, 5 Sep 2024 04:54:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tmhKAdoB39d84UH4TXlOmq0UbinBanwtAgcon3wN6YVmlSWujsNp8g7fR/WflwKlNHqQbd8IpJSqElBMQFxRW8qH2cTC6KWgAelt5WlVDFndMoScO7sXmUm67reXun+4hgyF6L/D9hbAk17F1blaNPeOUcjpbPAtVMbkMqSpIFO1EIMPcTyXy0Xqpe7rbXvtKC66n7MMwZwMMGZxSK1NJNUta+SpeUCO+IP8fxLDpUG+Ypu0oUQx0ji4Ju01c2uTvPUgy8swnfJku/6kPbuxoTkcpe8CRxQbuEnTAQza4OOaqGrNqFVKVm5QDmny5Wzc4j3cDCiZXHp7ecyZyL/LUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=JnCmmwGRl0Rfzve21tPSfni+I+d2CfHU4Sge4hECV9Q=; b=bQU5cOqlGFwEBWWeDzeHYrNXLu4fLorUekQ+R53ua7/9DljyjM3kV8ajcnWZXerwjXsIgnogAnsY/59Bq0CEO2S0igRIYq9+CsbmsvOxPOfRCfHLcV781GUzAM/cCPqeIlT6cEy/WorKOtbHJRrpAFXI+nxjg5Rfhk7/89Vr0aSCXhC1SFj24w2mDrjGo4WgHGIGDHy2/3XV+R1ubvq7s4srXMlvLpMoahROlj8o1ZM7Kr1rEyU5Z4khj3M7R2jDRxfMChC6gKy6iPlL0U8TTIDwjE3IW292IBOvKpsBYoiAE4Z5ygeqLRmaufrBnTVw6H3B1emDf29wiBJ50eUv3A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=es.takushoku-u.ac.jp; dmarc=pass action=none header.from=es.takushoku-u.ac.jp; dkim=pass header.d=es.takushoku-u.ac.jp; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=takushoku.onmicrosoft.com; s=selector2-takushoku-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JnCmmwGRl0Rfzve21tPSfni+I+d2CfHU4Sge4hECV9Q=; b=q615dTANXVs0de21oK4w/Gk5saqpEa4+jlWqFL/3gYks7WPjmwm4s5ts41G+sZHSVXVhqt8UWKxY3C1+a4pEnfcGv5xuXNGPTtjsn6gzduyLCJ3PRt2BDr2fSc6jvWRsUi0lN/YghIVGUR4zKwCbmgu2R4oWcNGC418uUrT1aAg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=es.takushoku-u.ac.jp; Received: from OS0PR01MB6001.jpnprd01.prod.outlook.com (2603:1096:604:b7::12) by TYRPR01MB12319.jpnprd01.prod.outlook.com (2603:1096:405:100::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.27; Thu, 5 Sep 2024 01:54:44 +0000 Received: from OS0PR01MB6001.jpnprd01.prod.outlook.com ([fe80::181c:c1f4:9b58:f6cc]) by OS0PR01MB6001.jpnprd01.prod.outlook.com ([fe80::181c:c1f4:9b58:f6cc%3]) with mapi id 15.20.7918.024; Thu, 5 Sep 2024 01:54:44 +0000 From: Osamu Watanabe To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Sep 2024 10:54:36 +0900 Message-ID: <20240905015436.78024-2-owatanab@es.takushoku-u.ac.jp> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240905015436.78024-1-owatanab@es.takushoku-u.ac.jp> References: <20240905015436.78024-1-owatanab@es.takushoku-u.ac.jp> X-ClientProxiedBy: TY2PR0101CA0024.apcprd01.prod.exchangelabs.com (2603:1096:404:92::36) To OS0PR01MB6001.jpnprd01.prod.outlook.com (2603:1096:604:b7::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS0PR01MB6001:EE_|TYRPR01MB12319:EE_ X-MS-Office365-Filtering-Correlation-Id: 25ae70fe-a9c3-49d0-d08e-08dccd4db672 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|52116014|366016|41320700013|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: TT1sPnqROEBsOGxrMCqilDwISyHkAP/0875S1LXN7J6pxDaMKRYzMM501lanC7sLXX7vztgaAUQEcMJit0kDdRp61Ov0lDRndW4BS9EYz/NzhVdeaDNamBFeAg5rsTZQczIj8wwFJTPYdPHebgdhtW8DGe9lwkikqaOzC0LrvzdjTeBVL50dfRLHnykHM0ey3KGBoabpOj9JpoypF45r/ZIEDYAHJXJeufrDvmZjoRk10etMiYpcP5dHhpra+ocr/OLb5hvE45kUAIYp875hpWuTH1RCCBg+27EAd8OESgdiQOxuMpriQ233w3403nb/ub4pnFIG4xL6NSKlN6hjRxxGk0DqiUQNZCQ7LLpYZtESDOUM0XaMz1ai5ac2XLKk1QiLVjn6XcK5bMmnyLU+jx3X9J+GWRRh+FO9vsQ1MsHoi3dvqM3HY+ouee3D3PmNz44Hvj54kUx3FeMnh2H/l6H6Ohs/EgBOJ5rcovGduqM2NHIIj5ZpQoHALQS9u9uGQRw9d6UMnTTYUoZ/XzEGE37zyQRpH0L26/lt4xQWZrCXXAz0fcHZnYuAjq1ki1WhRtL6Yp+6kGmLiMUeGeMqPmLWnwNOjEYET19zdgqYbtFgQvfO3ej3ViQanevxUFThDiHKX2FMC2Mna4dXqgILMu4LKVucadIExao0jOaz8ByBt2StxDppzirzDej5eVLQEWiF5h1Q7saLkmHX0YiTd5/U4Vhb8NoGxnL0XTNmLIlOorVrZ6k9Ah5TZ1q9BKrQAkkwOeaY9lA+xkMTG5t8np4XQWfHdgUFN3TSE8lQK2PPiXUpJAvkKSO75F7xTwQWUh6RM7PbIk5lMgldFWwihMCd8dQch4uxdQ9pWeH1ES0NDUCyi4Bngv5Ed9rXDB96r1PtrYJjtSFUkC+WeB4MY5guAohnPXptkVlohvDGKZ44IXD/2hY655Z+X6mpWAMR95yrcPt4T3Cv/tI8bGO2uxitTq+WQXOCGhJX2/aZkNr2PFXl3NBDGRv1267acLH07My4PoBk6LpjuOvwY0Nl1rs1E8sDIGciwB7i70jNLvMNCALeyLEDWxap5cLoRbFyNVOlp89AoYnqQ2c5uyRBVH6F761jyYemwasIBFd5UQW7smyDbFqj0WzIxRHkQmjAhuIoJp9ha9P5zfU/JQY2XhNsocOSYcl3Ny5Z46aySajEbEqfY/hCDfqe37p8VLkTvR/NM1PG1MCyVHW4sH31E4zzjlinX1b9tGM/IBtjTWLrcwxd0yzd7+XafuRLQeSQkrbiePzgeHpjWaVIhH/sVVRxasoKYCBxtl1i/fSNcKOEFKViq2S7H20dhIyXVtHxSjBmhHenngLtIrn/Ai7nOUC8EZBCfU3PiYya9C2xTuOY9hFr+gfaYRPXsQ8t2GWVitCjUKPmIDDcZyUhdbBHQg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS0PR01MB6001.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(52116014)(366016)(41320700013)(1800799024)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: U3l1zZ/cCwAdvXSmf7+TUQXEgokcDFHvqqYw5b6mDqRES4wqE4Sgfbn58YryTYVlN+HwfTUQObjm8Yofa8/2areIRDaatACeOlKY+GKoCWhI8M8GPdFwNfJKl2UDYqnXgp4E0lAwZ4galQjH0G/XRgs6WqXRLdb6aoU+qz31lKw7/MAGyFqCo6MlbZiQpultuqfd1EIAMHvl7kI74JmWneMiHbq5wueiHyeTfAIIgYaRv9DSimgVxtpyYrjtpHPnbDincYcdi2zCI385SX3Vzkzo53f5mBj+nLzruSPWxfUqPxI/g8Bm0V52IJeIMulZszBhEdU8mnnErHeK5lqTnOb1qhO+rgwwL7cwSX2AoQ5e7KDVcDy7FvDC8zW8LkTLdj0eNfS3E31dDYBNl5t48QLP8NYVFhraDmAA7xfj4RGvRF+H0voi+/JRQQ/OttWVs6C/B7uDbMZZAav14T7FBzpIulG5QuYIgqet1Mt8KAp2Bnka01kQu+/EFAHLf0FtkXYS+st1odlXIhFDa3kXcgIEf7RnITu4i+sAk65lat6IBpghjalaYktR6Nhck1MtSv0jfe5wgt2PCMjv4wq3G4F0q146lQjUTdLIAbnjVYWnm5rgsvh/O8MoZzA7SU4Tcz5Q+xyowkqcY+ViIvzAdvEHBTZojlh7q3GZjw214/9pfxQSWL1hfMyvKF6p0WOSDN7AQ30cG+TRaBZ3ksm7IzEGdlv7qgdXTeFeChDF08ndM1tLCZV5K4utaksGiiuaHvKa7Ho+Z/PwaXpoKnb7TtP74sP6lHbDqeiRqMB08miJzyZWzayYA4gxzu07up3cAMxdzwsBpihgYjWNj5PNVJNzp5xPWBoRIA652LcsQX3MmQN+o7/jbUODrlRZdzH7V6/DwHkdgmJ3Z4NS7Fevx2AKP4QXR0dgxp2NjJBrotCGA4DHElmbfJo/O4ma+6U+ZrKv3GnX6S/SosmEt2dlW061oL8nYoIXnrb00ND7ol4BzLNBbnGOv4iGBV9mqqz0izoliHb43HUuZspwv0Oihxz/RRQ5SPnrFgl2hRTKf6Im27okJSf2N7hoyPskZakRoDUtFIgf3HkeGgv4JdnedqpCmwHnLfH/gWJrjqEcDa+nwwMFlWhgXcF352l9rNjF+vpYyrMPhxQToiNuMMl2KhXeYOF/6NE1GvBwwms9Qwvo2wxXJTtzwsb5py9//8up6xUZ66UeeVrEJTkmRBTMrDI3cZ1XLK3AdG8Cr53p7mti1gOJ2gyZZixrSV+Gi4SYfPvj+3WfI/35siX3Fzb4+Ov9NIoFOwbED5yt57tNY0fpLkBFnNr4gwwx+wL9InNsGeZwMnrnbhPnu0bImLp4ZHJ3EGzZ2MnGao4wxXhqN1P9lkVdIL/V0ogbOcb8RVh6UyoynmJ6ug3TwEwdm/7/R0sQWNvYPN2BxMwjdaptg1DnnQxDL7mfpml/Kc+m9hA4r4mfb95L59GZdvSuo2N/xuzA4KdFyx8JYz3ik1fO6V0VckJcwyTsKNCVJ1uxuVtsfJhhb7YeBfXKhDilXT3iNcioijjldrRn8i5BPKwQzhTxvOzWYxOjRvAhFjye0RHPunPDSMdsBJpXJUULJsaDFQ== X-OriginatorOrg: es.takushoku-u.ac.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 25ae70fe-a9c3-49d0-d08e-08dccd4db672 X-MS-Exchange-CrossTenant-AuthSource: OS0PR01MB6001.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2024 01:54:44.7630 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 853333e5-13b1-4738-ae04-bfb589cf2665 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5AJ8NCu/9qGls4tJJHRuQquOaX0hxzYVUaNwO1ai6+ZmIhwrOCZi2JkePjoTLGW3sB7TzUOc+NnZRLp9PZZtK8eqSw7Cvf1hC4DmjXiLV7I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYRPR01MB12319 Subject: [FFmpeg-devel] [PATCH v3 2/2] avcodec/jpeg2000dec: Update to JPEG 2000 related FATE refs with the fix of FF_DWT97_INT (integer implementation of DWT 97) 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: Osamu Watanabe , pal@sandflow.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: mvjOb4DPSGuQ Signed-off-by: Osamu Watanabe --- tests/ref/fate/j2k-dwt | 59 ------------------- tests/ref/fate/jpeg2000-dcinema | 4 +- tests/ref/fate/jpeg2000dec-p0_04 | 2 +- tests/ref/fate/jpeg2000dec-p0_05 | 2 +- tests/ref/fate/jpeg2000dec-p0_09 | 2 +- tests/ref/vsynth/vsynth1-jpeg2000 | 8 +-- tests/ref/vsynth/vsynth1-jpeg2000-97 | 8 +-- tests/ref/vsynth/vsynth1-jpeg2000-gbrp12 | 8 +-- tests/ref/vsynth/vsynth1-jpeg2000-yuva444p16 | 6 +- tests/ref/vsynth/vsynth2-jpeg2000 | 8 +-- tests/ref/vsynth/vsynth2-jpeg2000-97 | 8 +-- tests/ref/vsynth/vsynth2-jpeg2000-gbrp12 | 8 +-- tests/ref/vsynth/vsynth2-jpeg2000-yuva444p16 | 8 +-- tests/ref/vsynth/vsynth3-jpeg2000 | 8 +-- tests/ref/vsynth/vsynth3-jpeg2000-97 | 8 +-- tests/ref/vsynth/vsynth3-jpeg2000-gbrp12 | 8 +-- tests/ref/vsynth/vsynth3-jpeg2000-yuva444p16 | 8 +-- tests/ref/vsynth/vsynth_lena-jpeg2000 | 8 +-- tests/ref/vsynth/vsynth_lena-jpeg2000-97 | 8 +-- tests/ref/vsynth/vsynth_lena-jpeg2000-gbrp12 | 8 +-- .../vsynth/vsynth_lena-jpeg2000-yuva444p16 | 8 +-- 21 files changed, 68 insertions(+), 127 deletions(-) diff --git a/tests/ref/fate/j2k-dwt b/tests/ref/fate/j2k-dwt index 42415f00f9..a2ffc9a050 100644 --- a/tests/ref/fate/j2k-dwt +++ b/tests/ref/fate/j2k-dwt @@ -1,60 +1 @@ 5/3i, decomp:15 border 151 170 140 183 milli-err2: 0 -9/7i, decomp:15 border 151 170 140 183 milli-err2: 544 -9/7f, decomp:15 border 151 170 140 183 err2: 0.000 -5/3i, decomp:21 border 173 201 81 189 milli-err2: 0 -9/7i, decomp:21 border 173 201 81 189 milli-err2: 592 -9/7f, decomp:21 border 173 201 81 189 err2: 0.000 -5/3i, decomp:22 border 213 227 76 245 milli-err2: 0 -9/7i, decomp:22 border 213 227 76 245 milli-err2: 533 -9/7f, decomp:22 border 213 227 76 245 err2: 0.000 -5/3i, decomp:13 border 134 157 184 203 milli-err2: 0 -9/7i, decomp:13 border 134 157 184 203 milli-err2: 535 -9/7f, decomp:13 border 134 157 184 203 err2: 0.000 -5/3i, decomp: 1 border 204 237 6 106 milli-err2: 0 -9/7i, decomp: 1 border 204 237 6 106 milli-err2: 219 -9/7f, decomp: 1 border 204 237 6 106 err2: 0.000 -5/3i, decomp:28 border 76 211 13 210 milli-err2: 0 -9/7i, decomp:28 border 76 211 13 210 milli-err2: 791 -9/7f, decomp:28 border 76 211 13 210 err2: 0.000 -5/3i, decomp:21 border 76 99 43 123 milli-err2: 0 -9/7i, decomp:21 border 76 99 43 123 milli-err2: 686 -9/7f, decomp:21 border 76 99 43 123 err2: 0.000 -5/3i, decomp:15 border 192 243 174 204 milli-err2: 0 -9/7i, decomp:15 border 192 243 174 204 milli-err2: 476 -9/7f, decomp:15 border 192 243 174 204 err2: 0.000 -5/3i, decomp:21 border 17 68 93 204 milli-err2: 0 -9/7i, decomp:21 border 17 68 93 204 milli-err2: 633 -9/7f, decomp:21 border 17 68 93 204 err2: 0.000 -5/3i, decomp:11 border 142 168 82 174 milli-err2: 0 -9/7i, decomp:11 border 142 168 82 174 milli-err2: 696 -9/7f, decomp:11 border 142 168 82 174 err2: 0.000 -5/3i, decomp:23 border 142 209 171 235 milli-err2: 0 -9/7i, decomp:23 border 142 209 171 235 milli-err2: 626 -9/7f, decomp:23 border 142 209 171 235 err2: 0.000 -5/3i, decomp:30 border 37 185 79 245 milli-err2: 0 -9/7i, decomp:30 border 37 185 79 245 milli-err2: 953 -9/7f, decomp:30 border 37 185 79 245 err2: 0.000 -5/3i, decomp: 5 border 129 236 30 243 milli-err2: 0 -9/7i, decomp: 5 border 129 236 30 243 milli-err2: 620 -9/7f, decomp: 5 border 129 236 30 243 err2: 0.000 -5/3i, decomp:10 border 5 160 146 247 milli-err2: 0 -9/7i, decomp:10 border 5 160 146 247 milli-err2: 797 -9/7f, decomp:10 border 5 160 146 247 err2: 0.000 -5/3i, decomp: 5 border 104 162 6 47 milli-err2: 0 -9/7i, decomp: 5 border 104 162 6 47 milli-err2: 603 -9/7f, decomp: 5 border 104 162 6 47 err2: 0.000 -5/3i, decomp:24 border 78 250 102 218 milli-err2: 0 -9/7i, decomp:24 border 78 250 102 218 milli-err2: 836 -9/7f, decomp:24 border 78 250 102 218 err2: 0.000 -5/3i, decomp:28 border 86 98 56 79 milli-err2: 0 -9/7i, decomp:28 border 86 98 56 79 milli-err2: 597 -9/7f, decomp:28 border 86 98 56 79 err2: 0.000 -5/3i, decomp: 6 border 95 238 197 214 milli-err2: 0 -9/7i, decomp: 6 border 95 238 197 214 milli-err2: 478 -9/7f, decomp: 6 border 95 238 197 214 err2: 0.000 -5/3i, decomp:17 border 77 169 93 165 milli-err2: 0 -9/7i, decomp:17 border 77 169 93 165 milli-err2: 616 -9/7f, decomp:17 border 77 169 93 165 err2: 0.000 -5/3i, decomp:22 border 178 187 7 119 milli-err2: 0 -9/7i, decomp:22 border 178 187 7 119 milli-err2: 392 -9/7f, decomp:22 border 178 187 7 119 err2: 0.000 diff --git a/tests/ref/fate/jpeg2000-dcinema b/tests/ref/fate/jpeg2000-dcinema index cdf8cd4fc6..217b8c8377 100644 --- a/tests/ref/fate/jpeg2000-dcinema +++ b/tests/ref/fate/jpeg2000-dcinema @@ -3,5 +3,5 @@ #codec_id 0: rawvideo #dimensions 0: 1920x1080 #sar 0: 1/1 -0, 0, 0, 1, 12441600, 0xfcf6a127 -0, 1, 1, 1, 12441600, 0x577b6a64 +0, 0, 0, 1, 12441600, 0x9c79568e +0, 1, 1, 1, 12441600, 0xd96342dd diff --git a/tests/ref/fate/jpeg2000dec-p0_04 b/tests/ref/fate/jpeg2000dec-p0_04 index 5de7880c44..c293084a50 100644 --- a/tests/ref/fate/jpeg2000dec-p0_04 +++ b/tests/ref/fate/jpeg2000dec-p0_04 @@ -3,4 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 640x480 #sar 0: 0/1 -0, 0, 0, 1, 921600, 0x097d9665 +0, 0, 0, 1, 921600, 0x8577ffee diff --git a/tests/ref/fate/jpeg2000dec-p0_05 b/tests/ref/fate/jpeg2000dec-p0_05 index bb215043a1..bd5cc4b77a 100644 --- a/tests/ref/fate/jpeg2000dec-p0_05 +++ b/tests/ref/fate/jpeg2000dec-p0_05 @@ -3,4 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 1024x1024 #sar 0: 0/1 -0, 0, 0, 1, 2621440, 0x081f5048 +0, 0, 0, 1, 2621440, 0x99604189 diff --git a/tests/ref/fate/jpeg2000dec-p0_09 b/tests/ref/fate/jpeg2000dec-p0_09 index 1755e7cc7d..ff78bf9dc7 100644 --- a/tests/ref/fate/jpeg2000dec-p0_09 +++ b/tests/ref/fate/jpeg2000dec-p0_09 @@ -3,4 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 17x37 #sar 0: 0/1 -0, 0, 0, 1, 629, 0x5c9c389d +0, 0, 0, 1, 629, 0xf35d38d6 diff --git a/tests/ref/vsynth/vsynth1-jpeg2000 b/tests/ref/vsynth/vsynth1-jpeg2000 index f8e987f95d..c2fe3ede5a 100644 --- a/tests/ref/vsynth/vsynth1-jpeg2000 +++ b/tests/ref/vsynth/vsynth1-jpeg2000 @@ -1,4 +1,4 @@ -95add005faf68fcf8f16e86eab079ca2 *tests/data/fate/vsynth1-jpeg2000.avi -2263192 tests/data/fate/vsynth1-jpeg2000.avi -b7f48a8965f78011c76483277befc6fc *tests/data/fate/vsynth1-jpeg2000.out.rawvideo -stddev: 5.35 PSNR: 33.56 MAXDIFF: 59 bytes: 7603200/ 7603200 +514973056c24fc53a4eead9d1cf7537e *tests/data/fate/vsynth1-jpeg2000.avi +3820386 tests/data/fate/vsynth1-jpeg2000.avi +5939054d547f22904e89f477e9578ab8 *tests/data/fate/vsynth1-jpeg2000.out.rawvideo +stddev: 4.01 PSNR: 36.06 MAXDIFF: 53 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-jpeg2000-97 b/tests/ref/vsynth/vsynth1-jpeg2000-97 index c979ab5c36..d84a4217c8 100644 --- a/tests/ref/vsynth/vsynth1-jpeg2000-97 +++ b/tests/ref/vsynth/vsynth1-jpeg2000-97 @@ -1,4 +1,4 @@ -5e6d32b7205d31245b0d1f015d08b515 *tests/data/fate/vsynth1-jpeg2000-97.avi -3643886 tests/data/fate/vsynth1-jpeg2000-97.avi -a2262f1da2f49bc196b780a6b47ec4e8 *tests/data/fate/vsynth1-jpeg2000-97.out.rawvideo -stddev: 4.23 PSNR: 35.59 MAXDIFF: 53 bytes: 7603200/ 7603200 +cb5545dd44b437d781c74d4b0fc81885 *tests/data/fate/vsynth1-jpeg2000-97.avi +5825626 tests/data/fate/vsynth1-jpeg2000-97.avi +16aa9effa47c321b051459491be1589a *tests/data/fate/vsynth1-jpeg2000-97.out.rawvideo +stddev: 3.61 PSNR: 36.98 MAXDIFF: 51 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-jpeg2000-gbrp12 b/tests/ref/vsynth/vsynth1-jpeg2000-gbrp12 index 0c6d47778f..e3081e22bc 100644 --- a/tests/ref/vsynth/vsynth1-jpeg2000-gbrp12 +++ b/tests/ref/vsynth/vsynth1-jpeg2000-gbrp12 @@ -1,4 +1,4 @@ -78b35a445001d2879386fdad16a2f0be *tests/data/fate/vsynth1-jpeg2000-gbrp12.avi -8163968 tests/data/fate/vsynth1-jpeg2000-gbrp12.avi -e934632ff63a00b4f2c9b3061f9c410e *tests/data/fate/vsynth1-jpeg2000-gbrp12.out.rawvideo -stddev: 3.51 PSNR: 37.21 MAXDIFF: 43 bytes: 7603200/ 7603200 +3daab1cc341134a4e487b50ea517bacd *tests/data/fate/vsynth1-jpeg2000-gbrp12.avi +10251850 tests/data/fate/vsynth1-jpeg2000-gbrp12.avi +641cd0335322890e518e717b84a14450 *tests/data/fate/vsynth1-jpeg2000-gbrp12.out.rawvideo +stddev: 5.26 PSNR: 33.70 MAXDIFF: 168 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-jpeg2000-yuva444p16 b/tests/ref/vsynth/vsynth1-jpeg2000-yuva444p16 index f3d3ba8a6c..01d050acba 100644 --- a/tests/ref/vsynth/vsynth1-jpeg2000-yuva444p16 +++ b/tests/ref/vsynth/vsynth1-jpeg2000-yuva444p16 @@ -1,4 +1,4 @@ -4c051562f5ac7c9871e034917326787c *tests/data/fate/vsynth1-jpeg2000-yuva444p16.avi -12502390 tests/data/fate/vsynth1-jpeg2000-yuva444p16.avi -59d53e883f76d41d17c926236ca9d7d2 *tests/data/fate/vsynth1-jpeg2000-yuva444p16.out.rawvideo +ee709cd29590d772a83e8c31d4c9bb3e *tests/data/fate/vsynth1-jpeg2000-yuva444p16.avi +14143154 tests/data/fate/vsynth1-jpeg2000-yuva444p16.avi +4b65281f1ed0ac35b1515bc9ed93dfd2 *tests/data/fate/vsynth1-jpeg2000-yuva444p16.out.rawvideo stddev: 2.66 PSNR: 39.62 MAXDIFF: 44 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-jpeg2000 b/tests/ref/vsynth/vsynth2-jpeg2000 index b60307d5da..d24c71642a 100644 --- a/tests/ref/vsynth/vsynth2-jpeg2000 +++ b/tests/ref/vsynth/vsynth2-jpeg2000 @@ -1,4 +1,4 @@ -bfe90391779a02319aab98b06dd18e6c *tests/data/fate/vsynth2-jpeg2000.avi -1538724 tests/data/fate/vsynth2-jpeg2000.avi -64fadc87447268cf90503cb294db7f61 *tests/data/fate/vsynth2-jpeg2000.out.rawvideo -stddev: 4.91 PSNR: 34.29 MAXDIFF: 55 bytes: 7603200/ 7603200 +6d158c89c38160d2cc2abb416c56b108 *tests/data/fate/vsynth2-jpeg2000.avi +2819428 tests/data/fate/vsynth2-jpeg2000.avi +58631def19ced7f67008e979e71527ba *tests/data/fate/vsynth2-jpeg2000.out.rawvideo +stddev: 2.87 PSNR: 38.96 MAXDIFF: 27 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-jpeg2000-97 b/tests/ref/vsynth/vsynth2-jpeg2000-97 index 591f8b6bb3..84e4621865 100644 --- a/tests/ref/vsynth/vsynth2-jpeg2000-97 +++ b/tests/ref/vsynth/vsynth2-jpeg2000-97 @@ -1,4 +1,4 @@ -aa5573136c54b1855d8d00efe2a149bd *tests/data/fate/vsynth2-jpeg2000-97.avi -2464134 tests/data/fate/vsynth2-jpeg2000-97.avi -1f63c8b065e847e4c63d57ce23442ea8 *tests/data/fate/vsynth2-jpeg2000-97.out.rawvideo -stddev: 3.21 PSNR: 37.99 MAXDIFF: 26 bytes: 7603200/ 7603200 +b9923e5a5ee2f2af4bf05261e2676f85 *tests/data/fate/vsynth2-jpeg2000-97.avi +4745072 tests/data/fate/vsynth2-jpeg2000-97.avi +da383fb4ac34704f49e5bb0b028bf016 *tests/data/fate/vsynth2-jpeg2000-97.out.rawvideo +stddev: 1.93 PSNR: 42.40 MAXDIFF: 17 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-jpeg2000-gbrp12 b/tests/ref/vsynth/vsynth2-jpeg2000-gbrp12 index fad6af5741..8c32289280 100644 --- a/tests/ref/vsynth/vsynth2-jpeg2000-gbrp12 +++ b/tests/ref/vsynth/vsynth2-jpeg2000-gbrp12 @@ -1,4 +1,4 @@ -3b20090f3d1f8804789c0dfdc68049fb *tests/data/fate/vsynth2-jpeg2000-gbrp12.avi -8484786 tests/data/fate/vsynth2-jpeg2000-gbrp12.avi -44c4232da8e05ce034558ee1c5899e0a *tests/data/fate/vsynth2-jpeg2000-gbrp12.out.rawvideo -stddev: 1.23 PSNR: 46.30 MAXDIFF: 14 bytes: 7603200/ 7603200 +3e8eb1cfe12b4dedca6d5f696bb10a9a *tests/data/fate/vsynth2-jpeg2000-gbrp12.avi +10554800 tests/data/fate/vsynth2-jpeg2000-gbrp12.avi +6df1c173bcec7b7af37ce6dc21e97040 *tests/data/fate/vsynth2-jpeg2000-gbrp12.out.rawvideo +stddev: 1.19 PSNR: 46.56 MAXDIFF: 13 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-jpeg2000-yuva444p16 b/tests/ref/vsynth/vsynth2-jpeg2000-yuva444p16 index 3cbe5f4ad2..176803425a 100644 --- a/tests/ref/vsynth/vsynth2-jpeg2000-yuva444p16 +++ b/tests/ref/vsynth/vsynth2-jpeg2000-yuva444p16 @@ -1,4 +1,4 @@ -37555b5b00bba2773d5a4212f6c7debd *tests/data/fate/vsynth2-jpeg2000-yuva444p16.avi -11501630 tests/data/fate/vsynth2-jpeg2000-yuva444p16.avi -61be7920a21190d946c22cb2c945ab6f *tests/data/fate/vsynth2-jpeg2000-yuva444p16.out.rawvideo -stddev: 0.53 PSNR: 53.49 MAXDIFF: 13 bytes: 7603200/ 7603200 +dd00685876c7b5df6187f0e6471c42dd *tests/data/fate/vsynth2-jpeg2000-yuva444p16.avi +13002350 tests/data/fate/vsynth2-jpeg2000-yuva444p16.avi +58ce4784d3ba4093a87c4095d93b269a *tests/data/fate/vsynth2-jpeg2000-yuva444p16.out.rawvideo +stddev: 0.53 PSNR: 53.54 MAXDIFF: 13 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth3-jpeg2000 b/tests/ref/vsynth/vsynth3-jpeg2000 index 894dba27dc..483ef36ecd 100644 --- a/tests/ref/vsynth/vsynth3-jpeg2000 +++ b/tests/ref/vsynth/vsynth3-jpeg2000 @@ -1,4 +1,4 @@ -1d039969504abdc143b410f99b5f9171 *tests/data/fate/vsynth3-jpeg2000.avi -67354 tests/data/fate/vsynth3-jpeg2000.avi -098f5980667e1fcd50452b1dc1a74f61 *tests/data/fate/vsynth3-jpeg2000.out.rawvideo -stddev: 5.47 PSNR: 33.36 MAXDIFF: 48 bytes: 86700/ 86700 +9a456b86efa1c363c0423b7f2715807d *tests/data/fate/vsynth3-jpeg2000.avi +85876 tests/data/fate/vsynth3-jpeg2000.avi +6443e4283aa22920d8c664c06e0fc099 *tests/data/fate/vsynth3-jpeg2000.out.rawvideo +stddev: 4.23 PSNR: 35.60 MAXDIFF: 45 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-jpeg2000-97 b/tests/ref/vsynth/vsynth3-jpeg2000-97 index 5d9d083791..c7e391043a 100644 --- a/tests/ref/vsynth/vsynth3-jpeg2000-97 +++ b/tests/ref/vsynth/vsynth3-jpeg2000-97 @@ -1,4 +1,4 @@ -522e12684aca4262a9d613cb2db7006c *tests/data/fate/vsynth3-jpeg2000-97.avi -85526 tests/data/fate/vsynth3-jpeg2000-97.avi -8def36ad1413ab3a5c2af2e1af4603f9 *tests/data/fate/vsynth3-jpeg2000-97.out.rawvideo -stddev: 4.51 PSNR: 35.04 MAXDIFF: 47 bytes: 86700/ 86700 +e02a7c89ac95ff10d649185f1716e908 *tests/data/fate/vsynth3-jpeg2000-97.avi +113742 tests/data/fate/vsynth3-jpeg2000-97.avi +b42cf3e27021c920d2c9d39f7d636355 *tests/data/fate/vsynth3-jpeg2000-97.out.rawvideo +stddev: 3.85 PSNR: 36.41 MAXDIFF: 43 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-jpeg2000-gbrp12 b/tests/ref/vsynth/vsynth3-jpeg2000-gbrp12 index 0010dbed58..afce383ae8 100644 --- a/tests/ref/vsynth/vsynth3-jpeg2000-gbrp12 +++ b/tests/ref/vsynth/vsynth3-jpeg2000-gbrp12 @@ -1,4 +1,4 @@ -1ca41231325bbacd1dc3b60785ba7fcc *tests/data/fate/vsynth3-jpeg2000-gbrp12.avi -143116 tests/data/fate/vsynth3-jpeg2000-gbrp12.avi -3a84f9e8db1b0f1f5dbf14062eb7975d *tests/data/fate/vsynth3-jpeg2000-gbrp12.out.rawvideo -stddev: 3.83 PSNR: 36.45 MAXDIFF: 42 bytes: 86700/ 86700 +54a37219c00aa5b674094aaa545516a7 *tests/data/fate/vsynth3-jpeg2000-gbrp12.avi +166692 tests/data/fate/vsynth3-jpeg2000-gbrp12.avi +d95853d510c1cf268d1f92d49716fbbd *tests/data/fate/vsynth3-jpeg2000-gbrp12.out.rawvideo +stddev: 3.82 PSNR: 36.48 MAXDIFF: 42 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-jpeg2000-yuva444p16 b/tests/ref/vsynth/vsynth3-jpeg2000-yuva444p16 index ce92bf7e43..0c8893f89d 100644 --- a/tests/ref/vsynth/vsynth3-jpeg2000-yuva444p16 +++ b/tests/ref/vsynth/vsynth3-jpeg2000-yuva444p16 @@ -1,4 +1,4 @@ -ae5951cee3db63c7c6f81d23b601c0fb *tests/data/fate/vsynth3-jpeg2000-yuva444p16.avi -194668 tests/data/fate/vsynth3-jpeg2000-yuva444p16.avi -d959793c1f0bb86b0fc509d5747e03c7 *tests/data/fate/vsynth3-jpeg2000-yuva444p16.out.rawvideo -stddev: 3.06 PSNR: 38.39 MAXDIFF: 40 bytes: 86700/ 86700 +9ab7da9c40bed48e794eb87981710bc5 *tests/data/fate/vsynth3-jpeg2000-yuva444p16.avi +213696 tests/data/fate/vsynth3-jpeg2000-yuva444p16.avi +47dece67bce3cd5bc5353effa4876180 *tests/data/fate/vsynth3-jpeg2000-yuva444p16.out.rawvideo +stddev: 3.06 PSNR: 38.40 MAXDIFF: 40 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth_lena-jpeg2000 b/tests/ref/vsynth/vsynth_lena-jpeg2000 index e2cbc899d3..8f49c95b7a 100644 --- a/tests/ref/vsynth/vsynth_lena-jpeg2000 +++ b/tests/ref/vsynth/vsynth_lena-jpeg2000 @@ -1,4 +1,4 @@ -51f061731d7fb987ff4e71789785225e *tests/data/fate/vsynth_lena-jpeg2000.avi -1188882 tests/data/fate/vsynth_lena-jpeg2000.avi -39a2c5b61cd0cf2821c6fb4cceba2fa8 *tests/data/fate/vsynth_lena-jpeg2000.out.rawvideo -stddev: 4.30 PSNR: 35.45 MAXDIFF: 45 bytes: 7603200/ 7603200 +0596a95beebb7836b04bb5ee6c98537e *tests/data/fate/vsynth_lena-jpeg2000.avi +2176700 tests/data/fate/vsynth_lena-jpeg2000.avi +ceef4245b5dab9c9df1ef6a2a198fcdd *tests/data/fate/vsynth_lena-jpeg2000.out.rawvideo +stddev: 2.59 PSNR: 39.86 MAXDIFF: 27 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-jpeg2000-97 b/tests/ref/vsynth/vsynth_lena-jpeg2000-97 index 0539300185..a9d6c417e8 100644 --- a/tests/ref/vsynth/vsynth_lena-jpeg2000-97 +++ b/tests/ref/vsynth/vsynth_lena-jpeg2000-97 @@ -1,4 +1,4 @@ -80fe872c8afaad914da6ef037957d93b *tests/data/fate/vsynth_lena-jpeg2000-97.avi -1937216 tests/data/fate/vsynth_lena-jpeg2000-97.avi -1b97333a8dc115a5ba609b0070d89d4d *tests/data/fate/vsynth_lena-jpeg2000-97.out.rawvideo -stddev: 2.82 PSNR: 39.10 MAXDIFF: 24 bytes: 7603200/ 7603200 +a0bc8e32a685ca91cb9aeb4f3fb65397 *tests/data/fate/vsynth_lena-jpeg2000-97.avi +3862296 tests/data/fate/vsynth_lena-jpeg2000-97.avi +3379930196df392460e2dd96f623ab3f *tests/data/fate/vsynth_lena-jpeg2000-97.out.rawvideo +stddev: 1.70 PSNR: 43.47 MAXDIFF: 15 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-jpeg2000-gbrp12 b/tests/ref/vsynth/vsynth_lena-jpeg2000-gbrp12 index d008d84753..e7eea80c1c 100644 --- a/tests/ref/vsynth/vsynth_lena-jpeg2000-gbrp12 +++ b/tests/ref/vsynth/vsynth_lena-jpeg2000-gbrp12 @@ -1,4 +1,4 @@ -04c3662db7b6e91640c94877a631a277 *tests/data/fate/vsynth_lena-jpeg2000-gbrp12.avi -8023408 tests/data/fate/vsynth_lena-jpeg2000-gbrp12.avi -c7e9b9e26292975e04046984aa3646cd *tests/data/fate/vsynth_lena-jpeg2000-gbrp12.out.rawvideo -stddev: 0.81 PSNR: 49.93 MAXDIFF: 12 bytes: 7603200/ 7603200 +2f078316b94fe43fb57749cfde8dad9b *tests/data/fate/vsynth_lena-jpeg2000-gbrp12.avi +10153388 tests/data/fate/vsynth_lena-jpeg2000-gbrp12.avi +a00fd95f92fb1cce9e82f35e6611006d *tests/data/fate/vsynth_lena-jpeg2000-gbrp12.out.rawvideo +stddev: 0.75 PSNR: 50.52 MAXDIFF: 12 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-jpeg2000-yuva444p16 b/tests/ref/vsynth/vsynth_lena-jpeg2000-yuva444p16 index 6dc522bb01..4d3f372e8a 100644 --- a/tests/ref/vsynth/vsynth_lena-jpeg2000-yuva444p16 +++ b/tests/ref/vsynth/vsynth_lena-jpeg2000-yuva444p16 @@ -1,4 +1,4 @@ -fcfb2e4738ad6afd7f9d4e9f92084415 *tests/data/fate/vsynth_lena-jpeg2000-yuva444p16.avi -11123818 tests/data/fate/vsynth_lena-jpeg2000-yuva444p16.avi -62ac96a84eb370e5543582512dbe5d7c *tests/data/fate/vsynth_lena-jpeg2000-yuva444p16.out.rawvideo -stddev: 0.45 PSNR: 54.88 MAXDIFF: 7 bytes: 7603200/ 7603200 +541a3067974bfb1d94f8f606faf91519 *tests/data/fate/vsynth_lena-jpeg2000-yuva444p16.avi +12623388 tests/data/fate/vsynth_lena-jpeg2000-yuva444p16.avi +2d445b4136edf979d8436fc837930ec4 *tests/data/fate/vsynth_lena-jpeg2000-yuva444p16.out.rawvideo +stddev: 0.45 PSNR: 54.94 MAXDIFF: 7 bytes: 7603200/ 7603200