From patchwork Wed Dec 6 08:22:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 44953 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9153:b0:181:818d:5e7f with SMTP id x19csp106417pzc; Wed, 6 Dec 2023 00:23:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IGdxpvXD0NNMgzguaV4t9S46f82nuPTXQioLyED+oxIizbbtj0Fz42+NcNxZcZ88JFqNfF/ X-Received: by 2002:a50:f603:0:b0:54b:f6f7:9c4d with SMTP id c3-20020a50f603000000b0054bf6f79c4dmr373410edn.38.1701850994286; Wed, 06 Dec 2023 00:23:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701850994; cv=none; d=google.com; s=arc-20160816; b=cOn/YN9Ruc0NTIia/gHIC7KG8GaLehdPHTie7S4+f7OK71WfttCVwkdKXqWHAl7WYQ 3OKXhq749vaA7P75cxP/9TlFrveEmEA+xomulf+6ax8PeWeqL4JE6Ynzmd24ntt1d/Fs H84slojwsCOF1Fpz8LBu15sZW6N4rVG9zEQGiiAY5ZAs5wwYfRUBj9WYoCwd99CM6rZN uLWCFeicP6T5PNvCiqwEJSLpkJAbPu84VHJKlDa8NnitIw1PPp/cqNh1qbw086fFQZsm lhMixcIMaHCNzwskZY872RuJnERiOkBBXt/EB9hR6xBede6LNjzLoIbnj6zUfU99hyiN BL7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=oZuMCqP3qLHaL/kzPtOvd/kZ9SRwu+Yl8zv0QJ+vMkM=; fh=s+G8Ss4JbeMFkWPSp2LmIH/LXFyBlALRiww1j3FPjHY=; b=zDy4bymwpv/u50Tdfn1LGkdTUMnN/Shyr/UGLcklvgNWzJUbz8R991od3xPsp+B8rh wPHu1+uBObmbHIaeys2AbyZMIv+Cr4kA+s2k0X/2vKD25Bw/a2mB+AX3Ula0k0DPW84B K9mBi+SIkRk9A3U7JOnUXgthiXziTt55Z3Xp2L3YTcjgfmOMKPFuLUVU4WYg/c4B/qo2 sH2mauzt0z/XLgEaJBYjyRpSNQu5jHn5QoBS4KVxBUq+ybTciRLbYG8SEOG8k0I0R2XE RQkaz9w3KfA/1jqFuKkV2bIfCfDijg0XzWIBbj39ep5bJSbsxv5JT4zT30fiPffl3/jg ARMA== 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 k16-20020a508ad0000000b0054cb2a0de51si1804773edk.128.2023.12.06.00.23.13; Wed, 06 Dec 2023 00:23:14 -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; 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 9756A68CF59; Wed, 6 Dec 2023 10:22:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 666B568CEDF for ; Wed, 6 Dec 2023 10:22:32 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 4B355E9A28; Wed, 6 Dec 2023 09:22:32 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Lnu_zXjdmh9f; Wed, 6 Dec 2023 09:22:30 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 974B1E9A24; Wed, 6 Dec 2023 09:22:28 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Dec 2023 09:22:17 +0100 Message-Id: <20231206082220.5532-4-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231206082220.5532-1-cus@passwd.hu> References: <20231206082220.5532-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/7] avutil/imgutils: add support for 32bit pixel format for av_image_fill_black() 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: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hPX57EK8f0OH Signed-off-by: Marton Balint --- libavutil/imgutils.c | 33 +++++++++++++++++++++++---------- tests/ref/fate/imgutils | 24 ++++++++++++------------ 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 5e401139c8..67119b0870 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -590,7 +590,7 @@ int av_image_fill_black(uint8_t * const dst_data[4], const ptrdiff_t dst_linesiz uint8_t clear_block[4][MAX_BLOCK_SIZE] = {{0}}; // clear padding with 0 int clear_block_size[4] = {0}; ptrdiff_t plane_line_bytes[4] = {0}; - int rgb, xyz, pal, limited, alpha, bitstream; + int rgb, xyz, pal, limited, alpha, bitstream, fltp; int plane, c; if (!desc || nb_planes < 1 || nb_planes > 4 || desc->flags & AV_PIX_FMT_FLAG_HWACCEL) @@ -602,6 +602,7 @@ int av_image_fill_black(uint8_t * const dst_data[4], const ptrdiff_t dst_linesiz limited = !rgb && !xyz && !pal && range != AVCOL_RANGE_JPEG; alpha = !pal && !!(desc->flags & AV_PIX_FMT_FLAG_ALPHA); bitstream = !!(desc->flags & AV_PIX_FMT_FLAG_BITSTREAM); + fltp = !!(desc->flags & AV_PIX_FMT_FLAG_FLOAT); for (c = 0; c < desc->nb_components; c++) { const AVComponentDescriptor comp = desc->comp[c]; @@ -621,11 +622,11 @@ int av_image_fill_black(uint8_t * const dst_data[4], const ptrdiff_t dst_linesiz int w = (bitstream ? 8 : 1) * clear_block_size[comp.plane] / comp.step; uint8_t *c_data[4]; const int c_linesize[4] = {0}; - uint16_t src_array[MAX_BLOCK_SIZE]; - uint16_t src = 0; + uint32_t src_array[MAX_BLOCK_SIZE]; + uint32_t src = 0; int x; - if (comp.depth > 16) + if (comp.depth > 32) return AVERROR(EINVAL); if (w < 1) return AVERROR(EINVAL); @@ -634,15 +635,27 @@ int av_image_fill_black(uint8_t * const dst_data[4], const ptrdiff_t dst_linesiz src = 1; } else if (c + 1 == desc->nb_components && alpha) { // (Assume even limited YUV uses full range alpha.) - src = (1 << comp.depth) - 1; + if (fltp) { + if (comp.depth != 16 && comp.depth != 32) + return AVERROR(EINVAL); + src = (comp.depth == 16 ? 0x3C00 : 0x3F800000); // 1.0 + } else { + src = (comp.depth == 32 ? 0 : (1 << comp.depth)) - 1; + } } else if (c == 0 && limited && comp.depth > 1) { - if (comp.depth < 8) + if (comp.depth < 8 || (fltp && comp.depth != 16 && comp.depth != 32)) return AVERROR(EINVAL); - src = 16 << (comp.depth - 8); + if (fltp) + src = (comp.depth == 16 ? 0x3000 : 0x3D800000); // 0.0625 + else + src = 16 << (comp.depth - 8); } else if ((c == 1 || c == 2) && !rgb && !xyz) { - if (comp.depth < 8) + if (comp.depth < 8 || fltp && comp.depth != 16 && comp.depth != 32) return AVERROR(EINVAL); - src = 128 << (comp.depth - 8); + if (fltp) + src = (comp.depth == 16 ? 0x3800 : 0x3F000000); // 0.5 + else + src = 128 << (comp.depth - 8); } for (x = 0; x < w; x++) @@ -651,7 +664,7 @@ int av_image_fill_black(uint8_t * const dst_data[4], const ptrdiff_t dst_linesiz for (x = 0; x < 4; x++) c_data[x] = &clear_block[x][0]; - av_write_image_line(src_array, c_data, c_linesize, desc, 0, 0, c, w); + av_write_image_line2(src_array, c_data, c_linesize, desc, 0, 0, c, w, 4); } for (plane = 0; plane < nb_planes; plane++) { diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils index c31bc38d77..fb2ed6d158 100644 --- a/tests/ref/fate/imgutils +++ b/tests/ref/fate/imgutils @@ -435,14 +435,14 @@ p016le total_size: 9216, black_unknown_crc: 0xfff85b60, black_tv_cr p016be total_size: 9216, black_unknown_crc: 0x4d4d9903, black_tv_crc: 0x4d4d9903, black_pc_crc: 0x69c6fe01 gray9be total_size: 6144, black_unknown_crc: 0xa913cdc7, black_tv_crc: 0xa913cdc7, black_pc_crc: 0x00000000 gray9le total_size: 6144, black_unknown_crc: 0x05a944de, black_tv_crc: 0x05a944de, black_pc_crc: 0x00000000 -gbrpf32be total_size: 36864, black_unknown_crc: ----------, black_tv_crc: ----------, black_pc_crc: ---------- -gbrpf32le total_size: 36864, black_unknown_crc: ----------, black_tv_crc: ----------, black_pc_crc: ---------- -gbrapf32be total_size: 49152, black_unknown_crc: ----------, black_tv_crc: ----------, black_pc_crc: ---------- -gbrapf32le total_size: 49152, black_unknown_crc: ----------, black_tv_crc: ----------, black_pc_crc: ---------- +gbrpf32be total_size: 36864, black_unknown_crc: 0x00000000, black_tv_crc: 0x00000000, black_pc_crc: 0x00000000 +gbrpf32le total_size: 36864, black_unknown_crc: 0x00000000, black_tv_crc: 0x00000000, black_pc_crc: 0x00000000 +gbrapf32be total_size: 49152, black_unknown_crc: 0xda9c5af9, black_tv_crc: 0xda9c5af9, black_pc_crc: 0xda9c5af9 +gbrapf32le total_size: 49152, black_unknown_crc: 0xd2f28790, black_tv_crc: 0xd2f28790, black_pc_crc: 0xd2f28790 gray14be total_size: 6144, black_unknown_crc: 0x9bd1ea2b, black_tv_crc: 0x9bd1ea2b, black_pc_crc: 0x00000000 gray14le total_size: 6144, black_unknown_crc: 0xb5289bc0, black_tv_crc: 0xb5289bc0, black_pc_crc: 0x00000000 -grayf32be total_size: 12288, black_unknown_crc: ----------, black_tv_crc: ----------, black_pc_crc: ---------- -grayf32le total_size: 12288, black_unknown_crc: ----------, black_tv_crc: ----------, black_pc_crc: ---------- +grayf32be total_size: 12288, black_unknown_crc: 0x4bafcc11, black_tv_crc: 0x4bafcc11, black_pc_crc: 0x00000000 +grayf32le total_size: 12288, black_unknown_crc: 0xca17685c, black_tv_crc: 0xca17685c, black_pc_crc: 0x00000000 yuva422p12be total_size: 18432, black_unknown_crc: 0xa7067ca1, black_tv_crc: 0xa7067ca1, black_pc_crc: 0xaa881b51 yuva422p12le total_size: 18432, black_unknown_crc: 0xb6bdf055, black_tv_crc: 0xb6bdf055, black_pc_crc: 0x55b03edf yuva444p12be total_size: 24576, black_unknown_crc: 0x488f478f, black_tv_crc: 0x488f478f, black_pc_crc: 0xc6fb24d1 @@ -464,8 +464,8 @@ p216le total_size: 12288, black_unknown_crc: 0x6582d6cf, black_tv_cr p416be total_size: 18432, black_unknown_crc: 0x26991800, black_tv_crc: 0x26991800, black_pc_crc: 0xfe7f6700 p416le total_size: 18432, black_unknown_crc: 0x4028ac30, black_tv_crc: 0x4028ac30, black_pc_crc: 0xab7c7698 vuya total_size: 12288, black_unknown_crc: 0x60db2d2c, black_tv_crc: 0x60db2d2c, black_pc_crc: 0x2dae630a -rgbaf16be total_size: 24576, black_unknown_crc: 0x0ab5caf6, black_tv_crc: 0x0ab5caf6, black_pc_crc: 0x0ab5caf6 -rgbaf16le total_size: 24576, black_unknown_crc: 0x0ab5caf6, black_tv_crc: 0x0ab5caf6, black_pc_crc: 0x0ab5caf6 +rgbaf16be total_size: 24576, black_unknown_crc: 0x76fd69af, black_tv_crc: 0x76fd69af, black_pc_crc: 0x76fd69af +rgbaf16le total_size: 24576, black_unknown_crc: 0x21283f40, black_tv_crc: 0x21283f40, black_pc_crc: 0x21283f40 vuyx total_size: 12288, black_unknown_crc: 0x9181c808, black_tv_crc: 0x9181c808, black_pc_crc: 0xdcf4862e p012le total_size: 9216, black_unknown_crc: 0xfff85b60, black_tv_crc: 0xfff85b60, black_pc_crc: 0xc03cff93 p012be total_size: 9216, black_unknown_crc: 0x4d4d9903, black_tv_crc: 0x4d4d9903, black_pc_crc: 0x69c6fe01 @@ -475,10 +475,10 @@ xv30be total_size: 12288, black_unknown_crc: 0x1c42115f, black_tv_cr xv30le total_size: 12288, black_unknown_crc: 0x4bb0b075, black_tv_crc: 0x4bb0b075, black_pc_crc: 0x02d585cf xv36be total_size: 24576, black_unknown_crc: 0x6ba828bd, black_tv_crc: 0x6ba828bd, black_pc_crc: 0x5f450f41 xv36le total_size: 24576, black_unknown_crc: 0xc3794950, black_tv_crc: 0xc3794950, black_pc_crc: 0x40874939 -rgbf32be total_size: 36864, black_unknown_crc: ----------, black_tv_crc: ----------, black_pc_crc: ---------- -rgbf32le total_size: 36864, black_unknown_crc: ----------, black_tv_crc: ----------, black_pc_crc: ---------- -rgbaf32be total_size: 49152, black_unknown_crc: ----------, black_tv_crc: ----------, black_pc_crc: ---------- -rgbaf32le total_size: 49152, black_unknown_crc: ----------, black_tv_crc: ----------, black_pc_crc: ---------- +rgbf32be total_size: 36864, black_unknown_crc: 0x00000000, black_tv_crc: 0x00000000, black_pc_crc: 0x00000000 +rgbf32le total_size: 36864, black_unknown_crc: 0x00000000, black_tv_crc: 0x00000000, black_pc_crc: 0x00000000 +rgbaf32be total_size: 49152, black_unknown_crc: 0x5eae6680, black_tv_crc: 0x5eae6680, black_pc_crc: 0x5eae6680 +rgbaf32le total_size: 49152, black_unknown_crc: 0x11d73f6d, black_tv_crc: 0x11d73f6d, black_pc_crc: 0x11d73f6d p212be total_size: 12288, black_unknown_crc: 0x0bbe5df7, black_tv_crc: 0x0bbe5df7, black_pc_crc: 0x16a51378 p212le total_size: 12288, black_unknown_crc: 0x6582d6cf, black_tv_crc: 0x6582d6cf, black_pc_crc: 0xc9dc3ddf p412be total_size: 18432, black_unknown_crc: 0x26991800, black_tv_crc: 0x26991800, black_pc_crc: 0xfe7f6700