History

avformat/mov: parse colr boxes that reference tile grids

James Almer committed 2 years ago

Commit ba6eeb21 parent 58c265d2 files · +61 −11Browse files

Unified · Split

2 files
  1. libavformat/isom.h +2 −0
  2. libavformat/mov.c +59 −11
libavformat/isom.h+2−0
@@ -286,6 +286,8 @@ typedef struct HEIFItem { · 285 unmodified lines
286286 int rotation;
287287 int type;
288288 int is_idat_relative;
289+ uint8_t *icc_profile;
290+ size_t icc_profile_size;
289291 } HEIFItem;
290292
291293 typedef struct HEIFGrid {
libavformat/mov.c+59−11
@@ -2031,13 +2031,17 @@ static int mov_read_pcmc(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 2030 unmodified lines
20312031 static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom)
20322032 {
20332033 AVStream *st;
2034+ HEIFItem *item = NULL;
20342035 char color_parameter_type[5] = { 0 };
20352036 uint16_t color_primaries, color_trc, color_matrix;
20362037 int ret;
20372038
20382039 st = get_curr_st(c);
2039− if (!st)
2040− return 0;
2040+ if (!st) {
2041+ item = heif_cur_item(c);
2042+ if (!item)
2043+ return 0;
2044+ }
20412045
20422046 ret = ffio_read_size(pb, color_parameter_type, 4);
20432047 if (ret < 0)
@@ -2051,16 +2055,29 @@ static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 7 unmodified lines
20512055 }
20522056
20532057 if (!strncmp(color_parameter_type, "prof", 4)) {
2054− AVPacketSideData *sd = av_packet_side_data_new(&st->codecpar->coded_side_data,
2055− &st->codecpar->nb_coded_side_data,
2056− AV_PKT_DATA_ICC_PROFILE,
2057− atom.size - 4, 0);
2058− if (!sd)
2059− return AVERROR(ENOMEM);
2060− ret = ffio_read_size(pb, sd->data, atom.size - 4);
2058+ AVPacketSideData *sd;
2059+ uint8_t *icc_profile;
2060+ if (st) {
2061+ sd = av_packet_side_data_new(&st->codecpar->coded_side_data,
2062+ &st->codecpar->nb_coded_side_data,
2063+ AV_PKT_DATA_ICC_PROFILE,
2064+ atom.size - 4, 0);
2065+ if (!sd)
2066+ return AVERROR(ENOMEM);
2067+ icc_profile = sd->data;
2068+ } else {
2069+ av_freep(&item->icc_profile);
2070+ icc_profile = item->icc_profile = av_malloc(atom.size - 4);
2071+ if (!icc_profile) {
2072+ item->icc_profile_size = 0;
2073+ return AVERROR(ENOMEM);
2074+ }
2075+ item->icc_profile_size = atom.size - 4;
2076+ }
2077+ ret = ffio_read_size(pb, icc_profile, atom.size - 4);
20612078 if (ret < 0)
20622079 return ret;
2063− } else {
2080+ } else if (st) {
20642081 color_primaries = avio_rb16(pb);
20652082 color_trc = avio_rb16(pb);
20662083 color_matrix = avio_rb16(pb);
@@ -9714,8 +9731,10 @@ static int mov_read_close(AVFormatContext *s) · 7647 unmodified lines
97149731
97159732 av_freep(&mov->aes_decrypt);
97169733 av_freep(&mov->chapter_tracks);
9717− for (i = 0; i < mov->nb_heif_item; i++)
9734+ for (i = 0; i < mov->nb_heif_item; i++) {
97189735 av_freep(&mov->heif_item[i].name);
9736+ av_freep(&mov->heif_item[i].icc_profile);
9737+ }
97199738 av_freep(&mov->heif_item);
97209739 for (i = 0; i < mov->nb_heif_grid; i++) {
97219740 av_freep(&mov->heif_grid[i].tile_id_list);
@@ -9861,6 +9880,20 @@ fail: · 139 unmodified lines
98619880 return ret;
98629881 }
98639882
9883+static int set_icc_profile_from_item(AVPacketSideData **coded_side_data, int *nb_coded_side_data,
9884+ const HEIFItem *item)
9885+{
9886+ AVPacketSideData *sd = av_packet_side_data_new(coded_side_data, nb_coded_side_data,
9887+ AV_PKT_DATA_ICC_PROFILE,
9888+ item->icc_profile_size, 0);
9889+ if (!sd)
9890+ return AVERROR(ENOMEM);
9891+
9892+ memcpy(sd->data, item->icc_profile, item->icc_profile_size);
9893+
9894+ return 0;
9895+}
9896+
98649897 static int set_display_matrix_from_item(AVPacketSideData **coded_side_data, int *nb_coded_side_data,
98659898 const HEIFItem *item)
98669899 {
@@ -9914,6 +9947,13 @@ static int read_image_grid(AVFormatContext *s, const HEIFGrid *grid, · 47 unmodified lines
99149947 tile_grid->width = (flags & 1) ? avio_rb32(s->pb) : avio_rb16(s->pb);
99159948 tile_grid->height = (flags & 1) ? avio_rb32(s->pb) : avio_rb16(s->pb);
99169949
9950+ /* ICC profile */
9951+ if (item->icc_profile_size) {
9952+ int ret = set_icc_profile_from_item(&tile_grid->coded_side_data,
9953+ &tile_grid->nb_coded_side_data, item);
9954+ if (ret < 0)
9955+ return ret;
9956+ }
99179957 /* rotation */
99189958 if (item->rotation) {
99199959 int ret = set_display_matrix_from_item(&tile_grid->coded_side_data,
@@ -10021,6 +10061,14 @@ static int read_image_iovl(AVFormatContext *s, const HEIFGrid *grid, · 101 unmodified lines
1002110061 return ret;
1002210062 }
1002310063
10064+ /* ICC profile */
10065+ if (item->icc_profile_size) {
10066+ int ret = set_icc_profile_from_item(&tile_grid->coded_side_data,
10067+ &tile_grid->nb_coded_side_data, item);
10068+ if (ret < 0)
10069+ return ret;
10070+ }
10071+
1002410072 av_log(c->fc, AV_LOG_TRACE, "iovl: output_width %d, output_height %d\n",
1002510073 tile_grid->width, tile_grid->height);
1002610074

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