From patchwork Fri Oct 22 21:45:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31216 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp2266086ioa; Fri, 22 Oct 2021 14:46:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuDZqxBik/sMf+xsypEZOa+PI96hqFrFisEekhjiTFMpDIADe7+QbMtV/7mGpRhVjyZsX3 X-Received: by 2002:a17:906:1fc1:: with SMTP id e1mr2460043ejt.515.1634939209323; Fri, 22 Oct 2021 14:46:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634939209; cv=none; d=google.com; s=arc-20160816; b=FbXx6A0ae5jsimTN2yNbWYIXgmqumgpyp0SjAlcuSCMXLZXbVTL2Qiupiv25DlWdH7 OiZbRBP/GAg+7T+v13Bgsn612WxX+5EknJb4EJf0TtMx4dKoTHDMO/QtZrGAmJmn7vvD yIr6eZpXbB2GgxapOk7wSZCI+QW4rtPevrtrSOW1mIGbu9L4P3jywygkvoOuHMMSmwF5 MjIQ/jXmfrBDJKOIVfqoSnw+mlrFLEcr50iEg32ftDhhQXrR+4gtW9bqyk/dMuILYlB5 qxEqY8FFRGcoyivU85qpl8Tq5qFQejRSepijJ14NPhuAcOjsbNeX4aBV2W1XZPL24VX9 Z23A== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=LO7cjwryMrDiiORv5btZUGbPQV/l9+/0LUzE3e72lu4=; b=kain9G5CkQz0lTZHs7zH9Z9ah4rnQZk9uHrtZKaXd/vAK0M2DoUutyG3nESb5MqpCJ QemhUyx/YZ5ri+zrqAESzhDL7TfapGZQEik6vtw8nKCz0FoPbnOl1268QodzDgyLLVqZ B+xaU8mSdhqvOKelqZuckEdMvcgrcMdLdbuGSjN6qUxGs0p9l4j6Guk3pUk2mCWuMdvO enC3xLv4neXkazwd1mQEc/RnKKyODX4S+cvZa5Z+bCsTIQD5v6DZUdexnVUVeY4YBK9n WSJwdTFwnWY2p/P0tL7vltzEF2BCAzh3BBhShjsHaWq+JHdp/mNvmagEpsolPeni415W Pnkg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 88si13056327edf.116.2021.10.22.14.46.49; Fri, 22 Oct 2021 14:46:49 -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; 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 E5C9B68A664; Sat, 23 Oct 2021 00:46:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F37F688147 for ; Sat, 23 Oct 2021 00:46:39 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1me2N5-00D0RJ-08 for ffmpeg-devel@ffmpeg.org; Fri, 22 Oct 2021 23:46:39 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id e2M6msUIgSgGFe2M6mx1fo; Fri, 22 Oct 2021 23:45:39 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=rYY8bEcL9kpsSMh9VgMA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 22 Oct 2021 23:45:37 +0200 Message-Id: <20211022214538.13139-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfA5I+fibAmPSMCN07nQe3t1AmNISufvFAyFVB/0PyC/xDWPwU+Bao0LtGD6MKjIJfK6It+3mXoP+Lo5kgdWmOYmPiM3WjNrouMsg9o4zhH5rPnm0wIA6 Lafi29mEd88BKca465eS0wv9E7ynJzUU9U/s7gMODSjlczE9E1rLrsem Subject: [FFmpeg-devel] [PATCH 1/2] swscale/utils: Set all threads to the same colorspace even on failure 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 47HCcn4TNzP1 Fixes: ./ffplay dav.y4m -vf "scale=hd1080:threads=4" Found-by: Paul Signed-off-by: Michael Niedermayer --- libswscale/utils.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index 367b0ea5015..3752c3ec38c 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -874,15 +874,16 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], int need_reinit = 0; if (c->nb_slice_ctx) { + int parent_ret = 0; for (int i = 0; i < c->nb_slice_ctx; i++) { int ret = sws_setColorspaceDetails(c->slice_ctx[i], inv_table, srcRange, table, dstRange, brightness, contrast, saturation); if (ret < 0) - return ret; + parent_ret = ret; } - return 0; + return parent_ret; } handle_formats(c); From patchwork Fri Oct 22 21:45:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31215 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp2266167ioa; Fri, 22 Oct 2021 14:46:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygrnc/wZhdRZ+LlOmjLHCP4JjXcCwF/Yu8SDFHygqWMw+2ZXo5OzGoOYkI34IFznyI3Pxp X-Received: by 2002:a17:907:3d89:: with SMTP id he9mr2744767ejc.96.1634939217454; Fri, 22 Oct 2021 14:46:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634939217; cv=none; d=google.com; s=arc-20160816; b=TeCCw6CFmO4t7w2k0m2oiOSgKx9BiaKhofAP3AfsnaL8sgCRpWpXFHKhseINgf3ezl BR+TLCY3IkIunzDZvVBgjsbYBZhRlAiLHjIo5j3LANLVATRA5cPYGQAThWI1EPdiKyBA dAN6wSUzlRu4T/gODMLjBplWeB49LWn/U5Pa5j9hh0RylwcgPODGieUqFjdZTzQebkjH /ztKlfl7ROaeozoJLKWVvFq51dKAjwM9J4yim55+NepCQJ7WQl5BEzxBgZKN/FmZeQkl 9v/6MsMOrVxhFEc3P2NNpnK6hrSIuUGVYFnVgBSCkpbqgCfWX6STV/QE/bfOP60t4nn7 n7Fw== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=wnip6nw5f5t2YqXCojGfbvYWb//WL0mz825GPIVVFrU=; b=tHPu6efmQc3Zl2jx/MPbivIaq4t3WoxwBNtNdi4xgO8M/jWG4fp/yJXMolhhxlsPo9 oRt+5ju2MVyicQabNH5qFyr2Uz2tXMPVkazbiWxuX8CZHmdSGDQPoBb+qfcbg8DoZTWt I6IKYQPT9JnCYwUu+1YlvF2JM2M2zrvvC9BbXBwMRCMSBC1lb0hyAXb1qrH5zAWMlGsp e9Jmf1WCzj293zhyEpCh2xGVIDXid6kCTHTr0jqGnWRMRNj308Nll1VnkEgjry6atDJC Vjlkk0dPjFd4G5nxNUlM26PBlKq54kQ2PufyQ72iwLUr5VywVj7sXnENF7VCLXG/vQ/r IRbg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c11si17586594edx.502.2021.10.22.14.46.57; Fri, 22 Oct 2021 14:46:57 -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; 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 4088B689B43; Sat, 23 Oct 2021 00:46:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80A506898F5 for ; Sat, 23 Oct 2021 00:46:39 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1me2N5-00D0ez-08 for ffmpeg-devel@ffmpeg.org; Fri, 22 Oct 2021 23:46:39 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id e2M7msUKISgGFe2M7mx1gf; Fri, 22 Oct 2021 23:45:39 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=YySi6lUhWLgC6uF_uukA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 22 Oct 2021 23:45:38 +0200 Message-Id: <20211022214538.13139-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211022214538.13139-1-michael@niedermayer.cc> References: <20211022214538.13139-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfA5I+fibAmPSMCN07nQe3t1AmNISufvFAyFVB/0PyC/xDWPwU+Bao0LtGD6MKjIJfK6It+3mXoP+Lo5kgdWmOYmPiM3WjNrouMsg9o4zhH5rPnm0wIA6 Lafi29mEd88BKca465eS0wv9E7ynJzUU9U/s7gMODSjlczE9E1rLrsem Subject: [FFmpeg-devel] [PATCH 2/2] swscale/utils: Improve return codes of sws_setColorspaceDetails() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5RQTy3gwRtoM Signed-off-by: Michael Niedermayer --- libswscale/utils.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index 3752c3ec38c..632f6fd4648 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -995,7 +995,10 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], 0, 1 << 16, 1 << 16); return 0; } - return -1; + //We do not support this combination currently, we need to cascade more contexts to compensate + if (memcmp(c->dstColorspaceTable, c->srcColorspaceTable, sizeof(int) * 4)) + return AVERROR_PATCHWELCOME; + return 0; } if (!isYUV(c->dstFormat) && !isGray(c->dstFormat)) {