From patchwork Wed Mar 22 03:26:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 40778 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp3078571pzb; Tue, 21 Mar 2023 20:26:57 -0700 (PDT) X-Google-Smtp-Source: AK7set/Prqh1fOMb7bwt+UTIlbRJmWWaFQydn5p1HWQFimS/CYMErglQ7T2PEmne/rwHxNYnVKzu X-Received: by 2002:aa7:d419:0:b0:4fc:3cd1:37c8 with SMTP id z25-20020aa7d419000000b004fc3cd137c8mr5648622edq.22.1679455617346; Tue, 21 Mar 2023 20:26:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679455617; cv=none; d=google.com; s=arc-20160816; b=oK0v8WQ9gbM4LltL6ZV7Y8LUt7DtLievxmDu/eadWpwIjLFhRS24pYrwgRw3qWmcet NXoo3mjoUXT8Pwo5PudE/Qv26WJvWQB5Gwn0tNJ5gMgUSi14iZdNG+xVAeejfeoZPOOq ZIyUJP7nmrD1dA5Zb2T8B7RI2MawikO4T1Xt5FeQU5+Ggcae9yVpTHpP77scDkMCidVP frJbvzDNbdoP420+rtdRT959EBGZ5FksKqSeWehmwFdD/wFWCSfnxr02NznIv2EmeYWS nNfTSS3Iwiq+9oRIcjYb2hj+zDWLAhuqi2Vir1JlWv2XZ828rgYSA+PH5KfVViw3FbwO k+mQ== 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=Loa4zAHIi7av/WLaU7JmAI0R1XhDiQCD6IfPWgaHKTc=; b=jUQIV5HBX7unhKOiYqNpdWOoVUJoUZ97aXUdnt6Ul4dxx1L/MN61MEA9jDbcjnyBl+ AxRExWPndVoA3q6NL033ffnNuvljsCb50/2lT7+TZlgGgeCLBkQRL84xHzeVlvJG0+N8 2lOSxM5lC3pw67GgifjzWAAYGwLEyTNAWDPZy9qlLp6sSMcToeoyHkT3Hu5fXf8ZbbRm OUscYlQZLGuIm3IkyZ5fy4Os3tBA3+TpMLyFg9UZeo7VtzI3OGV0gf11bcqAL5hibPaP zrIYQnlSthp5+20/nXD6jA/2GzSgjKUefSg8hsQA13MqiJYaRPcB0s2xWjDz0j6viBi+ gZyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ZWSNzIbl; 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 g15-20020aa7d1cf000000b004fe9656939esi14718249edp.385.2023.03.21.20.26.56; Tue, 21 Mar 2023 20:26: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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ZWSNzIbl; 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 C66B068C25E; Wed, 22 Mar 2023 05:26:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 85E5268C16E for ; Wed, 22 Mar 2023 05:26:41 +0200 (EET) Received: by mail-io1-f42.google.com with SMTP id k17so7906864iob.1 for ; Tue, 21 Mar 2023 20:26:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679455600; 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=f5YiMtKI08bDCzxVQ1ZuDUhGWUUiCqqXMUdKmap2+1c=; b=ZWSNzIblGXcmbGxW73/wIwiEFX80UgJjlpcV0H7Qvf2BYWLpvJx3UvKpFPji3/JhE3 Uq+aPvaldefd+kfUsaTjbkcpXoS5nwd1ClJmqJURwemioYSWZaRf/dvFGolxj2uArpm5 alBrxKBGgfCdIczN7c5YorMEh9WEDK4KAlAI/esJZ7AxWlyupYyNj3UOejZnd2byAjh8 4y96Z6zJBZ7Zk7rBWPJumYzZTPBcVH9Sv0AuxbfyCcC57watp09JwkEAOHXlAFs4Babp 0JRIszdkqxn97iHxWTMbxxw0FIf5omuOhyDMxIUEcGSnlWroKEQzGuYOI2Sq6F/q9MuO lNNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679455600; 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=f5YiMtKI08bDCzxVQ1ZuDUhGWUUiCqqXMUdKmap2+1c=; b=SaX97OAhIAhdmyCACbxl2L82Z+x/whPXVnMxsYm44373eDAQ+2KnFlJ1d858h04k3q EinmP2uxTYvg4hpgkTtK68j9dl15UoOzXZrkZESBMol8t/sfGkyUF4z6Gfa3TtdiCSBm 2qoE39ZldukT3rhaDsVXXxj0ITy0edwWR7swnmqww/XVr42VgfOtDszlCwbY/9pTmSlD bD/Mmdtp93YXMZwIKQ11Ndo2jpRQwb1opUtNzkrustBDx34Qf1XcZV7VcW0/pN5EeDJ3 jLKf1Y6ourR5N36O7DoW1CeTfgKKtratnvo7lduxQFYdQexrXQfk1bMxkFRq6FiPh94e D+8g== X-Gm-Message-State: AO0yUKW+HSqu8JacxgBTfEDn9Y6s6qmNA0pmQ7I7bI0jadDp7kuFadti 1h2DyJ6oNavbHZXRKDDemGHAkwd2g9CMkQ== X-Received: by 2002:a6b:2ac2:0:b0:740:7d21:d96f with SMTP id q185-20020a6b2ac2000000b007407d21d96fmr2761495ioq.1.1679455599870; Tue, 21 Mar 2023 20:26:39 -0700 (PDT) Received: from gauss.local (c-98-224-219-15.hsd1.mi.comcast.net. [98.224.219.15]) by smtp.gmail.com with ESMTPSA id cd8-20020a0566381a0800b00406521ad090sm3710594jab.94.2023.03.21.20.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 20:26:39 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Mar 2023 23:26:25 -0400 Message-Id: <20230322032626.45777-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230322032626.45777-1-leo.izen@gmail.com> References: <20230322032626.45777-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: dgyH+ULYHgBT 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 | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 9403d72f2f..8fbb71f60f 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -98,6 +98,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; @@ -716,6 +717,14 @@ static int populate_avctx_color_fields(AVCodecContext *avctx, AVFrame *frame) avctx->colorspace = frame->colorspace = AVCOL_SPC_RGB; avctx->color_range = frame->color_range = AVCOL_RANGE_JPEG; + /* + * tRNS sets alpha depth to full, so we ignore sBIT if set. + * As a result we must wait until now to set + * avctx->bits_per_raw_sample in case tRNS appears after sBIT + */ + if (!s->has_trns && s->significant_bits > 0) + avctx->bits_per_raw_sample = s->significant_bits; + return 0; } @@ -996,6 +1005,41 @@ fail: return ret; } +static int decode_sbit_chunk(AVCodecContext *avctx, PNGDecContext *s, + GetByteContext *gb) +{ + int bits = 0; + int channels; + + if (!(s->hdr_state & PNG_IHDR)) { + av_log(avctx, AV_LOG_ERROR, "sBIT before IHDR\n"); + return AVERROR_INVALIDDATA; + } + + if (s->pic_state & PNG_IDAT) { + av_log(avctx, AV_LOG_ERROR, "sBIT after IDAT\n"); + return AVERROR_INVALIDDATA; + } + + channels = ff_png_get_nb_channels(s->color_type); + + if (bytestream2_get_bytes_left(gb) != channels) + return AVERROR_INVALIDDATA; + + for (int i = 0; i < channels; i++) { + int b = bytestream2_get_byteu(gb); + bits = FFMAX(b, bits); + } + + 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) { @@ -1440,6 +1484,10 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, break; } + case MKTAG('s', 'B', 'I', 'T'): + if ((ret = decode_sbit_chunk(avctx, s, &gb_chunk)) < 0) + goto fail; + break; case MKTAG('g', 'A', 'M', 'A'): { AVBPrint bp; char *gamma_str; From patchwork Wed Mar 22 03:26:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 40779 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp3078630pzb; Tue, 21 Mar 2023 20:27:08 -0700 (PDT) X-Google-Smtp-Source: AK7set8W+JpPHVpMOdwWkP9LYJiMddWpZFnN9ygww49tp74Yvhll08ZKzvJzRm2mMQt8uZqUKuYD X-Received: by 2002:a17:906:6c91:b0:922:d34e:2ba1 with SMTP id s17-20020a1709066c9100b00922d34e2ba1mr5663434ejr.63.1679455628608; Tue, 21 Mar 2023 20:27:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679455628; cv=none; d=google.com; s=arc-20160816; b=gRf6H//p+Oa9+8nYqcgWm4lSMafOXVAOq9HP3S0jULL9nhnY9S6GnHvvrg6kizMIKz 1ap09AV4CMLvLaga70JHFT1hGxPPtH00RxxLa69UGSiDEny930OEk3KmCRZzaUZFPtrO uOZxuaFhY7ZufcBOKNSaWh5XqDrPFd/wkZd0ubNwlA6y2bbwbREjGZHDHdYR1gzyj8MP crLxFAbQggSsJYgoo1thlZPobqE49EQQBDiBDiKC04Ezvbj5Y5nqv9KRVaDldbtkgow+ n2DH4txOqBivImTS+UFqKD7DSFiieVoBwRLU3EBXCOKBrnZG68wKwcPN/3ybwq3wGyd2 PBpA== 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=ljeHP2yOVusb/2U4FT1cOXHBO4H4xiptp/EKHAi/7tA=; b=d3ofI9zs/lXnnW4k40uunkRupvlZOBF4K45+DcD1cbMOfFbusrlpRw2obZI1en9fST DBVaTtoIr69uyC/ULPJoVIz8/Ed1upZJhHnPlBuBUqF2zhGDIOMAVylXxAhBpCtCUDpn TX9bLfPcPjlYJAtGSqvIkMbtQCPHQHNLnj197UGIir32BLg+RpHlvT1juqoGdNJJ1Jw6 0Kcewmccj+aL0jXONM0jK39+V0Q+rk4y2C79vpNIOZzrztrzk7WOxzW1TfD3+1b1Q2pM dl/NkyHWq6W+ORl5g6Lh82BqcV13eE7PbWFQ248ughDxnBncaI1FoymfwzhBLEihWBeA It3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Rzco8ngt; 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 nc12-20020a1709071c0c00b009333ffa651csi12058699ejc.258.2023.03.21.20.27.08; Tue, 21 Mar 2023 20:27:08 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Rzco8ngt; 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 1381A68C455; Wed, 22 Mar 2023 05:26:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f47.google.com (mail-io1-f47.google.com [209.85.166.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E179C68C25B for ; Wed, 22 Mar 2023 05:26:42 +0200 (EET) Received: by mail-io1-f47.google.com with SMTP id d14so5022455ion.9 for ; Tue, 21 Mar 2023 20:26:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679455601; x=1682047601; 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=kkvjdQ/gIOr58R0xm6rsIpU4PPeEkNMuegf11uFPmhw=; b=Rzco8ngtdPwB2JKfjszoEwLDXsc7xReA0tB7JA1h+9nhw8v7qRGs13PeSYXDmh3Xbc SWv+bXbBYpWXDxbF/QVOVxFH2VMfMcWYQu8dxzGsrY3ADWDzyWJMwAyGt6X++pRnPABK y1b2mGe0EYD22DY3J4SwDSiJT/3Gx3VMyylSogWTh7a9TeP8DXqGpvSSUDTzAc7S34FZ Ji18+oi8PIVkN9O+uanDjPwMax5Fp491W1UVf3aoGF6VcJMf5xP8B5g5uKD4GGPMb3EL 9UNGEWqy2JJWEbmCn1hS1kSMrnQ+MhdQ3Xr7YWTcNSH+n3zkot/dCZytZPa9LZVdrw9n UYbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679455601; x=1682047601; 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=kkvjdQ/gIOr58R0xm6rsIpU4PPeEkNMuegf11uFPmhw=; b=GMWOOIUdN6sQmsdZ8ljrM/mSssDyfA86ZfimwvZGLXJu1pIivotZ+zGwG1nB+bmz0y z+CGMX3bsW+FZvQ++e+cEFW3QSM1vhsFp/xYMwNQeTsAglrTFioLexk7Iu+lhencs4qP rQwG3hyy0ZRlVzWQZ9kzTn5ABsccb5dMKhaAL9vOGawSlGNihmdFQODT100IAwdJ8yAZ akYq0uus82kqa8Ebvbs5N85yKyyICG2nnyINdO5l8AWz4+T9apcRZAIgZac189ZeK/Hm wgPzj26Oa/1vGiLyfD6MJI42T+Bm+kMlLZ1yr87+h8AJVRX+lw1//zDpHVU7ePxaLX7t vlSw== X-Gm-Message-State: AO0yUKUd9arg0AaoO7FLDJS+0SvtgBURrAqn7BCvoQSh1mOuzCovJeX7 jWg95FCLRaEzVpZRa3d+2d7msn8F5nIjZQ== X-Received: by 2002:a05:6602:240f:b0:758:8b42:ce5a with SMTP id s15-20020a056602240f00b007588b42ce5amr1234624ioa.1.1679455601468; Tue, 21 Mar 2023 20:26:41 -0700 (PDT) Received: from gauss.local (c-98-224-219-15.hsd1.mi.comcast.net. [98.224.219.15]) by smtp.gmail.com with ESMTPSA id cd8-20020a0566381a0800b00406521ad090sm3710594jab.94.2023.03.21.20.26.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 20:26:41 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Mar 2023 23:26:26 -0400 Message-Id: <20230322032626.45777-3-leo.izen@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230322032626.45777-1-leo.izen@gmail.com> References: <20230322032626.45777-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: lwxf02UH/LI7 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 1489256d00..21b033ea16 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -442,6 +442,12 @@ 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) { + int len = ff_png_get_nb_channels(s->color_type); + memset(s->buf, avctx->bits_per_raw_sample, len); + png_write_chunk(&s->bytestream, MKTAG('s', 'B', 'I', 'T'), s->buf, len); + } + /* put the palette if needed, must be after colorspace information */ if (s->color_type == PNG_COLOR_TYPE_PALETTE) { int has_alpha, alpha, i;