From patchwork Mon Sep 16 14:43:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 51624 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9fc3:0:b0:48e:c0f8:d0de with SMTP id k3csp1578568vqy; Mon, 16 Sep 2024 13:09:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXuPKmNJTbDQkGjrO2YQ+UKLDPbhK++4CEcQRi29RezaCKl8b3yCyU9p4IjnyziyBLHB6Jt4wi6buXI1Dch4uRx@gmail.com X-Google-Smtp-Source: AGHT+IHCTDmOByU5SA6xoRHun98tFHH8mu1U/dzqu8a/tE5vz520/V8P5OkmxKSIqycgG2YHp9ny X-Received: by 2002:a05:6512:3d8b:b0:535:665f:2407 with SMTP id 2adb3069b0e04-53678fb7358mr7959528e87.5.1726517354529; Mon, 16 Sep 2024 13:09:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726517354; cv=none; d=google.com; s=arc-20240605; b=klHLHiI+NDib5Px4CqXnAKQiou+d7s/o9wocHDvpZeoBohBudlGDfpmO1YcCF7s9iW P5rs2fdUf1alJVhpBB1Ek6kNI24uE3pOYzNyc3bb+M8kenf+88+xCkTgWPuOhGqeIf2j glUx5nUHXiGm06a/vUFZb5BmWucVRQ0bKEIqKMZxG357zyCagixyhj734Zjm6dEZ1tfr OUMxIjDGuLew+/CaB7f8GL8kcxEVn2DNnbuAoi6s5IPcE5QSE+ob8A9eafSbNW0CBFO3 QKNFFSHLnPiRRrqD0iLaMLDI9duRZgEQEyxaXQkPNn8busuxlYrRxLZRGN3Y/3kC2llb 8isQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=wNNpz/bZkZy4gbYSSDqHPSi8OE9g+26FArXSPL3gSlM=; fh=+bdjGe20eEUjtjncwA1dnEEVYNfJL4vyhV+sIRR4l+g=; b=JsgOCPGWWWtfpdjRM5IjzSr5xD0PMDxU55/YqpTWj+XJMqO0HO/L6PEM7LgUU8p9q7 DZppv3CyVERZDtlSgnMs0Mr292efCFNen8/mWrkT1HjdHPEcy47wxQhZATvJF+pGuRuK Vt4v6tP5DoW2J6KxW4A/TElusyIgTeT+yxYLbwYG8JIShmPVHspYkgJMYK8UpQB9gzwK 6pevZF7A6kN52lc1iAJ+7bAabDg4yp2p0Mkvgy/pxaO/k7XigVEz8cYqkEYKh31y2Nl3 mowPqa6VCiXUj83ckrkOZivydElcZPn6Tw08KTD8FjlVfKZogIYI9fayNcjkobi01hk9 V7Qg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=YWJ+3aNr; 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; dara=fail header.i=@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 2adb3069b0e04-53687042f1dsi2048517e87.84.2024.09.16.13.09.14; Mon, 16 Sep 2024 13:09:14 -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=20230601 header.b=YWJ+3aNr; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C022868A583; Mon, 16 Sep 2024 17:44:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E4AB689E58 for ; Mon, 16 Sep 2024 17:44:09 +0300 (EEST) Received: by mail-qt1-f171.google.com with SMTP id d75a77b69052e-45aeef3ce92so8175451cf.2 for ; Mon, 16 Sep 2024 07:44:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726497848; x=1727102648; darn=ffmpeg.org; 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=ZVbxqqVsr9Osv05vkHXX7QCa79LsN0yXmPG6r9/p5RY=; b=YWJ+3aNrTEKmMkx7ciisrOZNMWQXYMlFRX2tsa4vxj/1vtLwLoSYTrzBGJ00PfaJXr EQXPDhtX6GKDwyHER0w/w3F/EqYlvAJT2J3avp4z5+mcY1ZJdOpLAjNnRVRmyXGovsyd MF7zdQX1KKP9qN4jkvY3ZQ7dfUvBxHEMmcx04cDmCID8L84RyIbmiP4Zp/TpLjc+6kQ6 7ZZNLWV10LQ6r5h0fbqrhZYQmobcibbj0vb7HaCX+RKXXyxX0cHres56Q0u80k6I3o4P ge0eFJ81ZYw2KlCLl4p0kKE+wvxHGS9VQg2jgj+tCZXu769NGZucVGGMhMFl4/6syDNe wjLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726497848; x=1727102648; 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=ZVbxqqVsr9Osv05vkHXX7QCa79LsN0yXmPG6r9/p5RY=; b=daVn2XZE9HEnl84HdxbSxLYQOuVEIjjRhroEZnb1ksaAkTPFJ266s6k/r4NfYZgO+V oliMnZAXFM2pmpLCyi7+pH3KV3JQyb1QWCFbCRNXnbCIvW9F1zyDmDXML9cQARN1VEgg pqPcqpDQFmiCILj4SsZKY2lVNmXpuD/MugSHXsSsYqt1oCTgZ807GFRBcaYQtMAIXw50 rDeHF3VbFk7RX9LAg4SPX2q0YWUFNs3jRatW3eBGkCVN/4HrxA+XlcwhTVH6MYAzuAYQ QOl+UbYNaTTE6omPAZukTlbCJ6ajnyJZzfufgSKXXJQtwA0oTLxXohpcezWChVcTiHmc pr5A== X-Gm-Message-State: AOJu0YwIzARYWUBwP7IuvL46cOV+Wp4th6B079+0Shxr0s5bjjENbHY/ F8vZNwMCWCjlF9SvyF0NkiILwkUn3M4OOp/CNplHZL+0gl+qGC7was55cA== X-Received: by 2002:ac8:584d:0:b0:458:35fe:51d with SMTP id d75a77b69052e-4586045e50cmr178294411cf.60.1726497847582; Mon, 16 Sep 2024 07:44:07 -0700 (PDT) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-459aac864c9sm27815501cf.38.2024.09.16.07.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Sep 2024 07:44:07 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Sep 2024 10:43:43 -0400 Message-ID: <20240916144344.390716-3-leo.izen@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240916144344.390716-1-leo.izen@gmail.com> References: <20240916144344.390716-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/3] avcodec/pngdec: parse eXIf chunk 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: E1NOrmWNvDu+ Add support to parse eXIf chunks using the new EXIF framework. Signed-off-by: Leo Izen --- libavcodec/pngdec.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index c5b32c166d..efd173e154 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -39,6 +39,7 @@ #include "bytestream.h" #include "codec_internal.h" #include "decode.h" +#include "exif_internal.h" #include "apng.h" #include "png.h" #include "pngdsp.h" @@ -125,6 +126,7 @@ typedef struct PNGDecContext { int pass_row_size; /* decompress row size of the current pass */ int y; FFZStream zstream; + AVBufferRef *exif_data; } PNGDecContext; /* Mask to determine which pixels are valid in a pass */ @@ -654,6 +656,26 @@ static int decode_phys_chunk(AVCodecContext *avctx, PNGDecContext *s, return 0; } +static int decode_exif_chunk(AVCodecContext *avctx, PNGDecContext *s, + GetByteContext *gb) +{ + if (!(s->hdr_state & PNG_IHDR)) { + av_log(avctx, AV_LOG_ERROR, "eXIf before IHDR\n"); + return AVERROR_INVALIDDATA; + } + if (s->pic_state & PNG_IDAT) { + av_log(avctx, AV_LOG_ERROR, "eXIf after IDAT\n"); + return AVERROR_INVALIDDATA; + } + av_buffer_unref(&s->exif_data); + s->exif_data = av_buffer_alloc(bytestream2_get_bytes_left(gb)); + if (!s->exif_data) + return AVERROR(ENOMEM); + bytestream2_get_buffer(gb, s->exif_data->data, s->exif_data->size); + + return 0; +} + /* * This populates AVCodecContext fields so it must be called before * ff_thread_finish_setup() to avoid a race condition with respect to the @@ -906,6 +928,12 @@ static int decode_idat_chunk(AVCodecContext *avctx, PNGDecContext *s, p->flags |= AV_FRAME_FLAG_KEY; p->flags |= AV_FRAME_FLAG_INTERLACED * !!s->interlace_type; + if (s->exif_data) { + ret = ff_exif_attach(avctx, p, &s->exif_data); + if (ret < 0) + return ret; + } + if ((ret = populate_avctx_color_fields(avctx, p)) < 0) return ret; ff_thread_finish_setup(avctx); @@ -1590,6 +1618,12 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, s->mdcv_max_lum = bytestream2_get_be32u(&gb_chunk); s->mdcv_min_lum = bytestream2_get_be32u(&gb_chunk); break; + case MKTAG('e', 'X', 'I', 'f'): { + ret = decode_exif_chunk(avctx, s, &gb_chunk); + if (ret < 0) + goto fail; + break; + } case MKTAG('I', 'E', 'N', 'D'): if (!(s->pic_state & PNG_ALLIMAGE)) av_log(avctx, AV_LOG_ERROR, "IEND without all image\n"); @@ -1910,6 +1944,7 @@ static av_cold int png_dec_end(AVCodecContext *avctx) s->tmp_row_size = 0; av_freep(&s->iccp_data); + av_buffer_unref(&s->exif_data); av_dict_free(&s->frame_metadata); ff_inflate_end(&s->zstream);