From patchwork Wed Jun 2 15:02:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 28063 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp644202iof; Wed, 2 Jun 2021 08:28:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWZOP4DclRPSV1tJno0HtM7eYrIRMFVrJ1Oo4sGPzFf4zRhYqn571AddiKFxDOLi39RqO8 X-Received: by 2002:a17:907:9e1:: with SMTP id ce1mr21849397ejc.104.1622647734114; Wed, 02 Jun 2021 08:28:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622647734; cv=none; d=google.com; s=arc-20160816; b=EskShDwmEo8G//PJJcpN3XWGk86C2KlIHwUjUb+StoyvlW1Xs3BOhpBRP3t1PX94Mo l8WXwGUmb4xB632C0sf0fbwoYrxzZN0ugc8aF8iCfDzWNOAyHCoSKDkKYFnr3NLP388i qu8yzh04uUIu7sAwQXZiFWaIjHw/1CDzKBXIkGn/F4PX9efiEpMT0cmzPImdYzYbHRUP kcDnOqC6B9LsAcIV5N0b0wz3rzRDT4PIBzQZCURIgoiEm3pi1enBruSGXEkdbUStYokR o64jee5m4O92G6SA8jRkbb0NeJX8MjSDEXOOpefL7aTHt1iEOVvNMbBNyl87n09bgZNb ePmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=CHUXiueRMwYk6/r4UiTIHS9JIgxTfSmkPiiG+nfIJv4=; b=YHvXXd1QBxIB8JoCYCcmE6Lh5mpnQo5IX2+AXNlnrTFsaKgEWgF3+wsvx/wVY3HG80 0HaVcWjkBlM+Tv3huUxDaUzyej1eIX+VOFWVu4dojnCZRkRoOaznMblhBHs9/5cfwdnl sc5dSYEsbNJHJQBACGVi4XTgNrWsqApgelpyrm0OS8IqXo2dENnQVdQXaVrCSYnt8mz0 H7b5OITRvR1mounVGApKgAZbq8Dnl70vFEza5Kzyfi3M271keliTmsQbkdF0nAbkcCJy q1NKp9B7m+VdQPwzl6D3Om8Zyl2aSVTBkf1lB1/rB70H34JjU2Us7TekYdFrztB1i8xr u8Rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=U2UbHpd4; 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 bo3si178502edb.589.2021.06.02.08.28.52; Wed, 02 Jun 2021 08:28:54 -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=20161025 header.b=U2UbHpd4; 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 BF79F689A2F; Wed, 2 Jun 2021 18:28:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D998F689E61 for ; Wed, 2 Jun 2021 18:28:42 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id u7so1288965plq.4 for ; Wed, 02 Jun 2021 08:28:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=V7IJOU4NvRnN0D/SGoiJnMoojICD+cCKud5CvT5o9LE=; b=U2UbHpd40Ts4kOUkrhP6Yc1wP3cUejZwCa3I5QHAO0uG92kLL3PR0oxQb/ylpWb113 mD8HFYAk+JPv5rIL9uPwYmWCg56pQAdNeLlutnggK/PGwTDubyWNQ2jzVfHcBDMSsZDj aD4AJ08+s444Ec8R0dW52kzmuf0m//ewqWE9jnPoiquLmaiWIUI2GAi/c9EhaySlP8Un v/70NxM4SeJQu+l7gHVLRP6LwMxHMNrhPuEXroHTZsz/UXw333MfcPcQb22hBnSXstYP 7eSHWqXUqqDXWN4lW4x73ygHjtD8N81SeqG3Xa0T7YjJd6v0F83iY9cPFVdWwQp0aAke Z8cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=V7IJOU4NvRnN0D/SGoiJnMoojICD+cCKud5CvT5o9LE=; b=osYvfxxiiuzYr7SeHHdT3XdLyN6awNbICSR3o5IWe83WZCVPeG/3wHWDPtqs02UE+Z abNHcpW9aZ8wgWPliGe+TE6Bf1oUy33/CczT63HVfjS0PVEMYSGaIU5QLosDpbcH+g9m qNfJgK/Lq4GOSiHOuglIhkX6y8KY1yU7XhPkDeaXfR2gYKx8SwRAPGNJrIMW5il3o4Az qUJZC1Y7whYeFPomL8FQiMOvOUAL07tKNMS2TVNknceEcL2LizMwE6XX1ZqqRbcUufs6 23+ANoLXudSiPOFvnvDeWM+AbrFuNG2xEFe+bQ0ever+9xlLuLCpmQ79ItFKa1Ojx23a UdSA== X-Gm-Message-State: AOAM531wZSe4txHHpZdrpU5YvOretEiqHWcNwVqsQ7qr91lUGeEOTtea Eqy2KW3YgU56eInsN2mvvwMBbp1pvxY= X-Received: by 2002:a17:902:edcf:b029:10c:768:b657 with SMTP id q15-20020a170902edcfb029010c0768b657mr2447770plk.56.1622646170053; Wed, 02 Jun 2021 08:02:50 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id d66sm15055pfa.32.2021.06.02.08.02.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Jun 2021 08:02:49 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Jun 2021 23:02:44 +0800 Message-Id: <1622646164-30564-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH] swscale: fix chroma width rounding 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: efg2BZXqDT0L From: Limin Wang fixes vertical line at the right side of video for rgb24toyv12 conversion. Please reproduce it with below command: ./ffplay -f lavfi -i "testsrc=size=529x656,ocv=filter_name=smooth,format=yuv420p" Signed-off-by: Limin Wang --- libswscale/rgb2rgb_template.c | 2 +- libswscale/x86/rgb2rgb_template.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c index 42c6980..e716ba5 100644 --- a/libswscale/rgb2rgb_template.c +++ b/libswscale/rgb2rgb_template.c @@ -654,7 +654,7 @@ void ff_rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, int32_t ru = rgb2yuv[RU_IDX], gu = rgb2yuv[GU_IDX], bu = rgb2yuv[BU_IDX]; int32_t rv = rgb2yuv[RV_IDX], gv = rgb2yuv[GV_IDX], bv = rgb2yuv[BV_IDX]; int y; - const int chromWidth = width >> 1; + const int chromWidth = AV_CEIL_RSHIFT(width, 1); for (y = 0; y < height; y += 2) { int i; diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c index ae2469e..704b0fa 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -1578,7 +1578,7 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_ #define BGR2U_IDX "16*4+16*33" #define BGR2V_IDX "16*4+16*34" int y; - const x86_reg chromWidth= width>>1; + const x86_reg chromWidth = AV_CEIL_RSHIFT(width, 1); if (height > 2) { ff_rgb24toyv12_c(src, ydst, udst, vdst, width, 2, lumStride, chromStride, srcStride, rgb2yuv);