RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-20 05:46:57 +00:00
Code Issues Projects Releases Wiki Activity

avformat/mov: factorize getting the current item

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 58c265d956)
This commit is contained in:
James Almer 2024-09-30 13:43:23 -03:00
parent f686cf77db
commit 779b0fe015
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libavformat/mov.c
View File

@ -188,6 +188,24 @@ static int mov_read_mac_string(MOVContext *c, AVIOContext *pb, int len,
return p - dst;
}
/**
* Get the current item in the parsing process.
*/
static HEIFItem *heif_cur_item(MOVContext *c)
{
HEIFItem *item = NULL;
for (int i = 0; i < c->nb_heif_item; i++) {
if (c->heif_item[i].item_id != c->cur_item_id)
continue;
item = &c->heif_item[i];
break;
}
return item;
}
/**
* Get the current stream in the parsing process. This can either be the
* latest stream added to the context, or the stream referenced by an item.
@ -195,23 +213,17 @@ static int mov_read_mac_string(MOVContext *c, AVIOContext *pb, int len,
static AVStream *get_curr_st(MOVContext *c)
{
AVStream *st = NULL;
HEIFItem *item;
if (c->fc->nb_streams < 1)
return NULL;
for (int i = 0; i < c->nb_heif_item; i++) {
HEIFItem *item = &c->heif_item[i];
if (!item->st)
continue;
if (item->st->id != c->cur_item_id)
continue;
if (c->cur_item_id == -1)
return c->fc->streams[c->fc->nb_streams-1];
item = heif_cur_item(c);
if (item)
st = item->st;
break;
}
if (!st && c->cur_item_id == -1)
st = c->fc->streams[c->fc->nb_streams-1];
return st;
}
@ -8912,6 +8924,7 @@ static int mov_read_iref(MOVContext *c, AVIOContext *pb, MOVAtom atom)
static int mov_read_ispe(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{
HEIFItem *item;
uint32_t width, height;
avio_r8(pb); /* version */
@ -8922,12 +8935,10 @@ static int mov_read_ispe(MOVContext *c, AVIOContext *pb, MOVAtom atom)
av_log(c->fc, AV_LOG_TRACE, "ispe: item_id %d, width %u, height %u\n",
c->cur_item_id, width, height);
for (int i = 0; i < c->nb_heif_item; i++) {
if (c->heif_item[i].item_id == c->cur_item_id) {
c->heif_item[i].width = width;
c->heif_item[i].height = height;
break;
}
item = heif_cur_item(c);
if (item) {
item->width = width;
item->height = height;
}
return 0;