From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 4909648CEA for ; Wed, 24 Jan 2024 14:54:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9514468D0D9; Wed, 24 Jan 2024 16:54:31 +0200 (EET) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B4EC68CF9C for ; Wed, 24 Jan 2024 16:54:25 +0200 (EET) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-6dd72c4eb4aso1688644b3a.2 for ; Wed, 24 Jan 2024 06:54:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706108062; x=1706712862; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=yF+hdZNsm1NDFIHbLdeoL/F74vApCkLl/8xR4pc3cCc=; b=A2YKznKaeibL1a7kedG4UplujAaPkIhYDhDA5a5zb9nPJEEKzRm29psEliGHFL5RP1 634CLOv+qOUJClWTGCezfXxetKlVfqeyMKpS0PSHrtP7n//ltKJZyESbTdMxaGq8YYTA LnIGM5GemLbIfKQ8FeYqkFnty+X8jzv0a/cifpsSWyalsOmVYOy5sakWut1+8tls3lD4 TVtsMBum7ATeAIe3oXulBLLF3q5+LVp186s5zDOKoALgPTLJmGUZNjekPvxE4fDZk6uu Pe3t2XbM4Xg0ruM6dpWiJWbkaKU8TS14DMoArIyX0tXDFVVGyvwAduhVw/IW0E35XXVi rEeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706108062; x=1706712862; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yF+hdZNsm1NDFIHbLdeoL/F74vApCkLl/8xR4pc3cCc=; b=lcvngGh2wVFJSEsX2B9MTDxIiyx9vad6/zr5gibyBf/RO/PoOGCMfcWcxT6Mkh/vjp K5FuZp+MlP3sOEkgK3StE9HmBPVGSW8BvEtRGAzwzL1k1VISwJp6uvDbj7MyfPxLdfpb GiNh84Uzu9lCMK6gHLGUtQagedeEXO2Qu2oXBtd0NaCrc14xdyYVktRUh+yaParB2ows NrPUX8Bl5w11SYwRxlUMfJdwvKKpv9mtso8t+6dyvuUz7p2Kel3HL+/91MzxBdrU0HXC brdIQw1b6v60AhF+5b8flB+dH5MFtP7ic9/GRVGpkniB793bmRG0vSOPlOn+aN4+U4PT vZQA== X-Gm-Message-State: AOJu0YzepXckHN6o4rFT8K3uh4d9o8z9U3F/XUTqc+xBt4giqQmR4cJ9 RKCHjgusvvSBm4g0mcPhaaDuVULu+fbIFf8cZd379pT6P9tKlIUWzdspb463 X-Google-Smtp-Source: AGHT+IGGYR7ODe1dHBTzp8xzF3fM1xMp7ZKRsogOcqNKNFKWWdyomRcfpD3HqDU2GvL9ibUnbuPC8Q== X-Received: by 2002:a05:6a20:bb18:b0:19c:4f2d:a334 with SMTP id fc24-20020a056a20bb1800b0019c4f2da334mr554012pzb.68.1706108061792; Wed, 24 Jan 2024 06:54:21 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id s23-20020a62e717000000b006dda22e1c2csm1144598pfh.115.2024.01.24.06.54.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 06:54:21 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jan 2024 11:54:16 -0300 Message-ID: <20240124145419.7980-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4 v2] avformat/mov: ignore item boxes for animated heif 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Fixes a regression since d9fed9df2a, where the single animated stream would be exported twice as two independent streams. Signed-off-by: James Almer --- libavformat/isom.h | 1 + libavformat/mov.c | 147 ++++++++++++++++++++++++++++++--------------- 2 files changed, 99 insertions(+), 49 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index 2cf456fee1..21caaac256 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -280,6 +280,7 @@ typedef struct MOVContext { int64_t duration; ///< duration of the longest track int found_moov; ///< 'moov' atom has been found int found_iloc; ///< 'iloc' atom has been found + int found_iinf; ///< 'iinf' atom has been found int found_mdat; ///< 'mdat' atom has been found int found_hdlr_mdta; ///< 'hdlr' atom with type 'mdta' has been found int trak_index; ///< Index of the current 'trak' diff --git a/libavformat/mov.c b/libavformat/mov.c index 4cffd6c7db..03ca62895e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -81,6 +81,7 @@ typedef struct MOVParseTableEntry { static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom); static int mov_read_mfra(MOVContext *c, AVIOContext *f); +static void mov_free_stream_context(AVFormatContext *s, AVStream *st); static int64_t add_ctts_entry(MOVCtts** ctts_data, unsigned int* ctts_count, unsigned int* allocated_size, int count, int duration); @@ -4639,6 +4640,23 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) MOVStreamContext *sc; int ret; + if (c->found_iinf) { + // * For animated heif, if the iinf box showed up before the moov + // box, we need to clear all the streams read in the former. + for (int i = c->heif_info_size - 1; i >= 0; i--) { + HEIFItem *item = &c->heif_info[i]; + + if (!item->st) + continue; + + mov_free_stream_context(c->fc, item->st); + ff_remove_stream(c->fc, item->st); + } + av_freep(&c->heif_info); + c->heif_info_size = 0; + c->found_iinf = c->found_iloc = 0; + } + st = avformat_new_stream(c->fc, NULL); if (!st) return AVERROR(ENOMEM); st->id = -1; @@ -7768,8 +7786,9 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) uint64_t base_offset, extent_offset, extent_length; uint8_t value; - if (c->found_iloc) { - av_log(c->fc, AV_LOG_INFO, "Duplicate iloc box found\n"); + if (c->found_moov) { + // * For animated heif, we don't care about the iloc box as all the + // necessary information can be found in the moov box. return 0; } @@ -7891,6 +7910,16 @@ static int mov_read_iinf(MOVContext *c, AVIOContext *pb, MOVAtom atom) int entry_count; int version, ret; + if (c->found_iinf) { + av_log(c->fc, AV_LOG_WARNING, "Duplicate iinf box found\n"); + return 0; + } + if (c->found_moov) { + // * For animated heif, we don't care about the iinf box as all the + // necessary information can be found in the moov box. + return 0; + } + version = avio_r8(pb); avio_rb24(pb); // flags. entry_count = version ? avio_rb32(pb) : avio_rb16(pb); @@ -7914,6 +7943,7 @@ static int mov_read_iinf(MOVContext *c, AVIOContext *pb, MOVAtom atom) return ret; } + c->found_iinf = 1; return 0; } @@ -7927,6 +7957,13 @@ static int mov_read_iref(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_ispe(MOVContext *c, AVIOContext *pb, MOVAtom atom) { uint32_t width, height; + + if (c->found_moov) { + // * For animated heif, we don't care about the ispe box as all the + // necessary information can be found in the moov box. + return 0; + } + avio_r8(pb); /* version */ avio_rb24(pb); /* flags */ width = avio_rb32(pb); @@ -7961,6 +7998,12 @@ static int mov_read_iprp(MOVContext *c, AVIOContext *pb, MOVAtom atom) int version, flags; int ret; + if (c->found_moov) { + // * For animated heif, we don't care about the iprp box as all the + // necessary information can be found in the moov box. + return 0; + } + a.size = avio_rb32(pb); a.type = avio_rl32(pb); @@ -8581,6 +8624,58 @@ static void mov_free_encryption_index(MOVEncryptionIndex **index) { av_freep(index); } +static void mov_free_stream_context(AVFormatContext *s, AVStream *st) +{ + MOVStreamContext *sc = st->priv_data; + + if (!sc) + return; + + av_freep(&sc->ctts_data); + for (int i = 0; i < sc->drefs_count; i++) { + av_freep(&sc->drefs[i].path); + av_freep(&sc->drefs[i].dir); + } + av_freep(&sc->drefs); + + sc->drefs_count = 0; + + if (!sc->pb_is_copied) + ff_format_io_close(s, &sc->pb); + + sc->pb = NULL; + av_freep(&sc->chunk_offsets); + av_freep(&sc->stsc_data); + av_freep(&sc->sample_sizes); + av_freep(&sc->keyframes); + av_freep(&sc->stts_data); + av_freep(&sc->sdtp_data); + av_freep(&sc->stps_data); + av_freep(&sc->elst_data); + av_freep(&sc->rap_group); + av_freep(&sc->sync_group); + av_freep(&sc->sgpd_sync); + av_freep(&sc->sample_offsets); + av_freep(&sc->open_key_samples); + av_freep(&sc->display_matrix); + av_freep(&sc->index_ranges); + + if (sc->extradata) + for (int i = 0; i < sc->stsd_count; i++) + av_free(sc->extradata[i]); + av_freep(&sc->extradata); + av_freep(&sc->extradata_size); + + mov_free_encryption_index(&sc->cenc.encryption_index); + av_encryption_info_free(sc->cenc.default_encrypted_sample); + av_aes_ctr_free(sc->cenc.aes_ctr); + + av_freep(&sc->stereo3d); + av_freep(&sc->spherical); + av_freep(&sc->mastering); + av_freep(&sc->coll); +} + static int mov_read_close(AVFormatContext *s) { MOVContext *mov = s->priv_data; @@ -8588,54 +8683,8 @@ static int mov_read_close(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; - MOVStreamContext *sc = st->priv_data; - - if (!sc) - continue; - - av_freep(&sc->ctts_data); - for (j = 0; j < sc->drefs_count; j++) { - av_freep(&sc->drefs[j].path); - av_freep(&sc->drefs[j].dir); - } - av_freep(&sc->drefs); - - sc->drefs_count = 0; - if (!sc->pb_is_copied) - ff_format_io_close(s, &sc->pb); - - sc->pb = NULL; - av_freep(&sc->chunk_offsets); - av_freep(&sc->stsc_data); - av_freep(&sc->sample_sizes); - av_freep(&sc->keyframes); - av_freep(&sc->stts_data); - av_freep(&sc->sdtp_data); - av_freep(&sc->stps_data); - av_freep(&sc->elst_data); - av_freep(&sc->rap_group); - av_freep(&sc->sync_group); - av_freep(&sc->sgpd_sync); - av_freep(&sc->sample_offsets); - av_freep(&sc->open_key_samples); - av_freep(&sc->display_matrix); - av_freep(&sc->index_ranges); - - if (sc->extradata) - for (j = 0; j < sc->stsd_count; j++) - av_free(sc->extradata[j]); - av_freep(&sc->extradata); - av_freep(&sc->extradata_size); - - mov_free_encryption_index(&sc->cenc.encryption_index); - av_encryption_info_free(sc->cenc.default_encrypted_sample); - av_aes_ctr_free(sc->cenc.aes_ctr); - - av_freep(&sc->stereo3d); - av_freep(&sc->spherical); - av_freep(&sc->mastering); - av_freep(&sc->coll); + mov_free_stream_context(s, st); } av_freep(&mov->dv_demux); -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".