From patchwork Fri Mar 11 10:14:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 34683 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1552545nkb; Fri, 11 Mar 2022 02:14:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwToAdq0XuJGorOi4FRRfeLMCK4h74BMlwgG0GqwQ7KcHgT0+D4A5K4qXq++JfnRS++RRIU X-Received: by 2002:a50:d7c1:0:b0:415:e599:416c with SMTP id m1-20020a50d7c1000000b00415e599416cmr8227733edj.37.1646993667462; Fri, 11 Mar 2022 02:14:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646993667; cv=none; d=google.com; s=arc-20160816; b=ea6PBh1HD7isquhc9zLseZowj3ik6rQpXTUY2X3pEYLYz2L0yGII70B4x5fefUgJAT 7mJw/t/8BE9QQ8Wl7LrgqNR+Dm8HF1612Z7SK+UT7cFHHPNDB1kY7GKGNiaO87ys6ltT /2Mbq9yBve2KdeZAiZmN4ypLbp97XMkZaUHjDOg70reQpJpjqq1ywqNwY3rtAJlFSIXV yLVLm/81GQayiar5DNXqIStal7Z6kKhDzOZtMaU4RCDG0Gcm6KilMYTnUauUE2jAl/s3 lw23pDxe8mADnq51oCDMoH3H3cT1wrrQ3a2cqVRrivUjh7xAFvhBgNUqYE7WDpfMO6hQ NJ+w== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=uZD7a9Pto/hNhgIaBsilZWZIT8LtAfj/+KOSkPVWcxc=; b=YZzlH31w2IkTbnqolzy4tRwnNbs2+dhOO61qBetJhqW44V+JUev3c8jwd2eaPq2Rta 4u5GjRmT4JtdWedcSNdfMMOu3hSmgsKVuUig8W2SIkPf9pQnN8rjRd5YUlgXNDXHY/CA rVyJWeNpBUcYV3piunbTPIKhgvROVKEN8UQoaVEv/UencKOPsL3ZNSb6Zfm1pf60Gtsy YRUlq/JRrJN+pGy0ob9K9culLGzMCbKFfBp1U2eFpZqvX+z4t6TI2Tn4yxR0Nh/kAnGV VBd13y+YzvdDMmmXgNhkPy9EIbM717PbVvcatran3aPY/l01F75Ri6+eDjwddj4KT3Co MEBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b="Qi/5mQNi"; 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 hr30-20020a1709073f9e00b006da6264a549si4831406ejc.421.2022.03.11.02.14.26; Fri, 11 Mar 2022 02:14:27 -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=@haasn.xyz header.s=mail header.b="Qi/5mQNi"; 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 C6FC468A3AD; Fri, 11 Mar 2022 12:14:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A989680593 for ; Fri, 11 Mar 2022 12:14:16 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id B20C049890; Fri, 11 Mar 2022 11:14:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1646993655; bh=MZxd7vaRQSRyfggXS0wV6jpOTzb1MmHUiIGRe1bxdT4=; h=From:To:Cc:Subject:Date:From; b=Qi/5mQNiDF9u/nNcaUhNvLxnHe+cNPH/tBKojsjXGSTqMJ2YO3zW2RbuC/4Lc2Qsb 5vk8Rqk2lb7jzCYOKTob2tdDmjHkl+xRRWPpz+/VAjjdfzuQrQgaOCr+n8KXDgZ1KT yw6jg8DB7EE4Py0yroiwx7xrO0sEcvtI9fzhfnl4= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 11:14:13 +0100 Message-Id: <20220311101413.92878-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/pngenc: support writing iCCP 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xgX0lwbeY3rQ From: Niklas Haas encode_zbuf is mostly a mirror image of decode_zbuf. Other than that, the code is pretty straightforward. Special care needs to be taken to avoid writing more than 79 characters of the profile description (the maximum supported). Also add a FATE transcode test to ensure that the ICC profile gets encoded correctly. --- libavcodec/pngenc.c | 77 +++++++++++++++++++++++++++++++++++++++++- tests/fate/image.mak | 3 ++ tests/ref/fate/png-icc | 8 +++++ 3 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 tests/ref/fate/png-icc diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 3ebcc1e571..24530bb62f 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -28,6 +28,7 @@ #include "apng.h" #include "libavutil/avassert.h" +#include "libavutil/bprint.h" #include "libavutil/crc.h" #include "libavutil/libm.h" #include "libavutil/opt.h" @@ -343,6 +344,65 @@ static int png_get_gama(enum AVColorTransferCharacteristic trc, uint8_t *buf) return 1; } +static int encode_zbuf(AVBPrint *bp, const uint8_t *data, size_t size) +{ + z_stream zstream; + unsigned char *buf; + unsigned buf_size; + int ret; + + zstream.zalloc = ff_png_zalloc, + zstream.zfree = ff_png_zfree, + zstream.opaque = NULL; + if (deflateInit(&zstream, Z_DEFAULT_COMPRESSION) != Z_OK) + return AVERROR_EXTERNAL; + zstream.next_in = data; + zstream.avail_in = size; + + for (;;) { + av_bprint_get_buffer(bp, 2, &buf, &buf_size); + if (buf_size < 2) { + deflateEnd(&zstream); + return AVERROR(ENOMEM); + } + + zstream.next_out = buf; + zstream.avail_out = buf_size - 1; + ret = deflate(&zstream, Z_FINISH); + if (ret != Z_OK && ret != Z_STREAM_END) { + deflateEnd(&zstream); + return AVERROR_EXTERNAL; + } + + bp->len += zstream.next_out - buf; + if (ret == Z_STREAM_END) { + deflateEnd(&zstream); + return 0; + } + } +} + +static int png_get_iccp(AVBPrint *bp, const AVFrameSideData *sd, char **buf_out) +{ + const AVDictionaryEntry *name; + int ret; + + av_bprint_init(bp, 0, AV_BPRINT_SIZE_UNLIMITED); + + /* profile header */ + name = av_dict_get(sd->metadata, "name", NULL, 0); + av_bprintf(bp, "%.79s", (name && name->value[0]) ? name->value : "icc"); + av_bprint_chars(bp, 0, 2); /* terminating \0 and compression method */ + + /* profile data */ + if ((ret = encode_zbuf(bp, sd->data, sd->size))) { + av_bprint_finalize(bp, NULL); + return ret; + } + + return av_bprint_finalize(bp, buf_out); +} + static int encode_headers(AVCodecContext *avctx, const AVFrame *pict) { AVFrameSideData *side_data; @@ -399,7 +459,22 @@ 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); - /* put the palette if needed */ + side_data = av_frame_get_side_data(pict, AV_FRAME_DATA_ICC_PROFILE); + if (side_data && side_data->size) { + AVBPrint bp; + char *buf; + int ret; + + if ((ret = png_get_iccp(&bp, side_data, &buf))) { + av_log(avctx, AV_LOG_WARNING, "Failed writing iCCP chunk: %s\n", + av_err2str(ret)); + } else { + png_write_chunk(&s->bytestream, MKTAG('i', 'C', 'C', 'P'), buf, bp.size); + av_free(buf); + } + } + + /* put the palette if needed, must be after colorspace information */ if (s->color_type == PNG_COLOR_TYPE_PALETTE) { int has_alpha, alpha, i; unsigned int v; diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 573d398915..e7b156836f 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -385,6 +385,9 @@ FATE_PNG_PROBE += fate-png-side-data fate-png-side-data: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_frames \ -i $(TARGET_SAMPLES)/png1/lena-int_rgb24.png +FATE_PNG_PROBE += fate-png-icc +fate-png-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png image2 "-c copy" + FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG) FATE_PNG_PROBE-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG_PROBE) FATE_IMAGE += $(FATE_PNG-yes) diff --git a/tests/ref/fate/png-icc b/tests/ref/fate/png-icc new file mode 100644 index 0000000000..5bce1ea0c4 --- /dev/null +++ b/tests/ref/fate/png-icc @@ -0,0 +1,8 @@ +3cdc46a9c844249cae5c048078d0694d *tests/data/fate/png-icc.image2 +40194 tests/data/fate/png-icc.image2 +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 2835/2835 +0, 0, 0, 1, 49152, 0xe0013dee