History

avformat/mov: rename avif fields to heif

They are no longer avif specific.

James Almer committed 2 years ago

Commit 0405f711 parent 82ad55f2 files · +16 −16Browse files

Unified · Split

2 files
  1. libavformat/isom.h +2 −2
  2. libavformat/mov.c +14 −14
libavformat/isom.h+2−2
@@ -325,8 +325,8 @@ typedef struct MOVContext { · 324 unmodified lines
325325 int item_id;
326326 int extent_length;
327327 int64_t extent_offset;
328− } *avif_info;
329− int avif_info_size;
328+ } *heif_info;
329+ int heif_info_size;
330330 int64_t hvcC_offset;
331331 int hvcC_size;
332332 int interleaved_read;
libavformat/mov.c+14−14
@@ -4916,15 +4916,15 @@ static int mov_read_custom(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 4915 unmodified lines
49164916 return ret;
49174917 }
49184918
4919−static int avif_add_stream(MOVContext *c, int item_id)
4919+static int heif_add_stream(MOVContext *c, int item_id)
49204920 {
49214921 MOVStreamContext *sc;
49224922 AVStream *st;
49234923 int item_index = -1;
49244924 if (c->fc->nb_streams)
49254925 return AVERROR_INVALIDDATA;
4926− for (int i = 0; i < c->avif_info_size; i++)
4927− if (c->avif_info[i].item_id == item_id) {
4926+ for (int i = 0; i < c->heif_info_size; i++)
4927+ if (c->heif_info[i].item_id == item_id) {
49284928 item_index = i;
49294929 break;
49304930 }
@@ -4987,8 +4987,8 @@ static int avif_add_stream(MOVContext *c, int item_id) · 56 unmodified lines
49874987 sc->stts_data[0].count = 1;
49884988 // Not used for still images. But needed by mov_build_index.
49894989 sc->stts_data[0].duration = 0;
4990− sc->sample_sizes[0] = c->avif_info[item_index].extent_length;
4991− sc->chunk_offsets[0] = c->avif_info[item_index].extent_offset;
4990+ sc->sample_sizes[0] = c->heif_info[item_index].extent_length;
4991+ sc->chunk_offsets[0] = c->heif_info[item_index].extent_offset;
49924992
49934993 mov_build_index(c, st);
49944994 return 0;
@@ -5013,7 +5013,7 @@ static int mov_read_meta(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 18 unmodified lines
50135013 if (c->is_still_picture_avif) {
50145014 int ret;
50155015 // Add a stream for the YUV planes (primary item).
5016− if ((ret = avif_add_stream(c, c->primary_item_id)) < 0)
5016+ if ((ret = heif_add_stream(c, c->primary_item_id)) < 0)
50175017 return ret;
50185018 // For still AVIF images, the meta box contains all the
50195019 // necessary information that would generally be provided by the
@@ -7820,7 +7820,7 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 2800 unmodified lines
78207820 return 0;
78217821 }
78227822
7823− if (c->avif_info) {
7823+ if (c->heif_info) {
78247824 av_log(c->fc, AV_LOG_INFO, "Duplicate iloc box found\n");
78257825 return 0;
78267826 }
@@ -7841,16 +7841,16 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 14 unmodified lines
78417841 }
78427842 item_count = (version < 2) ? avio_rb16(pb) : avio_rb32(pb);
78437843
7844− c->avif_info = av_malloc_array(item_count, sizeof(*c->avif_info));
7845− if (!c->avif_info)
7844+ c->heif_info = av_malloc_array(item_count, sizeof(*c->heif_info));
7845+ if (!c->heif_info)
78467846 return AVERROR(ENOMEM);
7847− c->avif_info_size = item_count;
7847+ c->heif_info_size = item_count;
78487848
78497849 for (int i = 0; i < item_count; i++) {
78507850 int item_id = (version < 2) ? avio_rb16(pb) : avio_rb32(pb);
78517851 if (avio_feof(pb))
78527852 return AVERROR_INVALIDDATA;
7853− c->avif_info[i].item_id = item_id;
7853+ c->heif_info[i].item_id = item_id;
78547854
78557855 if (version > 0)
78567856 avio_rb16(pb); // construction_method.
@@ -7867,8 +7867,8 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 10 unmodified lines
78677867 if (rb_size(pb, &extent_offset, offset_size) < 0 ||
78687868 rb_size(pb, &extent_length, length_size) < 0)
78697869 return AVERROR_INVALIDDATA;
7870− c->avif_info[i].extent_length = extent_length;
7871− c->avif_info[i].extent_offset = base_offset + extent_offset;
7870+ c->heif_info[i].extent_length = extent_length;
7871+ c->heif_info[i].extent_offset = base_offset + extent_offset;
78727872 }
78737873 }
78747874
@@ -8502,7 +8502,7 @@ static int mov_read_close(AVFormatContext *s) · 627 unmodified lines
85028502
85038503 av_freep(&mov->aes_decrypt);
85048504 av_freep(&mov->chapter_tracks);
8505− av_freep(&mov->avif_info);
8505+ av_freep(&mov->heif_info);
85068506
85078507 return 0;
85088508 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t