From patchwork Thu Dec 23 07:35:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 32851 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7049780iog; Wed, 22 Dec 2021 23:35:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJwjFj2Zjf0D/OSMFULG2eeqh8kXdIAM5RlKXW+3DiiQZSdqCs1bT3uh4NG/Y9axVToDjDbZ X-Received: by 2002:a17:907:169f:: with SMTP id hc31mr942711ejc.703.1640244954571; Wed, 22 Dec 2021 23:35:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640244954; cv=none; d=google.com; s=arc-20160816; b=Z+savh5YYfiGDEUNNT8dQAPRoYCHWwgIffJrC+3OgPE45zqnRFsXwdL3fmCBmLMM6I LI/KE2dBJt9sCRZBX61cflANrgV2yxn2fWoiu3hwZkg8BQENpS3Fddt5YBg5Q8/BKw3g wcsEcVleN9IpxxuQlPkRIR4Ropotw4gGWonqzyhh00kVa5qYeQIqR9M3ZD/pbnHw8dAJ Yr5/cuCnoGsrSFquS3mVJKRL9bthArCbuqHNRW01Pd+bujT2C2bZ+MetJGY6X0S2VZMV +Wq7rJjSaIouELrf7D2KIVBxUwZJPEwhmCfcObYPyVQa251yPTNETN1/ES0gpGf+1/an mTxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=pikKOImRfqaTbUBzEhQcOkcEB5sz3Nbpf0Dcs5IHYU8=; b=Lyza4vuSJ7N4/2bZoBzJ5tyeryypQpYrM7CPUcRJAM/txWg+g2Wr3vX6VoOeh190oG NRCv/yd8IiXdRDc05KuGSP6jikhZHLrQ3pnzkldvd7xk9qt5ulePXQQJM0alJLNJFuDB 5NoVHVWBlDM0ShygHKcq+RuwBhLdW1FPNVrFuChqT7YwK++A0GtteozElnHAjC8CnmcQ +S4OMWGnVriPaXp3greRPgvXCiujaVjFdL+Fw3/on7ZToRMGz2llpR1mMQibai3dJRQn pXINBu2UgG66HDpvC7/rCzHTGCR+B2vuyU79e4NCB8hqk4wZzIrPviPUZTcLFVYv4fgK hpUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=WPTj1pWU; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f21si1628523ejh.859.2021.12.22.23.35.53; Wed, 22 Dec 2021 23:35:54 -0800 (PST) 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=@rcombs.me header.s=google header.b=WPTj1pWU; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6B64168B0CC; Thu, 23 Dec 2021 09:35:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f173.google.com (mail-il1-f173.google.com [209.85.166.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FDA068B11B for ; Thu, 23 Dec 2021 09:35:43 +0200 (EET) Received: by mail-il1-f173.google.com with SMTP id g5so3581601ilj.12 for ; Wed, 22 Dec 2021 23:35:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=rOMwJWjhymU2H/nr3mn9udLVLf/T9w5kZPPMROQoVcY=; b=WPTj1pWUytyyQED87k0e+AL58GPNwrt1WaGyrCChqGfuZkL/8D9MTLVC4mW/rfgAa9 QL495ZxqAcHwN8ytdY5K5A1WMz8ppmfLMi6k5RcOF+m4X39A5ocKk2iE6YMAvDUet0YM O2YwbaW5mSu8vSYvgWlm1V6h05H0i1ZK67i9K5QQ6QlOhKtWGAWvYgscekHRCzWjxBjn XaNgt9+l48wKrHQuRSBxfK6sg1w6SalVV742qKG+71vS7f/GA42I3yIShMhgtjUv1pkK QmVYw94v5ml8MiBZrAEOJ0mddiSTc0R5Mq5+JzQrCIcdQ6eP7NpzqchijR87XitMcMDO tYVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=rOMwJWjhymU2H/nr3mn9udLVLf/T9w5kZPPMROQoVcY=; b=DWbZ1OwpJMS+eD4gxXu4Onmt0xQl8MJJFD38MwkcomO3YhDw3Zj9R/icaEG+Wwzvff bqAkAE+7CFqADR8cB+BwUr/DZNE/I+2lSfqmjAJTL+4DCtisRI2rMxiJrUkSSlLTCq9b PfEferEkAARQ9ZinBUosVEKY9Z63C/Tg/qrubbH7bW48vZCjS5rCz4IK8ltP7o7qr3Hk O3V8slI7qxrSlO/MtELDNfukLAk6hdICHdnGdUsMn3K0IvqdZFpB+d27OPzHk0kl/5MN iIZF38NTesj91xxjD726SsnNZNzESbVBKd/sjJE19zmYgUELbZkwEGkIgdi2Wo8Lt5DT UwIA== X-Gm-Message-State: AOAM530G8XEah9xOGtW2jxySr0QfLsUFtaPnOl1Dpktg87z3o1IStxS1 v0KB+ZY4pNSTsUZ6h0DfZSgxXst+tU2ysuw= X-Received: by 2002:a05:6e02:1b0f:: with SMTP id i15mr352919ilv.91.1640244941406; Wed, 22 Dec 2021 23:35:41 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:cd8d:58a:de7b:88f1]) by smtp.gmail.com with ESMTPSA id z6sm2292244ilz.36.2021.12.22.23.35.40 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 22 Dec 2021 23:35:40 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Dec 2021 01:35:31 -0600 Message-Id: <20211223073531.66217-1-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] swscale/x86/init: use isSemiPlanarYUV 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1hgnUUhmyjhE Fixes P210/P410 cases introduced (and broken) in 88d804b7ffa20caab2e8e2809da974c41f7fd8fc --- libswscale/x86/swscale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index ffc7691c12..fdc93866a6 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -417,14 +417,14 @@ av_cold void ff_sws_init_swscale_x86(SwsContext *c) #define ASSIGN_VSCALEX_FUNC(vscalefn, opt, do_16_case, condition_8bit) \ switch(c->dstBpc){ \ case 16: do_16_case; break; \ - case 10: if (!isBE(c->dstFormat) && c->dstFormat != AV_PIX_FMT_P010LE) vscalefn = ff_yuv2planeX_10_ ## opt; break; \ + case 10: if (!isBE(c->dstFormat) && !isSemiPlanarYUV(c->dstFormat)) vscalefn = ff_yuv2planeX_10_ ## opt; break; \ case 9: if (!isBE(c->dstFormat)) vscalefn = ff_yuv2planeX_9_ ## opt; break; \ case 8: if ((condition_8bit) && !c->use_mmx_vfilter) vscalefn = ff_yuv2planeX_8_ ## opt; break; \ } #define ASSIGN_VSCALE_FUNC(vscalefn, opt1, opt2, opt2chk) \ switch(c->dstBpc){ \ case 16: if (!isBE(c->dstFormat)) vscalefn = ff_yuv2plane1_16_ ## opt1; break; \ - case 10: if (!isBE(c->dstFormat) && c->dstFormat != AV_PIX_FMT_P010LE && opt2chk) vscalefn = ff_yuv2plane1_10_ ## opt2; break; \ + case 10: if (!isBE(c->dstFormat) && !isSemiPlanarYUV(c->dstFormat) && opt2chk) vscalefn = ff_yuv2plane1_10_ ## opt2; break; \ case 9: if (!isBE(c->dstFormat) && opt2chk) vscalefn = ff_yuv2plane1_9_ ## opt2; break; \ case 8: vscalefn = ff_yuv2plane1_8_ ## opt1; break; \ default: av_assert0(c->dstBpc>8); \