From patchwork Tue Feb 13 21:24:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 46241 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c493:b0:19e:cdac:8cce with SMTP id eo19csp1422pzb; Tue, 13 Feb 2024 13:25:35 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU12FeQtSf01z9SH3CEP0xwbuFNQ3fFiFwH2w0W+2eAtDhaIvtRAmWnrZrh89p26QunVTW/c4r7lz+DmBtmTo0I0GFIaNV7BGvHuw== X-Google-Smtp-Source: AGHT+IEzL6L66eMvoeDZazgY0ZGWDAre2f8LDZoYeomY+pHEv88lzNMp2/6HOQNffUYsh/r/ha5j X-Received: by 2002:a17:906:3c53:b0:a3d:1f59:7410 with SMTP id i19-20020a1709063c5300b00a3d1f597410mr319755ejg.22.1707859534140; Tue, 13 Feb 2024 13:25:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707859534; cv=none; d=google.com; s=arc-20160816; b=wumoFd8fSTyKMeId+bVnqcWg5HMbOCsaLlx+ztAfAjKyywlulIPRZ9qigSmApBAgmQ Csr/GIGeZenA4o8E9yI2kmQoA47EgKbVqqS3mynxqMY3a9iGvZdkqzBRkRlGXMG7rTxf QqxMPxgMCjTo8LqRNNg7UlZwJTdBWk2QxkW91jVWKP0yv7eL2w3Jlyde9mUdhyg76CVV aybyJHv2I428IwAPW6oVMLrh2WeOytuOT3fKf1k9rQ0ypzEzvpi/hr7bmOgSspwXnZiA Ao81JbgewVR+/9SOmLB92ceZzX3Uj89QUieTVyZBRyQGfN3Y54zBpqHc9U3kxuBLSgtN QAnQ== 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=PR8OQD/qk1co7b8lHVJ7uwvO0RLTyxefI8RPi8slFJI=; fh=jIgkv312T4osuDyxj+ESHhnTIQlO4PatAkqL3Q6SMxc=; b=Jcg9M+MQ1eSo+iM5DsROxEWbPIzMCqiSGQI/0EtyHLgTWKF9+N4gaFyfxxzx9pUZZk ZdnyP6EbN5WI1OlWXhxGBeaUdwBo3YAFjlMZlaaWYweZEkkGCE0mhl9BR/Rmc8sMrEj5 pItoSefpnrrHrhAdnEzYud8fsr12VZNSrkR8wG9yO1GzXfCCXHjPBjzMDuCCmIobTtQy GfxPdEmV1jeQTDUmUUxXaGyO14zisww7qtH7YRWBMf1+uguKkTgwtxplGpo9/ZJzOpFz hJXowKANyrJ03E3HGUmtNqZbDY7UWYTn0dqLpuSbUdpiwr9nfa/aas8cyI0edR1U0DZJ 6X+Q==; 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=BY3dpkF8; 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 X-Forwarded-Encrypted: i=1; AJvYcCXIPN34iWzrsAo5yITCXBOHABx+SAEI3D0SBxAj6vspU4t+22tAQHAW7o3p4lqPbQ16pKhZiYRsGnxsEgW7iU8h20pzmDx8UC1Bso1Qr/3QqQg7m8Ic9q9E3zMtMon9xKhyBID0wwqemUcwN1TgTpU1g4x/kyWU/7Ll4MZy3bl1F2AqKnDHSyl78wm9BpM5nwHOIDzq6hLVhaQcUPEcn34qfIz6Sm7z9/vQzpanMmxjgqDMeLydlJ+fqvGarWZHjKFYlN41Hb3khfP79+1+IyI1VVtH6I3UHVrwZx7y+omn01rQSRntzQ9pLb93DlNuHOWDVIj5fvta0VzOU/kcG6xJCZYfdwoyw51a3yZRevzU63s0Oqp8+TfmaTo5qyaHCr58j4oxcOCmB1hrTX04ZEmHVqil5mkb6p++1+BF5ijJOxVQPTv28z2N0WXGILo15vbpqZam6ZBR35rDcSf8bNCS/yRx+zlNyEvBfCbdcffHZiOfCj8JbnxtUn60aJrdhZVDCKS/KvGB1n4wrhDnLSc8XqfLXkS1ca+8URFNI4gccAR60H+b05vldzGUBArHZ57YFdrJGti3h/0AxVRWiouEBxfl/pDwfMnceIj15dx4XzoMvDbloq/KSQIgRNjv2KkT4XbRPzyYHMmEWBm/pMeRieKREi2oby4bmSyN49YrMjQ7w1wKFU6jffEJAxLzYSgQkgoEVUYIelO1r9+n6jRF7pmEwSU0OIY2rTvR7nUWV0QFDf2zR/UHm1ZmujL5PdbkT847sxOFSrxtYPcVLsyajb6Uas6ai1DazUGcvEUIYpihA+r5jmx+t6clK0GkIvjDmV0ewnm2T3uCzzooHUyLprJP2qudy6Wz8vBzA8CwynOMJcG4L6Di9qKs5MiXkWxn6/1HfVpTHzr5cCEEm9AsRfKgmurgxX1aWNM/YKH90WKTtYDrLcKSuKDpZXTPNOGz91 Dh4YbYGDdmYYeyNy0OKjuLHJ3wtiAjtG8LDS2XxTTk4UcZ4zg/3f+cQmcuFQyiYk6IrThTcbkI0sDF1hsOgKkBH3/mVGxyFfl7kjXo9PvQz2kCjKaZ6/0rwxYcNbADwKukDtORr+ryWjhSXeUWpNJtOyg0u4ZMHJMlffoPhjIDWeoQk4//O3CVu0jpeC67+cyOdH8QDaqmOj9sse+6tNXAgIwCJWDXYUACpfhHcJOHTUFmaY1Zism3LxitsRQ7ENmxw372Yh0N5nFjhX0mlkMo2GvS3tJf+UVWMFk6EQkNORDAMx3gvVsa8JB60tY7lFJzXFSaqoXEssfNEA3JFXLVDlyos5aROVnTnoxoaDTQY2XeFqTlq7tKnAs8mjIiVgA8+eOlVjIxh7+Xmx4LUf7GmZOgnTPytykNttystrRPBlUQCoyu7M8FI/qrzTwmWdJ/ai6PWAwDviH6H4TTlOJPWNp442NdNKt/PK5My78MhB7RFJhv6wvk4AJVXjUXxGKR1WcDIVbhCil2mdE+wdEG/15OgJfJup8Y7W24/Ea2Wjs4UgGL8ZJQ4PNDtXvL12IXnWlFNeevmm+Euv0bB6TT9Hi+herNz8zcdytW9Q== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k11-20020a17090627cb00b00a3cbc549b42si1516044ejc.172.2024.02.13.13.25.32; Tue, 13 Feb 2024 13:25:34 -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=20230601 header.b=BY3dpkF8; 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 72CFC68D1AF; Tue, 13 Feb 2024 23:25:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 030A468C4E1 for ; Tue, 13 Feb 2024 23:25:02 +0200 (EET) Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-3be110bbff9so1416098b6e.1 for ; Tue, 13 Feb 2024 13:25:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707859500; x=1708464300; 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=uVhqDlK8gauvT38E5XzDPqYApJ0R68fVXpc7QAfsy44=; b=BY3dpkF8S9Z/8TdSVnrL5jEUzLRMEBlGSJnP8DaXzvfomEcCWceWXjy/Wvj3JpysRT 9FHPE+IKUdY2psH4YYcrY/eJoAmOtiuj+awWxzrRBk1bNc/xGVqLf2gCsn17yQK3UN/E yN0hcQuVUyE8f1qvqrBUN6xYCGuzOEss+pu2IhN3sLDH8utimOMN/c8Xgmm10DTgRJv9 Fh1zV4mm2ucFDFVpV8oXwwQy5fvhDFF5RtMWQot/YHaUiFxnrKoVlqKjIn8FQL5RP2cc amvP2G0br01Udrd8zaZFgUy2TAwHv0/n8/a76y5ktoTeqGeBJp/2M2z28nWXJbF0aZa3 tpqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707859500; x=1708464300; 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=uVhqDlK8gauvT38E5XzDPqYApJ0R68fVXpc7QAfsy44=; b=Z4e0EQgKp61mFCstAllPgLF0r8k1aqKUSKUooLMUntny2zDopnpxBH4LvPCmDgHnDK 13FJc9VN/osG/Ri46gYypG8VsPGy12ChXKKMRFQSDu2sLVha4nk8IJijYKsHYUQ9haDr HsLlknUgmPtQIUQeDZl7aDiNn88LXcQ/Hhmi12sR7msZQDChkdorQjHyPM1RBaOkUfqf AWVa7hFkmqeYg74EYpBkrObjg6xlh2yHqINH4+P1G5vALvdsoroC3SbHuDc4UhSYT+gB IXQHlaVml3q/PcAyyj3OhOg2NXhD7s/5jawKmNLtpWj3N+X1iZWrV4lU1kAJZEnZagUY q9LQ== X-Gm-Message-State: AOJu0Yw4JHlCNfebmP80ReUGt1AYQnmDcvzFfkP1V6PQ0HrxmN/NF/4k tbtIK8XFEQ9g8+xgo1VT7Ls/VMY54vuaRrm/3QApdO6ndstdt2Rnv3ufYDZG X-Received: by 2002:a05:6870:9e85:b0:21a:3083:5118 with SMTP id pu5-20020a0568709e8500b0021a30835118mr204677oab.1.1707859500069; Tue, 13 Feb 2024 13:25:00 -0800 (PST) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id g5-20020a37e205000000b007861bea2972sm1523016qki.6.2024.02.13.13.24.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 13:24:59 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Feb 2024 16:24:55 -0500 Message-ID: <20240213212456.167386-3-leo.izen@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213212456.167386-1-leo.izen@gmail.com> References: <20240213212456.167386-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: CFZwkQ/bS0uN 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 026da30c25..e7951d1802 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -38,6 +38,7 @@ #include "bytestream.h" #include "codec_internal.h" #include "decode.h" +#include "exif_internal.h" #include "apng.h" #include "png.h" #include "pngdsp.h" @@ -123,6 +124,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 */ @@ -652,6 +654,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 @@ -890,6 +912,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); @@ -1571,6 +1599,12 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, s->mdvc_max_lum = bytestream2_get_be32u(&gb_chunk); s->mdvc_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"); @@ -1907,6 +1941,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);