From patchwork Tue Feb 20 02:49:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 46383 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp1614458pzb; Mon, 19 Feb 2024 18:49:35 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWmdD4QoH8omv6jPF5aeWDIxArv4dMevDmzJ4jujQ6vZ0CkZPyNBhhn45jJ1jIho3OzJP1cUdvEzRBA9ZhhdUlENTQVhxVAooZw6Q== X-Google-Smtp-Source: AGHT+IEunIubd5K05KtLfpkuAQ0ogysiz+1WODq1vlHSMYbVOXMjYxmH6VySZuVy8Y52JzzQ3Hlb X-Received: by 2002:a05:6000:815:b0:33d:297c:911c with SMTP id bt21-20020a056000081500b0033d297c911cmr8106608wrb.0.1708397374795; Mon, 19 Feb 2024 18:49:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708397374; cv=none; d=google.com; s=arc-20160816; b=NtaHo0VzVftAHmJe6hX9mEcpY+3QUV9aj2GNQupMDwgaEvAwvCrSJTgdkoEi3KsbM/ TpxikGfEDUe/6f4WLFNC9yH87mI94iyhkelbkFmLwgGanv+KHR1TZuQMPgI5271SEPJb 5MtyR5xCZBsJl79zwpUkHtg2FSrTJTCBAZYRMpWLz4RHuWIHWyjO3G+w+IYjU9wm7ZR+ bo5odBIXavTrcPlOcz6hFRA3gUDv+f6kvqRpOpuLHqMfvm0F4KcIpT9YV7Fe3bljPjx5 7YmQfLj6fBa4bQoQTAnPrGmGLfbn323gI8Z/CugBTJH14j5Ti+DdvQXufh0dmHG8y06C O/1A== 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:dkim-signature :delivered-to; bh=QnMIFOOYcDchcbuZVs+1LtURVCA/84xeENJfaPmyvSA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=uA9VBX1powZBKDXbCwUrqqVjdzGaAeDQ6pUbqlebDFgfDMWrBrUgj7I34JNXD41LXN Yv3iGJvZ7PqINJm4XyYz43vGLYE/3A3rBKFTzbQieTRVfEGMhPQOBbEL9QwXc1oaaa8w dSreWcbC/EOO6YbNvmiUfKk+99O9bgwnRHYtcR0AsTADTdyv2E8MKY3jaMBv7es4JEgX gGFwSMSy0lWTZdACJNa7cMeQXb9pFdIg/8GqsXeBMOcGx99/flIYjwXkj+iDUyKBwFU8 7jNuan7ksENZlhz2kqf4JlcgVYQ2Kt19KIwrRyZjYnJj+9+YbLpuICnpOh51Wa3yxWuk s7FQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=oie1dGm5; 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 y12-20020a056402358c00b005640a253e0csi3028661edc.216.2024.02.19.18.49.34; Mon, 19 Feb 2024 18:49:34 -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=@niedermayer.cc header.s=gm1 header.b=oie1dGm5; 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 EB2B468D445; Tue, 20 Feb 2024 04:49:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3D9E68C248 for ; Tue, 20 Feb 2024 04:49:23 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id E64AC1C0004 for ; Tue, 20 Feb 2024 02:49:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1708397363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=8qecS8LV6Sno9ZOKsVtaQRBRcMxEuucKGmp1miY8u8Y=; b=oie1dGm5zPpXxlQMJ7C1gi4klZpfaNm/f599ttM+b32FEkLebFEBw7q4BY+YfpgUF+oLg8 v2sLdjFAbtw4qosOaD21UjGPJlIjOnFi1wPEEomHIS09o3yCmiOt4svgu0h885ziWZxkEj qPcOzvfL39uLMjrQmVS0A4lJkKskhn3gz+n9YZGurCj3iiompMz8DkTFZBfS5DOA7jPQnR mliYH346JdtKuFV+FL0y2awmf0mdl9pr0zWphH5Q2OgDk2Q2dicTPMBn6iBq9hvNg5nI7M qsck5q9spV82EmO2jCX/LXTYJn3N+S0vcb4D9b8FNBZvYJyP9/pxlBTupAkDng== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 20 Feb 2024 03:49:20 +0100 Message-Id: <20240220024922.22779-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/3] tools: Add target_sws_fuzzer.c 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: a/K/W+Po7THX Signed-off-by: Michael Niedermayer --- Makefile | 3 + tools/Makefile | 3 + tools/target_sws_fuzzer.c | 193 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 199 insertions(+) create mode 100644 tools/target_sws_fuzzer.c diff --git a/Makefile b/Makefile index dbc930270b..b309dbc4db 100644 --- a/Makefile +++ b/Makefile @@ -64,6 +64,9 @@ tools/target_dem_fuzzer$(EXESUF): tools/target_dem_fuzzer.o $(FF_DEP_LIBS) tools/target_io_dem_fuzzer$(EXESUF): tools/target_io_dem_fuzzer.o $(FF_DEP_LIBS) $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH) +tools/target_sws_fuzzer$(EXESUF): tools/target_sws_fuzzer.o $(FF_DEP_LIBS) + $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH) + tools/enum_options$(EXESUF): ELIBS = $(FF_EXTRALIBS) tools/enum_options$(EXESUF): $(FF_DEP_LIBS) diff --git a/tools/Makefile b/tools/Makefile index dee6a41668..72e8e709a8 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -17,6 +17,9 @@ tools/target_dem_fuzzer.o: tools/target_dem_fuzzer.c tools/target_io_dem_fuzzer.o: tools/target_dem_fuzzer.c $(COMPILE_C) -DIO_FLAT=0 +tools/target_sws_fuzzer.o: tools/target_sws_fuzzer.c + $(COMPILE_C) + tools/enc_recon_frame_test$(EXESUF): tools/decode_simple.o tools/venc_data_dump$(EXESUF): tools/decode_simple.o tools/scale_slice_test$(EXESUF): tools/decode_simple.o diff --git a/tools/target_sws_fuzzer.c b/tools/target_sws_fuzzer.c new file mode 100644 index 0000000000..a118368ce0 --- /dev/null +++ b/tools/target_sws_fuzzer.c @@ -0,0 +1,193 @@ +/* + * Copyright (c) 2024 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" +#include "libavutil/avassert.h" +#include "libavutil/avstring.h" +#include "libavutil/cpu.h" +#include "libavutil/imgutils.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/opt.h" + +#include "libavcodec/bytestream.h" + +#include "libswscale/swscale.h" + + +int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size); + +static void error(const char *err) +{ + fprintf(stderr, "%s", err); + exit(1); +} + +static int alloc_plane(uint8_t *data[AV_VIDEO_MAX_PLANES], int stride[AV_VIDEO_MAX_PLANES], int w, int h, int format, int *hshift, int *vshift) +{ + size_t size[AV_VIDEO_MAX_PLANES]; + ptrdiff_t ptrdiff_stride[AV_VIDEO_MAX_PLANES]; + int ret = av_image_fill_linesizes(stride, format, w); + if (ret < 0) + return -1; + + av_assert0(AV_VIDEO_MAX_PLANES == 4); // Some of the libavutil API has 4 hardcoded so this has undefined behaviour if its not 4 + + av_pix_fmt_get_chroma_sub_sample(format, hshift, vshift); + + for(int p=0; p 128) { + GetByteContext gbc; + int64_t flags64; + + size -= 128; + bytestream2_init(&gbc, data + size, 128); + srcW = bytestream2_get_le32(&gbc) % 16384; + srcH = bytestream2_get_le32(&gbc) % 16384; + dstW = bytestream2_get_le32(&gbc) % 16384; + dstH = bytestream2_get_le32(&gbc) % 16384; + + if (srcW * (uint64_t)srcH > 16384 || dstW * (uint64_t)dstH > 16384) + return 0; // we avoid high res as its very slow + + flags = bytestream2_get_le32(&gbc); + + unsigned mask = flags & (SWS_POINT | + SWS_AREA | + SWS_BILINEAR | + SWS_FAST_BILINEAR | + SWS_BICUBIC | + SWS_X | + SWS_GAUSS | + SWS_LANCZOS | + SWS_SINC | + SWS_SPLINE | + SWS_BICUBLIN); + mask &= flags; + if (mask && (mask & (mask -1))) + return 0; // multiple scalers are set, not possible + + srcFormat = bytestream2_get_le32(&gbc) % AV_PIX_FMT_NB; + dstFormat = bytestream2_get_le32(&gbc) % AV_PIX_FMT_NB; + + flags64 = bytestream2_get_le64(&gbc); + if (flags64 & 0x10) + av_force_cpu_flags(0); + + if (av_image_check_size(srcW, srcH, srcFormat, NULL) < 0) + srcW = srcH = 23; + if (av_image_check_size(dstW, dstH, dstFormat, NULL) < 0) + dstW = dstH = 23; + //TODO alphablend + } + + desc_src = av_pix_fmt_desc_get(srcFormat); + desc_dst = av_pix_fmt_desc_get(dstFormat); + + fprintf(stderr, "%d x %d %s -> %d x %d %s\n", srcW, srcH, desc_src->name, dstW, dstH, desc_dst->name); + + ret = alloc_plane(src, srcStride, srcW, srcH, srcFormat, &srcHShift, &srcVShift); + if (ret < 0) + goto end; + + ret = alloc_plane(dst, dstStride, dstW, dstH, dstFormat, &dstHShift, &dstVShift); + if (ret < 0) + goto end; + + + for(int p=0; p size) + psize = size; + if (psize) { + memcpy(src[p], data, psize); + data += psize; + size -= psize; + } + } + + sws = sws_alloc_context(); + if (!sws) + error("Failed sws allocation"); + + av_opt_set_int(sws, "sws_flags", flags, 0); + av_opt_set_int(sws, "srcw", srcW, 0); + av_opt_set_int(sws, "srch", srcH, 0); + av_opt_set_int(sws, "dstw", dstW, 0); + av_opt_set_int(sws, "dsth", dstH, 0); + av_opt_set_int(sws, "src_format", srcFormat, 0); + av_opt_set_int(sws, "dst_format", dstFormat, 0); + av_opt_set(sws, "alphablend", "none", 0); + + ret = sws_init_context(sws, NULL, NULL); + if (ret < 0) + goto end; + + //TODO Slices + sws_scale(sws, (const uint8_t * const*)src, srcStride, 0, srcH, dst, dstStride); + +end: + sws_freeContext(sws); + + free_plane(src); + free_plane(dst); + + return 0; +} From patchwork Tue Feb 20 02:49:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 46384 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp1614509pzb; Mon, 19 Feb 2024 18:49:44 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXO+YwmW5+NgAuoEDdE/M5a+Rq/aCAGeowBWFGuR6SjOEDj4g2d1QHdMuS2XWt3u23/sKP5j806N8TGF1D8Ek0o06jAFON6hAjxWw== X-Google-Smtp-Source: AGHT+IFaoxrReEzcOHV+mj6zS6sr+P1+yMcz5X42ZlIXBOqlzD6TsC7Lnpd1oLUJ6pExii0WwKLS X-Received: by 2002:a17:906:c7d6:b0:a3e:b726:20ef with SMTP id dc22-20020a170906c7d600b00a3eb72620efmr2198938ejb.34.1708397384387; Mon, 19 Feb 2024 18:49:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708397384; cv=none; d=google.com; s=arc-20160816; b=fYhoFYinZAgdxomUamKewEsKf255g3fEz+EdZn/B/LyNSosVyiptCtVfRaq8FYvmd2 M12BJVy2pXF2kHWnWo3NXZP4PkbljXUNqkOJMEV0LZh0x304DvhpgcmErMAVsAobM1/2 m2mbdoCrPwkQcgfcO87hNjTyAYLs36v5gtRwt8/06WjeFSUyupH2s4nu2Hveob/8aK5R FuiD0IIFnOYhPwSxavHxHN3SL9ciAkBeFb7QrnCghVA9YzEuVGJTCbgVCNwXxCJDWGHP Qju3T4NmPsZ8BtS0arFRNwj9W4Ax4jRhmwv/M1iVLUN5PpFruyGvJ6YzZ2q2eDY6utoZ BcVQ== 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:dkim-signature:delivered-to; bh=xLPjjLFVY0Rxg/G8hp1/gOCB1G2O1QhVoKVfpjTP0s8=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=gNRUgkekyVgkPXl1RTg5ywMVJQWRIlQfZ0l9qskMu9fLhDn4xZjV4RiEYEUnofm0G6 QesL7iJbiV573kVz9AE+OKRb+zETrGY616LRSb+0gfx5KQdMkhdwJRbxdUL3kr8LjuR1 +ksWEp0cU6dqjRCjMk9EPQqgw+7j30T1W1lU9CKffuqUhnekqAeuTSqiEMwG8kLzoDu9 q95HMjZnLsFgy0V2icG0Kwzd9anfyLYS4AgmpK8imsx57J078m3nMgSOyaWqV5aL/Xsp nP/hZs983Du3Sn5P6VlePhnSHmCEAdHcofztlf5aq/NjFxuclMgRjvNEtcGQZCCcSW+y OiOg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="OV/NTb1h"; 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 gx3-20020a170906f1c300b00a3f01279328si69473ejb.107.2024.02.19.18.49.43; Mon, 19 Feb 2024 18:49:44 -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=@niedermayer.cc header.s=gm1 header.b="OV/NTb1h"; 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 2056D68D44C; Tue, 20 Feb 2024 04:49:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9158B68C248 for ; Tue, 20 Feb 2024 04:49:24 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id C0D8DE0002 for ; Tue, 20 Feb 2024 02:49:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1708397363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=TFIlpQAqtQF5AtC95gl3/dHot2anc+MorwbmQvmeIDI=; b=OV/NTb1hx1OUGyI6EEzKMy4exWPmBxAB3IfNNs8aLrvzcyaO9zhJJznT8hCRDrmSNNEPeX tANn80BaufCxVutrZRhQR2Puf15fXBj/xANfNWBbsnpLDjpsl/Zwlcor8ryINV5V2Sm1sf Bm+qcLkTwP6ZD5quomagpGggIJ2jrBiz39LMhMyGlVywst5sziX0BhwJ4Umr0dLvREkbE/ 10SiQsiOHou/Xv3FWfxlHH+NGGtRCo9mEjP8HUPkeLgBXGFYvrtpKsrtKJ1g9DSvrwp6dj uSn/LIjHEVEJt8oPysvEAmIPQZwzy3klnNhsm9IR4qLMF4oPaw3AHe/J+pKpMQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 20 Feb 2024 03:49:21 +0100 Message-Id: <20240220024922.22779-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240220024922.22779-1-michael@niedermayer.cc> References: <20240220024922.22779-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/3] Revert "swscale: fix sws_setColorspaceDetails after sws_init_context" 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: eSKF0Eq6ZnVM Suggested by: Niklas Haas in Ticket10824 Fixes: Assertion failure Fixes: Ticket10824 This reverts commit cedf589c09c567b72bf4c1a58db53d94622567e1. --- libswscale/swscale.c | 2 +- libswscale/utils.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 7bea5147db..fe0e74f871 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1017,7 +1017,7 @@ static int scale_internal(SwsContext *c, reset_ptr(src2, c->srcFormat); reset_ptr((void*)dst2, c->dstFormat); - if (c->convert_unscaled && !c->lumConvertRange && !c->chrConvertRange) { + if (c->convert_unscaled) { int offset = srcSliceY_internal; int slice_h = srcSliceH; diff --git a/libswscale/utils.c b/libswscale/utils.c index 4dc0fbfefb..d27128e42f 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1713,26 +1713,30 @@ static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter, if (unscaled && !usesHFilter && !usesVFilter && c->alphablend != SWS_ALPHA_BLEND_NONE && isALPHA(srcFormat) && + (c->srcRange == c->dstRange || isAnyRGB(dstFormat)) && alphaless_fmt(srcFormat) == dstFormat ) { c->convert_unscaled = ff_sws_alphablendaway; if (flags & SWS_PRINT_INFO) av_log(c, AV_LOG_INFO, - "alpha blendaway %s -> %s special converter is available\n", + "using alpha blendaway %s -> %s special converter\n", av_get_pix_fmt_name(srcFormat), av_get_pix_fmt_name(dstFormat)); return 0; } /* unscaled special cases */ - if (unscaled && !usesHFilter && !usesVFilter) { + if (unscaled && !usesHFilter && !usesVFilter && + (c->srcRange == c->dstRange || isAnyRGB(dstFormat) || + isFloat(srcFormat) || isFloat(dstFormat))){ ff_get_unscaled_swscale(c); if (c->convert_unscaled) { if (flags & SWS_PRINT_INFO) av_log(c, AV_LOG_INFO, - "unscaled %s -> %s special converter is available\n", + "using unscaled %s -> %s special converter\n", av_get_pix_fmt_name(srcFormat), av_get_pix_fmt_name(dstFormat)); + return 0; } } From patchwork Tue Feb 20 02:49:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 46385 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp1614556pzb; Mon, 19 Feb 2024 18:49:52 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUSzLv28DXwzOugK0YQ+c2NSSNvS8UAEuUvs1//Kwj0PhzmUoZ9sm73dmS9I58I57An5ElDxgKyfUR4AZcpxLIUE3CcJ89mpXJNlw== X-Google-Smtp-Source: AGHT+IHAXoUyJvAtA42edjEMVaE3RCNFQUo2YUYCJ878z+YHJWn1RLYS+2SBL+9qv2JmOnaWyHZY X-Received: by 2002:a05:6512:1327:b0:512:99a3:62eb with SMTP id x39-20020a056512132700b0051299a362ebmr7068742lfu.54.1708397392296; Mon, 19 Feb 2024 18:49:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708397392; cv=none; d=google.com; s=arc-20160816; b=DxWvkYd5y2xZC9nXenhG63J511vOZdYuWlwcy5veQPaUn66dYcclSdx5EzP5t7AV1M v9IBUHVJidm8/3JESAuF8syecVjGUcdeB8j6r7+h8PZeJCZNJ+2cZZPLdZQtkddZ+VJO AEXkOGgCu7g24GAyjY4WgnSDDlFCDjfaRgzh9LqaJ4MVCYZC52L3UKG16SVcqASUtdho 4RPEct6hx61nRSEEZBtqJxGvq9bwnAcdT6q16Yuoo14Q6Y8/E0O304dgoENYYK9UP/Yz LPa1hxewct+jY5H38uSP8CgsX844fLtAaAKN+4ZKf0qtYkppaaDoIA4a93QiKJLDYOF/ WB0Q== 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:dkim-signature:delivered-to; bh=KN49mJ+hFKA32bTQYAIAjDEHgNwqUKnSnzYPUfHSpvI=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=d09/rwUCPVnMjSX5AXFU5YpV8NuPXnw6Al2srYOJI8TVutpahaJUQprVjpifyW/3Pw GnuyUMunEhzIEzaBwhbT51w8zrA6tvSu6MaMNgIG5gGPElKjpA8Ce5cZEOR+B24j4TVp 3i6AcqNiIyi7TKJS0aGMXiEFmddafKWigWqnQ68W7kXXfP1kdBI3n5UOMQDbfZ9v/XGB IPcAg1vCWzEb32OoW2XotJLQLAKPxlzTQsogOxGVqIm0m5+X/cV+e5EeHp/n7F+6d50l fi0ueT7rjs8vrX9q6l0X5lVovdTMIz4aFFcvRj+lU+d2ETucOTYUlxuy6PgnZBlsvric +Xxw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="LrG47/tz"; 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 c26-20020a170906529a00b00a3dfa38bb6fsi3110946ejm.645.2024.02.19.18.49.51; Mon, 19 Feb 2024 18:49:52 -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=@niedermayer.cc header.s=gm1 header.b="LrG47/tz"; 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 4451968C248; Tue, 20 Feb 2024 04:49:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 10D3068C248 for ; Tue, 20 Feb 2024 04:49:25 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 6DAD4E0003 for ; Tue, 20 Feb 2024 02:49:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1708397364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=XhDrDt7Xpa4/ApX3i70neE9Wx+S/0koGBQqUohXd534=; b=LrG47/tznNMf63XlEDB1QWt4Bywk8iKTEh9ithYGMEJaNKh6+/Wibgx7qatw5OiZ0y24t2 MbvODQLwier89anIzMR+GyFkA/jf+csQTSuoDax8Xsmz2Ic2otjWofJB5ObPE+WYGKAa9f +ntpH5iUOWxURbXq3tqSi3Lz9JFotvOFDpkol1f5Znh1TiXh59+5SwxUYLxzuUzgvDAxkG wkRtvoNgSROCl/rGRNzHrA//enTlsgOFmfs/idvHCSLu9GCeDeUz6spJKqhVsuZHSFECIw MpLFk0WqgmMw1/56giFLdLcKILjz43pbHPdAbTdiqVspt/pknDZQ/KibgCvHdA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 20 Feb 2024 03:49:22 +0100 Message-Id: <20240220024922.22779-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240220024922.22779-1-michael@niedermayer.cc> References: <20240220024922.22779-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/3] libswscale/utils: Fix bayer to yuvj 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: tq9scEN/+0yn Fixes: out of array access. Earlier code assumes that a unscaled bayer to yuvj420 converter exists but the later code then skips yuvj420 Signed-off-by: Michael Niedermayer --- libswscale/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index d27128e42f..ab8a68e241 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1728,7 +1728,8 @@ static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter, /* unscaled special cases */ if (unscaled && !usesHFilter && !usesVFilter && (c->srcRange == c->dstRange || isAnyRGB(dstFormat) || - isFloat(srcFormat) || isFloat(dstFormat))){ + isFloat(srcFormat) || isFloat(dstFormat) || isBayer(srcFormat))){ + ff_get_unscaled_swscale(c); if (c->convert_unscaled) {