virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avformat/mov: Support multiple thumbnails in HEIF

Browse Source 
Prevents ffmpeg/ffprobe from erroring out when reading an HEIF that
contains multiple hvcC thumbnails (e.g. from a Nikon Z6III camera).

Before, move_read_iref_thmb() would always override the stored
thmb_item_id in the MOVContext with each new read thumbnail, causing a
stream and item_id mismatch later in mov_parse_heif_items(), resulting
in the "HEIF thumbnail doesn't reference a stream" error message.

To solve this,

- Turn thmb_item_id into an array of IDs because multiple thumbnails can
  exist
- Change check in mov_parse_heif_items() to compare against all stored
  thumbnail IDs to see if any item missing a stream is in the list of
  thumbnail IDs.

Signed-off-by: Eric Joyner <erj@erj.cc>
Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Eric Joyner
2025-07-16 19:30:01 -07:00
committed by James Almer
parent 25e710c61e
commit fb163eb28b
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/isom.h
View File

@ -376,7 +376,8 @@ typedef struct MOVContext {
int nb_heif_item; int nb_heif_item;
HEIFGrid *heif_grid; HEIFGrid *heif_grid;
int nb_heif_grid; int nb_heif_grid;
int thmb_item_id; int* thmb_item_id;
int nb_thmb_item;
int64_t idat_offset; int64_t idat_offset;
int interleaved_read; int interleaved_read;
} MOVContext; } MOVContext;

22
libavformat/mov.c
View File

@ -8972,6 +8972,7 @@ static int mov_read_iref_dimg(MOVContext *c, AVIOContext *pb, int version)
static int mov_read_iref_thmb(MOVContext *c, AVIOContext *pb, int version) static int mov_read_iref_thmb(MOVContext *c, AVIOContext *pb, int version)
{ {
int *thmb_item_id;
int entries; int entries;
int to_item_id, from_item_id = version ? avio_rb32(pb) : avio_rb16(pb); int to_item_id, from_item_id = version ? avio_rb32(pb) : avio_rb16(pb);
@ -8986,10 +8987,15 @@ static int mov_read_iref_thmb(MOVContext *c, AVIOContext *pb, int version)
if (to_item_id != c->primary_item_id) if (to_item_id != c->primary_item_id)
return 0; return 0;
c->thmb_item_id = from_item_id; /* Put thumnbail IDs into an array */
thmb_item_id = av_dynarray2_add((void **)&c->thmb_item_id, &c->nb_thmb_item,
sizeof(*c->thmb_item_id),
(const void *)&from_item_id);
if (!thmb_item_id)
return AVERROR(ENOMEM);
av_log(c->fc, AV_LOG_TRACE, "thmb: from_item_id %d, entries %d\n", av_log(c->fc, AV_LOG_TRACE, "thmb: from_item_id %d, entries %d, nb_thmb: %d\n",
from_item_id, entries); from_item_id, entries, c->nb_thmb_item);
return 0; return 0;
} }
@ -9859,6 +9865,7 @@ static int mov_read_close(AVFormatContext *s)
av_freep(&mov->heif_grid[i].tile_item_list); av_freep(&mov->heif_grid[i].tile_item_list);
} }
av_freep(&mov->heif_grid); av_freep(&mov->heif_grid);
av_freep(&mov->thmb_item_id);
return 0; return 0;
} }
@ -10323,10 +10330,13 @@ static int mov_parse_heif_items(AVFormatContext *s)
if (!item) if (!item)
continue; continue;
if (!item->st) { if (!item->st) {
if (item->item_id == mov->thmb_item_id) { for (int j = 0; j < mov->nb_thmb_item; j++) {
av_log(s, AV_LOG_ERROR, "HEIF thumbnail doesn't reference a stream\n"); if (item->item_id == mov->thmb_item_id[j]) {
av_log(s, AV_LOG_ERROR, "HEIF thumbnail ID %d doesn't reference a stream\n",
item->item_id);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
}
continue; continue;
} }
if (item->is_idat_relative) { if (item->is_idat_relative) {
@ -10476,7 +10486,7 @@ static int mov_read_header(AVFormatContext *s)
mov->fc = s; mov->fc = s;
mov->trak_index = -1; mov->trak_index = -1;
mov->thmb_item_id = -1; mov->thmb_item_id = NULL;
mov->primary_item_id = -1; mov->primary_item_id = -1;
mov->cur_item_id = -1; mov->cur_item_id = -1;
/* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */ /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */