From patchwork Wed Feb 1 05:41:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 40201 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp68789pzj; Tue, 31 Jan 2023 21:42:02 -0800 (PST) X-Google-Smtp-Source: AK7set/PLHqc4GZyWJlIAjuYplxkf/xVQnhkqsDkPMD8ssfmEmsHHGSFY27ftvj1HJMDtJoKKpPE X-Received: by 2002:aa7:c647:0:b0:49e:689:f003 with SMTP id z7-20020aa7c647000000b0049e0689f003mr766269edr.10.1675230122720; Tue, 31 Jan 2023 21:42:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675230122; cv=none; d=google.com; s=arc-20160816; b=CfPC1f1Zwp8r2pqvdjk9ibyr07Qi9swPbFcqUWE4mn6RGcmcliwH0kflQdxNsVejdN +pOgTmV8HuWTPMln3IawKH6vUWHzy50Vpoy2UUOd3piqz5ipF2GKqlQBF5ywMZok67+a EnVOBK1l5q2FFiG4pwecLwZvNBob337M014s1sEDEMjigyg30c3X0F1d/ZpJSLcGyALD 3dHlcQ8TrFcCYMgvxhE6unwrxcSfg9wI+JN8Br7zNjyAzvVAu+LA/1T4WsL+yx8/4Sf2 chp4loW7q/D/e4tvESkr3xIWVextRkpvcMe0z+TrQz4WV4cejvjSCZ48VKce/ND4LjGe +0Vg== 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:dkim-signature:delivered-to; bh=jGiLwDd6QbaOz7Z7QupNXhu/xIhDNYdhQMqOLFrGQ1k=; b=W3PqPDSOHY5hHc8B+gm6whenIQk/U77KP78dDhf2Z2ZETkTfbyeCqJ/rZ6KWUpe7la 0r6MSsc7VD4Im2HvQGERYgySEdrsTI7E4FX/0qLI+nsF+kqNSC84IDidy3knb8X9Ip3O VCCIXvDR5F0cYfEaw3YzX5gNHtsiKNLSzB0z9nGE8Z2LP6yHfgmJnpvTCXrr9NMbqDeB 4rV/vJkmN9vze9iDMqAkmgPaSFnZCifM4e2OXRme+8wJHBb+3IIWojL7staBUArAOfMB ZKb4yiSIlImDvVnj2x9s7LARVmsnxWGUSSYQ2tM/eFH5ocxzqCpmB+AjIw/dNCwNcoYE EYqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PaAgDSxg; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x18-20020a05640226d200b004a249b8e8d5si10310223edd.450.2023.01.31.21.42.02; Tue, 31 Jan 2023 21:42:02 -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=@gmail.com header.s=20210112 header.b=PaAgDSxg; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 66AFA68BEB6; Wed, 1 Feb 2023 07:41:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7CB6668BEAA for ; Wed, 1 Feb 2023 07:41:45 +0200 (EET) Received: by mail-io1-f51.google.com with SMTP id y7so3090735iob.6 for ; Tue, 31 Jan 2023 21:41:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PAHK6C78sv9zjRHtRck4h9+gTdGg5boHEpIaUrURGpw=; b=PaAgDSxg7JtB1VvWuBT3XnK8tc6KtaBVHeIH3bsMALe+m9KKFbGY1Lg1CgyKL+RLsO +zbQ8Vk+9lcISzk92+lBeQPqdubmBMSpZptZjgWuzONLzBImAfm8T7sR+ln6HZjuA4cE MvgtvxeoCAq9ie1ARV3dc5QLQqLfaJg72QmZLWEWAnv8fU5UFp4124wC6N+dqUironut OuiUGG6iJbgeBqiQevi7eIcB8AaRRM+tNrKKdKLSyj17Q0eOeZU7M5tnMyIXHTY29yUV +WJ8VNg8nYI7bd6hcEXR4cDG8MRUwaHsA7OQSaiAPSDlCo8u0osSOS8fvYBZkgVUtRFt 7QfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PAHK6C78sv9zjRHtRck4h9+gTdGg5boHEpIaUrURGpw=; b=4zHqcn1WKihPG+O3u/6rVV5T0bYqye0TuahzqgSCbs/I+2kukuLmZticzp5qxkOHVS RJBhGDZhJOOr1JOJm0NJfaxRmXVXgcCkDwZAsgnKpcDvVz4neczDVWYwzfpFm32WAjBV 2DfXM1KrJwK82U3+BfkpMowP2l/AdUTNF7b/GlBnI10Oi9E13nbuohXfotgIWspr6Jru hRGVkcCoVd/TsCqXPJlCQTnfZWIa6WNwWtpi7ty5gyGbS2lOLoo4FHUQQgPQAz44gUdY QRgtQ77VmaOu/7HFYAawavpXVsH8laRbfLgdTyLMOEMcoM1b0F7RuwB9v/TxsFja0bWv SSZQ== X-Gm-Message-State: AO0yUKVx5flDz6iTjE4lUxWIGErQkXow1l8r0JmwWkOhfuTZpXDFGPmf MwNt1B5Wk4ZQDcD997yF6xmhY02ywRkDRA== X-Received: by 2002:a6b:7808:0:b0:71d:63e5:7b5f with SMTP id j8-20020a6b7808000000b0071d63e57b5fmr674505iom.2.1675230103879; Tue, 31 Jan 2023 21:41:43 -0800 (PST) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id q5-20020a02a305000000b0035678e2e175sm3549891jai.50.2023.01.31.21.41.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 21:41:43 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Feb 2023 00:41:28 -0500 Message-Id: <20230201054129.124226-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230201054129.124226-1-leo.izen@gmail.com> References: <20230201054129.124226-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/pngdec: support sBIT chunks 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: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6f5yE3LrVW+D Add support for reading sBIT chunks, which mark the significant bit depth of the PNG file. This passes the metadata using the field bits_per_raw_sample of AVCodecContext. Signed-off-by: Leo Izen --- libavcodec/pngdec.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 0d969decf2..48313db671 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -97,6 +97,7 @@ typedef struct PNGDecContext { int bpp; int has_trns; uint8_t transparent_color_be[6]; + int significant_bits; uint32_t palette[256]; uint8_t *crow_buf; @@ -916,6 +917,55 @@ fail: return ret; } +static int decode_sbit_chunk(AVCodecContext *avctx, PNGDecContext *s, + GetByteContext *gb) +{ + int bits = 0; + + if (!(s->hdr_state & PNG_IHDR)) { + av_log(avctx, AV_LOG_ERROR, "sBIT before IHDR\n"); + return AVERROR_INVALIDDATA; + } + + switch (s->color_type) { + case 0: + bits = bytestream2_get_byteu(gb); + break; + case 2: + case 3: { + int r = bytestream2_get_byteu(gb); + int g = bytestream2_get_byteu(gb); + int b = bytestream2_get_byteu(gb); + bits = FFMAX3(r, g, b); + break; + } + case 4: { + int y = bytestream2_get_byteu(gb); + int a = bytestream2_get_byteu(gb); + bits = FFMAX(y, a); + break; + } + case 6: { + int r = bytestream2_get_byteu(gb); + int g = bytestream2_get_byteu(gb); + int b = bytestream2_get_byteu(gb); + int a = bytestream2_get_byteu(gb); + bits = FFMAX(FFMAX3(r, g, b), a); + break; + } + default: + return AVERROR_INVALIDDATA; + } + + if (bits < 0 || bits > s->bit_depth) { + av_log(avctx, AV_LOG_ERROR, "Invalid significant bits: %d\n", bits); + return AVERROR_INVALIDDATA; + } + s->significant_bits = bits; + + return 0; +} + static void handle_small_bpp(PNGDecContext *s, AVFrame *p) { if (s->bits_per_pixel == 1 && s->color_type == PNG_COLOR_TYPE_PALETTE) { @@ -1355,6 +1405,9 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, break; } + case MKTAG('s', 'B', 'I', 'T'): + decode_sbit_chunk(avctx, s, &gb_chunk); + break; case MKTAG('g', 'A', 'M', 'A'): { AVBPrint bp; char *gamma_str; @@ -1560,6 +1613,10 @@ static int output_frame(PNGDecContext *s, AVFrame *f) stereo3d->flags = s->stereo_mode ? 0 : AV_STEREO3D_FLAG_INVERT; } + /* tRNS sets alpha depth to full, so we ignore sBIT if set */ + if (!s->has_trns && s->significant_bits > 0) + avctx->bits_per_raw_sample = s->significant_bits; + FFSWAP(AVDictionary*, f->metadata, s->frame_metadata); return 0; From patchwork Wed Feb 1 05:41:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 40202 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp68853pzj; Tue, 31 Jan 2023 21:42:11 -0800 (PST) X-Google-Smtp-Source: AK7set/52q5pFjhSBRIQQj6F66Ir7b+jtks+jFuozN/0HFcl0bdYICMNE+qGLA8tqnTu8r6f0wE2 X-Received: by 2002:a17:907:3e82:b0:885:8f79:d6d7 with SMTP id hs2-20020a1709073e8200b008858f79d6d7mr1315027ejc.61.1675230131216; Tue, 31 Jan 2023 21:42:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675230131; cv=none; d=google.com; s=arc-20160816; b=X/b5vVyniEef0zbPkSzDG3JB3ArgattAkFQ4KEx1/Ljs3pnxD3MiePEv28dEt2P9IP NHPI+OeYTV+KFa1QFxkFDBrBWrrRYtjJrKEyXcsHRgqQeQ5gOry4UWV2XqG8e099jWRD OkP/7ERxKd7JcGTmPflG8mmsRQ/hLNXcBvRz/p8uXj3lRTX2QDP8+1h+K16OjjKdQAKN tmZwo7tyTKYFKpsYXAQrAvcabiA4SPc+sIPSMOK03wNuOpvwPeqM75FYPjQ94/zVlLeT 42JtRop0CghhNbjL7tftjvF5pl/c99GQP20iYrrKJBg+ARG647C/+ZSBnbcCxY2hGUyI /aGA== 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:dkim-signature:delivered-to; bh=hcKoD/Sl7gEQy9T9JNO8SiM/ip9/lbfdfg4DDPv9HZ8=; b=r0dggjPZ+9UPEdaU35jpkvd62thbY8tJdo2lJjI2cfMnpNJEcD+uAIlvl/e803Ykus 04QoX5NaucSg2mWkuXKeOp2h/42oJ3IrA/ojmCpkmNGxo1DyakDGDIqynCKZQDo8u36t 0nCbnumqDJkzuhpw+C2lp8l8TdMKgsUrrRkLhyT/devgUfZKtkPfxKqHEeUaVu+EMjRk upxdqiPscAnP49uEkDd3W/SbOTVnnJse+u10Ckn/do2rlhpuU5DekaSrHu5VjCfFGBDV TMp0g9IKD4VLi4IzGPEqUpf+P/mpUIieNAqoey0muRrIamRtzhX5X1j90mLxKPFwXvZN Y8XA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=fwTut754; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fh15-20020a1709073a8f00b0088aa09de654si5783736ejc.766.2023.01.31.21.42.10; Tue, 31 Jan 2023 21:42:11 -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=@gmail.com header.s=20210112 header.b=fwTut754; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C3A568BEC2; Wed, 1 Feb 2023 07:41:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB12768BEAA for ; Wed, 1 Feb 2023 07:41:46 +0200 (EET) Received: by mail-il1-f181.google.com with SMTP id l15so3664715ilj.5 for ; Tue, 31 Jan 2023 21:41:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QurPmiFdMb1oZIr2p1gdInjTmf5TObwWR5sd9OrRXIs=; b=fwTut754SEsma7VKqNf9/E97B/0qGIUBRwqCRy/Zg9uwF9cHy4nmxupvmUmCT7SLn9 zIpshF31GNwARuFbMyh7X1Z+vMbAck13x3Zog6udNpnhfCdQDPofpYCI8dJVfzGG3l8S tBjREAp8e4gt5fKDwvVDHHItBZA/Pwq4rZ+7wyI3sUegWEkjlG25T9g3MB++XB5Ku13f Ethk1wzMqOoNCt7etQ8qgAbhabrYJKaYWI7YdTHVbu74LiIU568RKNTmyFlmU1SsGJ87 wr2IXLsXHYh4xZzzgLj8yfntedej3SzjInsMZkEtgsDCbJOBn5ICTg3AgzW58g/vSMk1 cggg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QurPmiFdMb1oZIr2p1gdInjTmf5TObwWR5sd9OrRXIs=; b=SFPPM6HZI/S13wn9dfdKiVbJJueoLRn+2/xGAkBY271VyOzIZAUsJYq15ZAqKnrQ1C JZigwdtkH5WFJXiBsDuW8LaD6+MLVDxCTzsoEcSYPTOg6lxfHIEiprHcYGnfEujlxY/F dIIeYKX5BAfvN1ndwX9NKDQfTw8clKlIa/n0Ytyjql60TbuF5/RqgRcaRREiB4aFx7Gn 9Xj3ipPQ7QEuIZd28wlNskkmpmDB4jBsGQWvSJqzBl9BDLSZbiBbatZ8EknhYDhV549w jEAWCZSc7El8XrtnKva4StTYS2LjHX1dPIPiC4ib1ktnsYlZ9CVNjtSfUnY5HBuECrJO ngzw== X-Gm-Message-State: AO0yUKVnBOzu88E3majjbJXiHsijaf2Me/ArLBROeUHJvciSSnbmyaKO ji15sfM9J54YXwXeQfPY9z+Bn7ICzHhvyA== X-Received: by 2002:a05:6e02:152:b0:310:cc70:a152 with SMTP id j18-20020a056e02015200b00310cc70a152mr823707ilr.2.1675230105300; Tue, 31 Jan 2023 21:41:45 -0800 (PST) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id q5-20020a02a305000000b0035678e2e175sm3549891jai.50.2023.01.31.21.41.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 21:41:45 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Feb 2023 00:41:29 -0500 Message-Id: <20230201054129.124226-3-leo.izen@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230201054129.124226-1-leo.izen@gmail.com> References: <20230201054129.124226-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/pngenc: write sBIT chunks 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: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: yZQwo57PsUC5 Add support for writing sBIT chunks, which mark the significant bit depth of the PNG file. This obtains the metadata using the field bits_per_raw_sample of AVCodecContext. Signed-off-by: Leo Izen --- libavcodec/pngenc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 2393161c3b..0961125f0a 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -432,6 +432,13 @@ static int encode_headers(AVCodecContext *avctx, const AVFrame *pict) if (png_get_gama(pict->color_trc, s->buf)) png_write_chunk(&s->bytestream, MKTAG('g', 'A', 'M', 'A'), s->buf, 4); + if (avctx->bits_per_raw_sample > 0 && avctx->bits_per_raw_sample < s->bit_depth) { + size_t len = s->color_type == 0 ? 1 : s->color_type == 2 || s->color_type == 3 ? 3 : + s->color_type == 4 ? 2 : 4; + memset(s->buf, avctx->bits_per_raw_sample, len); + png_write_chunk(&s->bytestream, MKTAG('s', 'B', 'I', 'T'), s->buf, len); + } + side_data = av_frame_get_side_data(pict, AV_FRAME_DATA_ICC_PROFILE); if ((ret = png_write_iccp(s, side_data))) return ret;