From patchwork Mon Jan 28 10:07:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Faiz X-Patchwork-Id: 11901 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 11D3444DD82 for ; Mon, 28 Jan 2019 12:08:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3939A68AFB7; Mon, 28 Jan 2019 12:07:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43F5C68AF39 for ; Mon, 28 Jan 2019 12:07:51 +0200 (EET) Received: by mail-pf1-f194.google.com with SMTP id r136so7783569pfc.6 for ; Mon, 28 Jan 2019 02:08:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=PS1IJ2N7NPuvdXJN0wJFayJSyjdjR/MVUQs5esF3D5E=; b=DjQOBOHCjf0mHW26gQMvmwk1MT9+hXzj8A2+rvFg1gg0ubSBMpVn52VaaRspLlOcir U58ISuFdhyiEqlwa0VVik08G3HakrajAi0DGWVyqdk9LdabAP8UgSvfIS6xP4awk3LXV W0bQVsHUXqEtSpwmbC3aS5SRKBs2loveMenuAN4O/tK984EPLCsltmMMPngvv5YdE4sy jRzCpTjQf7++YKGGzEzDBvNJQ8x4M8S7M/5V612w4prjWP0XhA1XZqOq/mVVtDOXEHwd aQIbGL/kH/kvTqr5COVhzfrPk7BCXqz21SInFnfK9ZPxamRr5gmOF5tQZ3UzapompLFs GsVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PS1IJ2N7NPuvdXJN0wJFayJSyjdjR/MVUQs5esF3D5E=; b=ozwKWZ4Lfm19DWNfdETUMT7iUd7260JG5FjlQcIEBEG/0otID/oop9S+9MFNXnC0Hf GhhXIl6h5wArrozOn0Sh3ablNmOVRaypUkvtOd7xgvS7OzAwmBliuR7C1NTF1VMjvKc0 xyVB9NDnduTjv+Wb6fLcF9iHUKLH0cEkCujgXQ2Q5bMi9cKXsQtLzIaVnZ4gTmpieihK y7AhBoFSGyXMYjq1qynR89xJCA5DjRNceDzlB38PjFNEZPU7GtM41EyTY6OVg1Ung8us bL9CYAoDR7Am4KCjrsuovkS9PEu5vwjUGjV+a7akY3m8ReKJHqPBexvzATuH3l3N3JY7 w78g== X-Gm-Message-State: AJcUukd/ENEyf0+ctNtMH+aH4MVHlCkD0cvgLg9UkpIt3BnYMjd+aUoK x+2qEh2JJgG9P+ogxB0DNQuNusVq X-Google-Smtp-Source: ALg8bN5prPDDeKMIu1z5G2ylqkmPIcZ1b7NTXQPyhMcDuQ1na7zc0URJ4g9yiPiKw2GA0xg4mE6Qiw== X-Received: by 2002:a63:6d48:: with SMTP id i69mr18530799pgc.215.1548670089553; Mon, 28 Jan 2019 02:08:09 -0800 (PST) Received: from localhost.localdomain.localdomain ([182.1.85.55]) by smtp.gmail.com with ESMTPSA id r4sm70652819pgn.54.2019.01.28.02.08.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Jan 2019 02:08:08 -0800 (PST) From: Muhammad Faiz To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Jan 2019 17:07:38 +0700 Message-Id: <20190128100741.22923-2-mfcc64@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190128100741.22923-1-mfcc64@gmail.com> References: <20190128100741.22923-1-mfcc64@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/5] swscale/swscale_unscaled: add missing gbrap10 on ff_get_unscaled_swscale X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fix inconsistent checksums between gbrap10be and gbrap10le on fate-filter-pixfmts. Signed-off-by: Muhammad Faiz --- libswscale/swscale_unscaled.c | 3 +++ tests/ref/fate/filter-pixfmts-copy | 2 +- tests/ref/fate/filter-pixfmts-crop | 2 +- tests/ref/fate/filter-pixfmts-field | 2 +- tests/ref/fate/filter-pixfmts-fieldorder | 2 +- tests/ref/fate/filter-pixfmts-hflip | 2 +- tests/ref/fate/filter-pixfmts-il | 2 +- tests/ref/fate/filter-pixfmts-null | 2 +- tests/ref/fate/filter-pixfmts-scale | 2 +- tests/ref/fate/filter-pixfmts-transpose | 2 +- tests/ref/fate/filter-pixfmts-vflip | 2 +- 11 files changed, 13 insertions(+), 10 deletions(-) diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 058f2b94db..734a527e68 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1942,6 +1942,7 @@ void ff_get_unscaled_swscale(SwsContext *c) dstFormat == AV_PIX_FMT_GBRP12LE || dstFormat == AV_PIX_FMT_GBRP12BE || dstFormat == AV_PIX_FMT_GBRP14LE || dstFormat == AV_PIX_FMT_GBRP14BE || dstFormat == AV_PIX_FMT_GBRP16LE || dstFormat == AV_PIX_FMT_GBRP16BE || + dstFormat == AV_PIX_FMT_GBRAP10LE || dstFormat == AV_PIX_FMT_GBRAP10BE || dstFormat == AV_PIX_FMT_GBRAP12LE || dstFormat == AV_PIX_FMT_GBRAP12BE || dstFormat == AV_PIX_FMT_GBRAP16LE || dstFormat == AV_PIX_FMT_GBRAP16BE )) c->swscale = Rgb16ToPlanarRgb16Wrapper; @@ -1951,6 +1952,7 @@ void ff_get_unscaled_swscale(SwsContext *c) srcFormat == AV_PIX_FMT_GBRP10LE || srcFormat == AV_PIX_FMT_GBRP10BE || srcFormat == AV_PIX_FMT_GBRP12LE || srcFormat == AV_PIX_FMT_GBRP12BE || srcFormat == AV_PIX_FMT_GBRP14LE || srcFormat == AV_PIX_FMT_GBRP14BE || + srcFormat == AV_PIX_FMT_GBRAP10LE || srcFormat == AV_PIX_FMT_GBRAP10BE || srcFormat == AV_PIX_FMT_GBRAP12LE || srcFormat == AV_PIX_FMT_GBRAP12BE || srcFormat == AV_PIX_FMT_GBRAP16LE || srcFormat == AV_PIX_FMT_GBRAP16BE) && (dstFormat == AV_PIX_FMT_RGB48LE || dstFormat == AV_PIX_FMT_RGB48BE || @@ -1997,6 +1999,7 @@ void ff_get_unscaled_swscale(SwsContext *c) IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRP12) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRP14) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRP16) || + IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRAP10) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRAP12) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRAP16) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB444) || diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index 2417c577bd..82b8f28c31 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -25,7 +25,7 @@ bgra64be(le) b71d75a928aac14cb768403e6f6a9910 bgra64le b71d75a928aac14cb768403e6f6a9910 gbrap 98d30987407c51e5620921e11d40a4ff gbrap10be edcffb185e44b6dae5c2ead5505b7125 -gbrap10be(le) 3a046be0d38289dda5d8fdbd0f34aaf5 +gbrap10be(le) 2a7392e14b21b1f9457526a071236a6d gbrap10le 2a7392e14b21b1f9457526a071236a6d gbrap12be 0c4c1f8af361571265ca259d5f70f026 gbrap12be(le) 5f1d8c663d4c28863e687192433b34a4 diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index a0e1d9584f..cc32f2c99c 100644 --- a/tests/ref/fate/filter-pixfmts-crop +++ b/tests/ref/fate/filter-pixfmts-crop @@ -25,7 +25,7 @@ bgra64be(le) dd29ec9aba43aa3e8f9f5b9a93ca8831 bgra64le dd29ec9aba43aa3e8f9f5b9a93ca8831 gbrap 188cd467fe7ae7d85ae9ca8bdfa07739 gbrap10be 1880c4856d9cc6492b8b859f2711aaf1 -gbrap10be(le) c8505df07f9eeb413f943b5f4d686c0b +gbrap10be(le) c2b6e35f8b7ca363a7ec021ccdf31d1f gbrap10le c2b6e35f8b7ca363a7ec021ccdf31d1f gbrap12be c9769d18733cdc2664d8b9af09a03f6d gbrap12be(le) 3f80453c1ac6c5d1b2febf3ef141b476 diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index 210fa97e48..3ae7144e26 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -25,7 +25,7 @@ bgra64be(le) 9e2def541e51bc6e77fbffbff7fa146a bgra64le 9e2def541e51bc6e77fbffbff7fa146a gbrap 08a28b79dbd19246d1a94e3466af3624 gbrap10be 29d46cbf021b233f5f1886e5d5fe21b4 -gbrap10be(le) a5cfc53fbd96fcdf83b8b655fe25bf67 +gbrap10be(le) 4017c5d8c124438eb9aefa107db58d3b gbrap10le 4017c5d8c124438eb9aefa107db58d3b gbrap12be e7f471132628b1c034199cc109b84bc2 gbrap12be(le) 886207e5aa379a0312485b94e5fd5edd diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index 83ee4f40cc..4c66f61303 100644 --- a/tests/ref/fate/filter-pixfmts-fieldorder +++ b/tests/ref/fate/filter-pixfmts-fieldorder @@ -25,7 +25,7 @@ bgra64be(le) 5029192d0f32383c9f25f8e7da7cb5a0 bgra64le 5029192d0f32383c9f25f8e7da7cb5a0 gbrap 00afb65d44bea99c31b318fdbeb3be10 gbrap10be 8b27254a69cd0e25fa55262a743f95e6 -gbrap10be(le) 7ddbc3ffb7cb6b7e59c866ff99ca5a16 +gbrap10be(le) 52278021718ec370903dccc923dc8bf6 gbrap10le 52278021718ec370903dccc923dc8bf6 gbrap12be 302b353dff696ec9fd0d85a0cc14802b gbrap12be(le) ae2d6db2c9c825f06d92389de21263d2 diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index a6e1e889e5..c953e51fec 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -25,7 +25,7 @@ bgra64be(le) 1b15c01c94cf9af89273da1d1f994cff bgra64le 1b15c01c94cf9af89273da1d1f994cff gbrap bf6a2b2f206fbbb332a718fb570d7cb7 gbrap10be f188dc23756469cbdd172fe97ad58121 -gbrap10be(le) 927aa36653525bc3d9e9add84d52d7a3 +gbrap10be(le) 262f0501633ea4670020fae8ac6835e2 gbrap10le 262f0501633ea4670020fae8ac6835e2 gbrap12be ffe9aa4cbcc42f71757efe18826764ac gbrap12be(le) 88a85c1b3c5e19e299fdd209b73ac1ba diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index cec73b7f6d..0396f87d4c 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -25,7 +25,7 @@ bgra64be(le) d1aa975fa03ce226008396b30a653420 bgra64le d1aa975fa03ce226008396b30a653420 gbrap 575ff1fe5d7585ed82da1db35f106e4c gbrap10be bafa57a2e4331d8a39f6f0087c85d4b1 -gbrap10be(le) 522cf76fa2253286ddede13a6b91397a +gbrap10be(le) 553a1f439d8184dc400432d3f786fbce gbrap10le 553a1f439d8184dc400432d3f786fbce gbrap12be 48609d6b61ff6313939fa2d9c3ebb6d9 gbrap12be(le) e3b5342c8e47820f2de7e2dd61872312 diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index 2417c577bd..82b8f28c31 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -25,7 +25,7 @@ bgra64be(le) b71d75a928aac14cb768403e6f6a9910 bgra64le b71d75a928aac14cb768403e6f6a9910 gbrap 98d30987407c51e5620921e11d40a4ff gbrap10be edcffb185e44b6dae5c2ead5505b7125 -gbrap10be(le) 3a046be0d38289dda5d8fdbd0f34aaf5 +gbrap10be(le) 2a7392e14b21b1f9457526a071236a6d gbrap10le 2a7392e14b21b1f9457526a071236a6d gbrap12be 0c4c1f8af361571265ca259d5f70f026 gbrap12be(le) 5f1d8c663d4c28863e687192433b34a4 diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 358ffd0a15..fd1eef1e83 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -25,7 +25,7 @@ bgra64be(le) efeee0abcc658ebcff049d5e74d74943 bgra64le efeee0abcc658ebcff049d5e74d74943 gbrap 4a100f750ac846b34bfeef0d6893c3de gbrap10be 6d89abb9248006c3e9017545e9474654 -gbrap10be(le) d20132be2042709ead904d0e56bb8d53 +gbrap10be(le) c1765f3d46ad1c254882bae146074bea gbrap10le cf974e23f485a10740f5de74a5c8c3df gbrap12be 1d9b57766ba9c2192403f43967cb9af0 gbrap12be(le) 22c1b73c2fa900ae9b7ba35ae93d887b diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose index 57a599b004..761b144603 100644 --- a/tests/ref/fate/filter-pixfmts-transpose +++ b/tests/ref/fate/filter-pixfmts-transpose @@ -25,7 +25,7 @@ bgra64be(le) faaef6d280f92e7e8abdd9fa4a61f7b5 bgra64le faaef6d280f92e7e8abdd9fa4a61f7b5 gbrap 0899b3af50d35a63bfecb419a5b29968 gbrap10be 3e3be2d8f9aa5f449a1df404e27d0054 -gbrap10be(le) 1e7a177186c222e1d885ea9ae109bb81 +gbrap10be(le) db4e4861010cbbf726492fad282d5813 gbrap10le db4e4861010cbbf726492fad282d5813 gbrap12be 1518c9a565d1ba1a45dd369acc1aa75e gbrap12be(le) 714fe318af81a46f83655c6e7e13351e diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index 6bf33e6b93..e66e1acadc 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -25,7 +25,7 @@ bgra64be(le) 45feb93863055282447d1ff89c5158bf bgra64le 45feb93863055282447d1ff89c5158bf gbrap 421c56a25f88d58b9361f5c7bb368e21 gbrap10be e8134b72acc090b093b4d9b4d4703c7e -gbrap10be(le) cc927d069d03410f828b35c5db1000b1 +gbrap10be(le) 43bde7bd6a676c6ac33dbcc4c72762f3 gbrap10le 43bde7bd6a676c6ac33dbcc4c72762f3 gbrap12be 16a3d105ba852a9fa23ea5232db51b48 gbrap12be(le) 6ef8a3ac4129ec23c34aec14ac41f249