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 8FECA4805E for ; Tue, 9 Jan 2024 19:56:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5C3AD68CD84; Tue, 9 Jan 2024 21:55:59 +0200 (EET) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8C6F68AB1D for ; Tue, 9 Jan 2024 21:55:52 +0200 (EET) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1d51ba18e1bso26797045ad.0 for ; Tue, 09 Jan 2024 11:55:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704830150; x=1705434950; 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=kU3QDvqhD9liUDjxB8XatJdoR5XaWQN3mAXuzasbIog=; b=h1P5LriO/2XGJANt6IHmDTXte2BSacpWROZGyvWqMsgZzQkF31YrxzYMdCFimOWmYF vaXeRqlAq0ZIOLNsk6qSsMAhqjiAt3ZOOvBK1Yo4+QTaXKMWKdgcFRdjlK20tWtzBeNN wsIqgoG7aNnWH2Okc2vrGkIw7f+tz3CeIpYN7Cf67XzT1MVNjGcvrySl0cqhQsncvZIQ yaJLZtE5ynSEHfSA075K/aWaAQ/UrdXRz1S8QMoLnZ36GhIfd7oMW84Ovgnch//rKg2A p3nv/DI/LDLcYFqDFlMbSbVxJL8F+SRPpm7Lyem5bLD+QMUAeVN8sE94ZvaiZRKB5exY RXkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704830150; x=1705434950; 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=kU3QDvqhD9liUDjxB8XatJdoR5XaWQN3mAXuzasbIog=; b=oLC4hzL61EcY/l8d/kDmuMKrx9DV/VJx8joqaFBfCTUcSTSo6JYEf7LCsemSSO62pX w4YPmZ3C+oae9JJt43dsrDhuKTRMzJm++B9m7NTP9sPsrvf6dxpEvR6vpoDbzMKutyI1 8N/KJvLjJXCZCpIzKdFdTQoLLq7biMFTGuiZ1IaK/XQBvG48schFozrK3LsyL9w8CjKs 9l3LJ3I2EwE6pS+n53fIIHpU/xA+TO8fliGIQSDytGivjZZ1a1v0TgwdcSBvU1uZW5Km 90RmbfR/yJ3PyFnbHy0gXrfjU55H91QwxYeaqoWK32Mr2YjxWldTUzUwDUYzvLOdk9k3 iWgA== X-Gm-Message-State: AOJu0YzzGz+Wt/HS05WWFCZDbGvL7HwWy0VN7jR0xgJPr2/JZB0MndlX nA0EvmwvhgUtsYTSDgh+ouyEVTdPqNc= X-Google-Smtp-Source: AGHT+IHrTyQTmy6ajaVGiuSs7uobpOVO7B3Hx2iLMxYbm90K2y2lFbkSyYdCKYIvPfM7Hfj8Dz922Q== X-Received: by 2002:a17:902:d48b:b0:1d4:7381:dc33 with SMTP id c11-20020a170902d48b00b001d47381dc33mr7284623plg.0.1704830149794; Tue, 09 Jan 2024 11:55:49 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id o7-20020a1709026b0700b001d0c151d325sm2160551plk.209.2024.01.09.11.55.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 11:55:49 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Jan 2024 16:55:44 -0300 Message-ID: <20240109195545.59231-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mov: rename avif fields to 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: They are no longer avif specific. Signed-off-by: James Almer --- libavformat/isom.h | 4 ++-- libavformat/mov.c | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index b30b9da65e..90c4fb5530 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -325,8 +325,8 @@ typedef struct MOVContext { int item_id; int extent_length; int64_t extent_offset; - } *avif_info; - int avif_info_size; + } *heif_info; + int heif_info_size; int64_t hvcC_offset; int hvcC_size; int interleaved_read; diff --git a/libavformat/mov.c b/libavformat/mov.c index c6398d6d81..12e82c66a9 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4916,15 +4916,15 @@ static int mov_read_custom(MOVContext *c, AVIOContext *pb, MOVAtom atom) return ret; } -static int avif_add_stream(MOVContext *c, int item_id) +static int heif_add_stream(MOVContext *c, int item_id) { MOVStreamContext *sc; AVStream *st; int item_index = -1; if (c->fc->nb_streams) return AVERROR_INVALIDDATA; - for (int i = 0; i < c->avif_info_size; i++) - if (c->avif_info[i].item_id == item_id) { + for (int i = 0; i < c->heif_info_size; i++) + if (c->heif_info[i].item_id == item_id) { item_index = i; break; } @@ -4987,8 +4987,8 @@ static int avif_add_stream(MOVContext *c, int item_id) sc->stts_data[0].count = 1; // Not used for still images. But needed by mov_build_index. sc->stts_data[0].duration = 0; - sc->sample_sizes[0] = c->avif_info[item_index].extent_length; - sc->chunk_offsets[0] = c->avif_info[item_index].extent_offset; + sc->sample_sizes[0] = c->heif_info[item_index].extent_length; + sc->chunk_offsets[0] = c->heif_info[item_index].extent_offset; mov_build_index(c, st); return 0; @@ -5013,7 +5013,7 @@ static int mov_read_meta(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (c->is_still_picture_avif) { int ret; // Add a stream for the YUV planes (primary item). - if ((ret = avif_add_stream(c, c->primary_item_id)) < 0) + if ((ret = heif_add_stream(c, c->primary_item_id)) < 0) return ret; // For still AVIF images, the meta box contains all the // necessary information that would generally be provided by the @@ -7820,7 +7820,7 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } - if (c->avif_info) { + if (c->heif_info) { av_log(c->fc, AV_LOG_INFO, "Duplicate iloc box found\n"); return 0; } @@ -7841,16 +7841,16 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) } item_count = (version < 2) ? avio_rb16(pb) : avio_rb32(pb); - c->avif_info = av_malloc_array(item_count, sizeof(*c->avif_info)); - if (!c->avif_info) + c->heif_info = av_malloc_array(item_count, sizeof(*c->heif_info)); + if (!c->heif_info) return AVERROR(ENOMEM); - c->avif_info_size = item_count; + c->heif_info_size = item_count; for (int i = 0; i < item_count; i++) { int item_id = (version < 2) ? avio_rb16(pb) : avio_rb32(pb); if (avio_feof(pb)) return AVERROR_INVALIDDATA; - c->avif_info[i].item_id = item_id; + c->heif_info[i].item_id = item_id; if (version > 0) avio_rb16(pb); // construction_method. @@ -7867,8 +7867,8 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (rb_size(pb, &extent_offset, offset_size) < 0 || rb_size(pb, &extent_length, length_size) < 0) return AVERROR_INVALIDDATA; - c->avif_info[i].extent_length = extent_length; - c->avif_info[i].extent_offset = base_offset + extent_offset; + c->heif_info[i].extent_length = extent_length; + c->heif_info[i].extent_offset = base_offset + extent_offset; } } @@ -8502,7 +8502,7 @@ static int mov_read_close(AVFormatContext *s) av_freep(&mov->aes_decrypt); av_freep(&mov->chapter_tracks); - av_freep(&mov->avif_info); + av_freep(&mov->heif_info); return 0; } -- 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".