From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2C789475A4 for ; Fri, 13 Oct 2023 14:29:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 06CEF68CA26; Fri, 13 Oct 2023 17:27:29 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6809468C9E0 for ; Fri, 13 Oct 2023 17:27:16 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 9710E4BC3E; Fri, 13 Oct 2023 16:27:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1697207233; bh=tJIme5/wSNyzKdIWBHbqa2sScr0X9ibInnwzcT4IuLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JUdhLsQM7WL2+zsNKqP+9M0lHLr14AT+RGEq4pIQZUoBHD/+Cy0Nul2QJ1LRRVRud 2CjMWqkh/Hb348XFfLP42aHqTsgXL6asxjvD0Sqdi0nU0eHZ0HjY4xndSlmylUsFCG FS5EO6Dg6XmzguR8CNRAntUa8HJZW3TYJcJidsdk= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Oct 2023 16:24:49 +0200 Message-ID: <20231013142706.23971-12-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231013142706.23971-1-ffmpeg@haasn.xyz> References: <20231013142706.23971-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 11/13] swscale/utils: simplify JPEG handling function 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: Niklas Haas Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Niklas Haas YUVJ no longer exists, so this is now just a check for luma-only formats, and no longer needs to mutate the pixel format. --- libswscale/utils.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index c179ac05b5..0a4b969fec 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -920,9 +920,9 @@ static void fill_xyztables(struct SwsContext *c) } } -static int handle_jpeg(enum AVPixelFormat *format) +static int is_luma_only(enum AVPixelFormat format) { - switch (*format) { + switch (format) { case AV_PIX_FMT_GRAY8: case AV_PIX_FMT_YA8: case AV_PIX_FMT_GRAY9LE: @@ -2018,7 +2018,6 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, SwsFilter *dstFilter) { static AVOnce rgb2rgb_once = AV_ONCE_INIT; - enum AVPixelFormat src_format, dst_format; int ret; c->frame_src = av_frame_alloc(); @@ -2029,13 +2028,8 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, if (ff_thread_once(&rgb2rgb_once, ff_sws_rgb2rgb_init) != 0) return AVERROR_UNKNOWN; - src_format = c->srcFormat; - dst_format = c->dstFormat; - c->srcRange |= handle_jpeg(&c->srcFormat); - c->dstRange |= handle_jpeg(&c->dstFormat); - - if (src_format != c->srcFormat || dst_format != c->dstFormat) - av_log(c, AV_LOG_WARNING, "deprecated pixel format used, make sure you did set range correctly\n"); + c->srcRange |= is_luma_only(c->srcFormat); + c->dstRange |= is_luma_only(c->dstFormat); if (c->nb_threads != 1) { ret = context_init_threaded(c, srcFilter, dstFilter); -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".