From patchwork Wed Nov 3 17:55:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 31282 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:a610:0:0:0:0:0 with SMTP id q16csp5582884ioi; Wed, 3 Nov 2021 10:55:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyToxGx25FEHviPoYf9K3UKGQGb9+5UPNu9rh8nGSiFIQyIUDVi+rH5IdML32cEA4O+PXcH X-Received: by 2002:a50:f18c:: with SMTP id x12mr43596361edl.357.1635962136590; Wed, 03 Nov 2021 10:55:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635962136; cv=none; d=google.com; s=arc-20160816; b=vy7nBKD/Vrzk8tvGeqJHE4Nt9/F/t9Dgq8bNgpNJrNP1YnX1JHn9BfZpAlXC4K4exn GEVgDTYUIdetnOmhx2Eq1EX0vLWb1UHExASvSSw8BYjY9Dmm3+qsdFE6b8hwK8rvdcno mfbt/AZAdajl59PB0NWUIvVV0KQ/8g2k2lK+GrnukpUgAMXIBcsIMsv//1Y+9gkWXAbM LXBaEy1VIdcjIHFIFzNosgn5iG0ih2FrX5zYbINKqzhZKQOQ1X73zNlqLwtgaFyKxEOv o54caAaiXq/pyFjkp8+m4O9LSmDBCVIxflUqqj2B2ZTBk0BqYaiomcPyCKlhvHlD/rxm gLyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=5elblKRDjRvRyjEhNT+1hbNLAwWgJAprgv4LK2fIaVQ=; b=rcCN0tD3cLRKsS3sL08pGR3WnNUKwGeF3wQoQeCw4ohklaQOgJU6tITA/XAoXSsslz Jp7gdw7XuKpx14C9ITC5SjHenK3/iD1CIeKXwkHrvyfj+0vNtxZBgtiIPwIg11UUhTFE uoEG0FTJ2AGUCmVvOFycHO/+owEKXQy2iEtXFUMZT59So4tt0xmN6zpCV4iBLVzW+w8C fgurV0ICLb0iELLdDD8TheLnQmz0lQTNbPwIWy6u9unQWYV1t5yR+mN0B8KM2FLMSiXh bruE9W+08SyzUtOYBUKyw4IbfF82w5G3eilzWQqj0k0fkHAC1MvCeF5SoqAujBwIIfFm wO3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=jZKAu+Pq; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dt5si4524730ejc.402.2021.11.03.10.55.35; Wed, 03 Nov 2021 10:55:36 -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=@gmail.com header.s=20210112 header.b=jZKAu+Pq; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 650E968A877; Wed, 3 Nov 2021 19:55:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CFCB3689FB4 for ; Wed, 3 Nov 2021 19:55:24 +0200 (EET) Received: by mail-pj1-f51.google.com with SMTP id fv9-20020a17090b0e8900b001a6a5ab1392so2006876pjb.1 for ; Wed, 03 Nov 2021 10:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6+Lrh2LfMCnhzKw4zBB8TL2Jyx/o79mYPqDcSbUb0lk=; b=jZKAu+Pq7mrQrZLO7kOHnqo0ywSjGnXhL4y+RoudpHG4nDGyXl515QHNGTyBIpwi7l fK5xZ+yfBCJxsfwOi2YJLDwDW/UDgEdSz8tSx+Yn8si/YgAjjNa9B5rh+hJbp0GBnbuc BMUbtUvdjC28nXHo1weyEm/vogwjFIpteCn7P3k8MaU7JmkH50bVtZ1FRlY943c0H8ZX OR/NUBQgya2yQUAIaIaCeQtH+41Umu5J//GSnXqU8wFcMZTKvgzeKV0kv6AAiBzG+uhL kR9bfT58YOMFJiMORMppMwTJ2Ey2bziFmw68SIXlJpkC+LSyEbidZG7tnWquYMWbDPXq JkBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6+Lrh2LfMCnhzKw4zBB8TL2Jyx/o79mYPqDcSbUb0lk=; b=M8kZcTgKwE5HsQJck1OgbpI6BujpD2Ut2k7DKK4mntedN0Nq0E9JVersUneJXg9pwH JXPRaTdX40qT0YNka3aaOQjZ877Ze6+iI/36a8gceorp4RC0KTzJ5gSQVNxbZ2X6VKgp +1EI44Bq6rBa5wTHwVo/pqRd1znNBBY6NyqvfBQoAOZvzc54Q5kjc3WmryVI+OCwmb1e wW8W4WY211zVsMVc2T9cFO9fvEZCg6NZXQg7i8klA7dNDffXSwxvuIMh8p15A3P8N26S OzinTzlj9Xnpwt+q1gF2aNPBUCQPU1R5Bq8PbcOm1OU0uxt6bZH6Cg36op2AzT7iM9uo PEpQ== X-Gm-Message-State: AOAM532YNgktMqYxKcXm7owuTKAzQa0BjSKWc18YzAShhragJPKwPdDV sEOT+Ihz3syW2lKh+hoJKHjHEfbTCdw= X-Received: by 2002:a17:902:f283:b0:141:f719:c434 with SMTP id k3-20020a170902f28300b00141f719c434mr17307238plc.79.1635962122699; Wed, 03 Nov 2021 10:55:22 -0700 (PDT) Received: from localhost.localdomain (S0106bc4dfba470f3.vc.shawcable.net. [174.7.244.175]) by smtp.gmail.com with ESMTPSA id a2sm2432977pgn.20.2021.11.03.10.55.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Nov 2021 10:55:22 -0700 (PDT) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Nov 2021 10:55:14 -0700 Message-Id: <20211103175514.15502-1-mindmark@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/1] swscale/input: fix planar_rgb16_to_a for gbrap10be and gbrap12be formats 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: Mark Reid Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PvNtdXO0+wKb From: Mark Reid --- libswscale/input.c | 2 +- tests/ref/fate/filter-pixfmts-scale | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libswscale/input.c b/libswscale/input.c index 477dc3d6b2..336f957c8c 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -911,7 +911,7 @@ static void planar_rgb_to_uv(uint8_t *_dstU, uint8_t *_dstV, const uint8_t *src[ } #define rdpx(src) \ - is_be ? AV_RB16(src) : AV_RL16(src) + (is_be ? AV_RB16(src) : AV_RL16(src)) static av_always_inline void planar_rgb16_to_y(uint8_t *_dst, const uint8_t *_src[4], int width, int bpc, int is_be, int32_t *rgb2yuv) { diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 07c4ff536d..1623e5c939 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -19,9 +19,9 @@ bgra d8316272bc3a360ef9dff3ecc84520a3 bgra64be 4e6a1b9f9c18b881c27d76611d45f737 bgra64le efeee0abcc658ebcff049d5e74d74943 gbrap 4a100f750ac846b34bfeef0d6893c3de -gbrap10be dc6aea3559ea4fcdda1ccc4f23d2f2fb +gbrap10be 50735fbc471a5ac5a6645c85881f3670 gbrap10le 6e1cba57029fdf0f9d46b5e5cd55112b -gbrap12be dbe3a662c016563529032cd4dfb80262 +gbrap12be 58170165829484b3db4a3b9165198987 gbrap12le 24f5ecb32435b73353517e017c165e31 gbrap16be 31968e6872a46e8174fb57f8920ed10d gbrap16le 8c6758f33671b673b6d30969fc05a23d