Commit 2473872b7c for ffmpeg
commit 2473872b7ceadbdf3235c0a482f58753e3f6dacb
Author: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Tue Nov 17 10:53:32 2026 -0800
avformat/movenc: convert deprecated nclc code points
Write gamma 2.2 and 2.8 as an unspecified transfer with a gama atom, and values
that are not ISO/IEC 23091-2 code points as unspecified with a warning.
Signed-off-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 7e510a63b1..25df5e5f46 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -2698,9 +2698,61 @@ static int mov_write_gama_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra
return 0;
}
-static int mov_write_colr_tag(AVIOContext *pb, MOVTrack *track, int prefer_icc)
+/* Write values that are not ISO/IEC 23091-2 code points as unspecified.
+ * For nclc, also convert the code points QuickTime reserves or deprecates. */
+static enum AVColorPrimaries mov_colr_primaries(enum AVColorPrimaries pri, int nclc)
{
+ if (nclc && pri == AVCOL_PRI_SMPTE240M)
+ return AVCOL_PRI_SMPTE170M;
+ if (pri >= AVCOL_PRI_EXT_BASE || pri == AVCOL_PRI_RESERVED0 ||
+ pri == AVCOL_PRI_RESERVED || !av_color_primaries_name(pri))
+ return AVCOL_PRI_UNSPECIFIED;
+ return pri;
+}
+
+static enum AVColorTransferCharacteristic mov_colr_trc(enum AVColorTransferCharacteristic trc,
+ int nclc)
+{
+ if (nclc && (trc == AVCOL_TRC_SMPTE170M || trc == AVCOL_TRC_BT2020_10 ||
+ trc == AVCOL_TRC_BT2020_12))
+ return AVCOL_TRC_BT709;
+ // nclc signals these as unspecified, with the gamma in a gama atom
+ if (nclc && (trc == AVCOL_TRC_GAMMA22 || trc == AVCOL_TRC_GAMMA28))
+ return AVCOL_TRC_UNSPECIFIED;
+ if (trc >= AVCOL_TRC_EXT_BASE || trc == AVCOL_TRC_RESERVED0 ||
+ trc == AVCOL_TRC_RESERVED || !av_color_transfer_name(trc))
+ return AVCOL_TRC_UNSPECIFIED;
+ return trc;
+}
+
+static enum AVColorSpace mov_colr_matrix(enum AVColorSpace matrix, int nclc)
+{
+ if (nclc && matrix == AVCOL_SPC_BT470BG)
+ return AVCOL_SPC_SMPTE170M;
+ // nclc reserves 0, so it cannot signal RGB
+ if ((nclc && matrix == AVCOL_SPC_RGB) ||
+ matrix == AVCOL_SPC_RESERVED || !av_color_space_name(matrix))
+ return AVCOL_SPC_UNSPECIFIED;
+ return matrix;
+}
+
+static const char *color_name(const char *name)
+{
+ return name ? name : "reserved";
+}
+
+static int mov_write_colr_tag(AVFormatContext *s, AVIOContext *pb,
+ MOVTrack *track, int prefer_icc)
+{
+ MOVMuxContext *mov = s->priv_data;
int64_t pos = avio_tell(pb);
+ int gama = track->mode == MODE_MOV &&
+ (track->par->color_trc == AVCOL_TRC_GAMMA22 ||
+ track->par->color_trc == AVCOL_TRC_GAMMA28);
+ int size;
+ enum AVColorPrimaries primaries = track->par->color_primaries;
+ enum AVColorTransferCharacteristic trc = track->par->color_trc;
+ enum AVColorSpace matrix = track->par->color_space;
// Ref (MOV): https://developer.apple.com/library/mac/technotes/tn2162/_index.html#//apple_ref/doc/uid/DTS40013070-CH1-TNTAG9
// Ref (MP4): ISO/IEC 14496-12:2012
@@ -2735,15 +2787,47 @@ static int mov_write_colr_tag(AVIOContext *pb, MOVTrack *track, int prefer_icc)
// Do not try to guess the color info if it is AVCOL_PRI_UNSPECIFIED.
// e.g., Dolby Vision for Apple devices should be set to AVCOL_PRI_UNSPECIFIED. See
// https://developer.apple.com/av-foundation/High-Dynamic-Range-Metadata-for-Apple-Devices.pdf
- avio_wb16(pb, track->par->color_primaries);
- avio_wb16(pb, track->par->color_trc);
- avio_wb16(pb, track->par->color_space);
+ if (track->mode == MODE_MOV || track->mode == MODE_MP4) {
+ int nclc = track->mode == MODE_MOV;
+
+ primaries = mov_colr_primaries(track->par->color_primaries, nclc);
+ trc = mov_colr_trc(track->par->color_trc, nclc);
+ matrix = mov_colr_matrix(track->par->color_space, nclc);
+
+ if (!track->colr_warned) {
+ const char *type = nclc ? "nclc" : "nclx";
+
+ if (primaries == AVCOL_PRI_UNSPECIFIED &&
+ track->par->color_primaries != AVCOL_PRI_UNSPECIFIED)
+ av_log(s, AV_LOG_WARNING, "Color primaries %s not supported "
+ "in %s, writing unspecified\n",
+ color_name(av_color_primaries_name(track->par->color_primaries)), type);
+ if (trc == AVCOL_TRC_UNSPECIFIED && !gama &&
+ track->par->color_trc != AVCOL_TRC_UNSPECIFIED)
+ av_log(s, AV_LOG_WARNING, "Color transfer %s not supported "
+ "in %s, writing unspecified\n",
+ color_name(av_color_transfer_name(track->par->color_trc)), type);
+ if (matrix == AVCOL_SPC_UNSPECIFIED &&
+ track->par->color_space != AVCOL_SPC_UNSPECIFIED)
+ av_log(s, AV_LOG_WARNING, "Color matrix %s not supported "
+ "in %s, writing unspecified\n",
+ color_name(av_color_space_name(track->par->color_space)), type);
+ track->colr_warned = 1;
+ }
+ }
+ avio_wb16(pb, primaries);
+ avio_wb16(pb, trc);
+ avio_wb16(pb, matrix);
if (track->mode == MODE_MP4 || track->mode == MODE_AVIF) {
int full_range = track->par->color_range == AVCOL_RANGE_JPEG;
avio_w8(pb, full_range << 7);
}
- return update_size(pb, pos);
+ size = update_size(pb, pos);
+ // A gama atom written for -movflags write_gama already carries it
+ if (gama && !(mov->flags & FF_MOV_FLAG_WRITE_GAMA))
+ size += mov_write_gama_tag(s, pb, track, 0.0);
+ return size;
}
static int mov_write_clli_tag(AVIOContext *pb, MOVTrack *track)
@@ -3041,7 +3125,13 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex
av_packet_side_data_get(track->st->codecpar->coded_side_data, track->st->codecpar->nb_coded_side_data,
AV_PKT_DATA_ICC_PROFILE)) {
int prefer_icc = mov->flags & FF_MOV_FLAG_PREFER_ICC || !has_color_info;
- mov_write_colr_tag(pb, track, prefer_icc);
+ mov_write_colr_tag(s, pb, track, prefer_icc);
+ } else if (track->mode == MODE_MOV &&
+ !(mov->flags & FF_MOV_FLAG_WRITE_GAMA) &&
+ (track->par->color_trc == AVCOL_TRC_GAMMA22 ||
+ track->par->color_trc == AVCOL_TRC_GAMMA28)) {
+ // Without colr, the gamma is still signaled in a gama atom
+ mov_write_gama_tag(s, pb, track, 0.0);
}
} else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) {
av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4 or AVIF.\n");
@@ -3905,7 +3995,7 @@ static int mov_write_ipco_tag(AVIOContext *pb, MOVMuxContext *mov, AVFormatConte
mov_write_pixi_tag(pb, mov, s, i);
mov_write_av1c_tag(pb, &mov->tracks[i]);
if (!i)
- mov_write_colr_tag(pb, &mov->tracks[0], 0);
+ mov_write_colr_tag(s, pb, &mov->tracks[0], 0);
else
mov_write_aux_tag(pb, "auxC");
}
diff --git a/libavformat/movenc.h b/libavformat/movenc.h
index 004b37fa57..ce5f928015 100644
--- a/libavformat/movenc.h
+++ b/libavformat/movenc.h
@@ -183,6 +183,7 @@ typedef struct MOVTrack {
int pal_done;
int is_unaligned_qt_rgb;
+ int colr_warned;
unsigned int squash_fragment_samples_to_one; //< flag to note formats where all samples for a fragment are to be squashed
diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak
index a603ca94de..b62aca6988 100644
--- a/tests/fate/mov.mak
+++ b/tests/fate/mov.mak
@@ -361,12 +361,24 @@ FATE_MOV_FFMPEG_SAMPLES-$(call REMUX, MP4 MOV, AAC_PARSER) \
+= fate-mov-mp4-edst-remainder
fate-mov-mp4-edst-remainder: CMD = stream_remux mov $(TARGET_SAMPLES)/audiomatch/tones_fdkaac_44100_stereo_aac_lc.m4a "" mp4 "" "" "-c:a copy"
-# A colr box can carry reserved colour values; they must not reach the stream
-FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call REMUX, MOV, QTRLE_DECODER) += fate-mov-colr-reserved-color-tags
-fate-mov-colr-reserved-color-tags: CMD = stream_remux mov $(TARGET_SAMPLES)/qtrle/aletrek-rle.mov "" mov \
+# Reserved colour values must not be written to colr
+FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call REMUX, MP4 MOV, H264_PARSER H264_DECODER) += fate-mov-colr-reserved-color-tags
+fate-mov-colr-reserved-color-tags: CMD = stream_remux mov $(TARGET_SAMPLES)/mov/test_iibbibb.mp4 "" mp4 \
"-map 0:v -frames:v 1 -color_primaries 3 -color_trc 3 -colorspace 3" "" "-c:v copy" \
"-select_streams v -show_entries stream=color_primaries,color_transfer,color_space -of default=nw=1"
+# nclc signals gamma 2.8 as an unspecified transfer with a gama atom
+FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call REMUX, MOV, H264_PARSER H264_DECODER) += fate-mov-gama-color-trc
+fate-mov-gama-color-trc: CMD = stream_remux mov $(TARGET_SAMPLES)/mov/test_iibbibb.mp4 "" mov \
+ "-map 0:v -frames:v 1 -color_primaries smpte170m -color_trc gamma28 -colorspace smpte170m" "" "-c:v copy" \
+ "-select_streams v -show_entries stream=color_primaries,color_transfer,color_space -of default=nw=1"
+
+# without colr, gamma 2.2 is still signaled with a gama atom
+FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call REMUX, MOV, H264_PARSER H264_DECODER) += fate-mov-gama-only-color-trc
+fate-mov-gama-only-color-trc: CMD = stream_remux mov $(TARGET_SAMPLES)/mov/test_iibbibb.mp4 "" mov \
+ "-map 0:v -frames:v 1 -color_trc gamma22" "" "-c:v copy" \
+ "-select_streams v -show_entries stream=color_primaries,color_transfer,color_space -of default=nw=1"
+
# format-level branding: major_brand, minor_version, compatible_brands should be deleted on re-encode
FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call ENCDEC, AAC AAC, NUT MOV) += fate-mov-reenc-delete-format-metadata
fate-mov-reenc-delete-format-metadata: CMD = transcode mov $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a nut "-map 0:a:0 -c:a aac -bitexact -t 0.1" "-c copy -t 0.1" "-show_entries format_tags" "" "" "" null
diff --git a/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov b/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
index 66ca2e8338..a41b860792 100644
--- a/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
+++ b/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
@@ -30,7 +30,7 @@ display_aspect_ratio=127:71
pix_fmt=gray
color_range=unknown
color_space=unknown
-color_transfer=unknown
+color_transfer=bt470m
color_primaries=unknown
chroma_location=unspecified
field_order=unknown
diff --git a/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov b/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
index 916f3d525a..a3c89e8351 100644
--- a/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
+++ b/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
@@ -30,7 +30,7 @@ display_aspect_ratio=127:71
pix_fmt=rgb0
color_range=unknown
color_space=unknown
-color_transfer=unknown
+color_transfer=bt470m
color_primaries=unknown
chroma_location=unspecified
field_order=unknown
diff --git a/tests/ref/fate/mov-colr-reserved-color-tags b/tests/ref/fate/mov-colr-reserved-color-tags
index ea12632aa9..f9d92880d0 100644
--- a/tests/ref/fate/mov-colr-reserved-color-tags
+++ b/tests/ref/fate/mov-colr-reserved-color-tags
@@ -1,11 +1,12 @@
-c6b96e10140cb9554d1eb6a5dccc1c1b *tests/data/fate/mov-colr-reserved-color-tags.mov
-7552 tests/data/fate/mov-colr-reserved-color-tags.mov
-#tb 0: 1/19200
+b58cbcdffde271ed93efaa8e7279a12e *tests/data/fate/mov-colr-reserved-color-tags.mp4
+8645 tests/data/fate/mov-colr-reserved-color-tags.mp4
+#extradata 0: 42, 0x114f0ce2
+#tb 0: 1/16384
#media_type 0: video
-#codec_id 0: qtrle
-#dimensions 0: 160x120
-#sar 0: 0/1
-0, 0, 0, 1920, 6838, 0x2d59b149
+#codec_id 0: h264
+#dimensions 0: 704x576
+#sar 0: 1/1
+0, -32768, 0, 16384, 7804, 0x565f1f4b
color_space=unknown
color_transfer=unknown
color_primaries=unknown
diff --git a/tests/ref/fate/mov-gama-color-trc b/tests/ref/fate/mov-gama-color-trc
new file mode 100644
index 0000000000..89487f6e1d
--- /dev/null
+++ b/tests/ref/fate/mov-gama-color-trc
@@ -0,0 +1,12 @@
+e617b62793e2497c9ebf809599b9c869 *tests/data/fate/mov-gama-color-trc.mov
+8607 tests/data/fate/mov-gama-color-trc.mov
+#extradata 0: 42, 0x114f0ce2
+#tb 0: 1/16384
+#media_type 0: video
+#codec_id 0: h264
+#dimensions 0: 704x576
+#sar 0: 1/1
+0, -32768, 0, 16384, 7804, 0x565f1f4b
+color_space=smpte170m
+color_transfer=bt470bg
+color_primaries=smpte170m
diff --git a/tests/ref/fate/mov-gama-only-color-trc b/tests/ref/fate/mov-gama-only-color-trc
new file mode 100644
index 0000000000..44830245cc
--- /dev/null
+++ b/tests/ref/fate/mov-gama-only-color-trc
@@ -0,0 +1,12 @@
+b764f5eab64ce82780ad1018d711e11e *tests/data/fate/mov-gama-only-color-trc.mov
+8589 tests/data/fate/mov-gama-only-color-trc.mov
+#extradata 0: 42, 0x114f0ce2
+#tb 0: 1/16384
+#media_type 0: video
+#codec_id 0: h264
+#dimensions 0: 704x576
+#sar 0: 1/1
+0, -32768, 0, 16384, 7804, 0x565f1f4b
+color_space=unknown
+color_transfer=bt470m
+color_primaries=unknown
diff --git a/tests/ref/fate/prores-aw-color-tags b/tests/ref/fate/prores-aw-color-tags
index 1e1b8a9d4f..3bc994c28a 100644
--- a/tests/ref/fate/prores-aw-color-tags
+++ b/tests/ref/fate/prores-aw-color-tags
@@ -1,4 +1,4 @@
-a8f6ac525b5969628b57ea7790b0a6dc *tests/data/fate/prores-aw-color-tags.mov
+42317e234ea741711754dec165fcb073 *tests/data/fate/prores-aw-color-tags.mov
101914 tests/data/fate/prores-aw-color-tags.mov
#tb 0: 1/12800
#media_type 0: video
diff --git a/tests/ref/fate/prores-ks-color-tags b/tests/ref/fate/prores-ks-color-tags
index 10a1c0ab4a..b59b87277b 100644
--- a/tests/ref/fate/prores-ks-color-tags
+++ b/tests/ref/fate/prores-ks-color-tags
@@ -1,4 +1,4 @@
-30647bfc1da947fe42c90e9c169df5f3 *tests/data/fate/prores-ks-color-tags.mov
+c56c23bb7b2a97c5da4ee94246d189a7 *tests/data/fate/prores-ks-color-tags.mov
77871 tests/data/fate/prores-ks-color-tags.mov
#tb 0: 1/12800
#media_type 0: video
diff --git a/tests/ref/fate/prores-unknown-color-tags b/tests/ref/fate/prores-unknown-color-tags
index 584a0a8050..be19eb5dd9 100644
--- a/tests/ref/fate/prores-unknown-color-tags
+++ b/tests/ref/fate/prores-unknown-color-tags
@@ -1,4 +1,4 @@
-e8fedc135d405134af2dada81b173cc9 *tests/data/fate/prores-unknown-color-tags.mov
+b1ea3a803ee7658025cd3449838b0bd0 *tests/data/fate/prores-unknown-color-tags.mov
115303 tests/data/fate/prores-unknown-color-tags.mov
#tb 0: 1/11988
#media_type 0: video
@@ -9,4 +9,4 @@ e8fedc135d405134af2dada81b173cc9 *tests/data/fate/prores-unknown-color-tags.mov
0, 400, 400, 400, 57296, 0x4cc02182
color_space=smpte170m
color_primaries=smpte170m
-color_transfer=smpte170m
+color_transfer=bt709