Commit 3fa0394b7d for ffmpeg
commit 3fa0394b7d17094965107a38dca20bfd6201149b
Author: Devon Sookhoo <devonsookhoo14@gmail.com>
Date: Thu Nov 12 14:51:39 2026 -0700
avformat/mov: add support for uncC atom demuxing
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index c9d708be84..16c04b9a5c 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -81,7 +81,8 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
else if (avctx->codec_tag == MKTAG('W', 'R', 'A', 'W'))
avctx->pix_fmt = avpriv_pix_fmt_find(PIX_FMT_LIST_AVI,
avctx->bits_per_coded_sample);
- else if (avctx->codec_tag && (avctx->codec_tag & 0xFFFFFF) != MKTAG('B','I','T', 0))
+ else if (avctx->codec_tag && (avctx->codec_tag & 0xFFFFFF) != MKTAG('B','I','T', 0) &&
+ avctx->codec_tag != MKTAG('u','n','c','v'))
avctx->pix_fmt = avpriv_pix_fmt_find(PIX_FMT_LIST_RAW, avctx->codec_tag);
else if (avctx->pix_fmt == AV_PIX_FMT_NONE && avctx->bits_per_coded_sample)
avctx->pix_fmt = avpriv_pix_fmt_find(PIX_FMT_LIST_AVI,
diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c
index 06166c0fa8..9aed152606 100644
--- a/libavformat/isom_tags.c
+++ b/libavformat/isom_tags.c
@@ -54,6 +54,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
{ AV_CODEC_ID_RAWVIDEO, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', '4', '2', '0') }, /* Radius DV YUV PAL */
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', '4', '1', '1') }, /* Radius DV YUV NTSC */
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('u', 'n', 'c', 'v') }, /* ISO/IEC 23001-17 - The official ISO-BMFF carriage of uncompressed video and images */
{ AV_CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') }, /* uncompressed 10-bit RGB */
{ AV_CODEC_ID_R10K, MKTAG('R', '1', '0', 'g') }, /* uncompressed 10-bit RGB */
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 7c91c32999..ba6d9606a6 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -10330,6 +10330,46 @@ static int mov_read_mhac(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return ret;
}
+static int mov_read_uncc(MOVContext *c, AVIOContext *pb, MOVAtom atom)
+{
+ AVStream *st;
+ int version;
+ uint32_t profile;
+
+ if (c->fc->nb_streams < 1)
+ return 0;
+ st = c->fc->streams[c->fc->nb_streams - 1];
+
+ if (atom.size < 8)
+ return AVERROR_INVALIDDATA;
+
+ version = avio_r8(pb);
+ avio_rb24(pb); /* flags */
+ profile = avio_rl32(pb);
+
+ if (version == 1) {
+ switch (profile) {
+ case MKTAG('r','g','b','3'):
+ st->codecpar->format = AV_PIX_FMT_RGB24;
+ break;
+ case MKTAG('r','g','b','a'):
+ st->codecpar->format = AV_PIX_FMT_RGBA;
+ break;
+ default:
+ avpriv_request_sample(c->fc, "Unknown uncC profile %s", av_fourcc2str(profile));
+ return AVERROR_INVALIDDATA;
+ }
+ } else if (version == 0) {
+ avpriv_request_sample(c->fc, "uncC version 0 not yet implemented");
+ return AVERROR_PATCHWELCOME;
+ } else {
+ av_log(c->fc, AV_LOG_WARNING, "Unknown uncC version %d\n", version);
+ return AVERROR_INVALIDDATA;
+ }
+
+ return 0;
+}
+
static const MOVParseTableEntry mov_default_parse_table[] = {
{ MKTAG('A','C','L','R'), mov_read_aclr },
{ MKTAG('A','P','R','G'), mov_read_avid },
@@ -10366,6 +10406,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = {
{ MKTAG('S','M','I',' '), mov_read_svq3 },
{ MKTAG('a','l','a','c'), mov_read_alac }, /* alac specific atom */
{ MKTAG('a','v','c','C'), mov_read_glbl },
+{ MKTAG('u','n','c','C'), mov_read_uncc },
{ MKTAG('p','a','s','p'), mov_read_pasp },
{ MKTAG('c','l','a','p'), mov_read_clap },
{ MKTAG('c','d','s','c'), mov_read_cdsc_rndr },
diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak
index ad45fb91e3..1463ed841a 100644
--- a/tests/fate/mov.mak
+++ b/tests/fate/mov.mak
@@ -53,6 +53,9 @@ fate-mov-vpcc-reserved-color-tags: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -v erro
-show_entries stream=color_primaries,color_transfer,color_space -of default=nw=1 \
$(TARGET_SAMPLES)/mov/vpcc-reserved-color-tags.mp4
+FATE_MOV-$(call DEMDEC, MOV, RAWVIDEO) += fate-mov-uncv-rgb24
+fate-mov-uncv-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/mov/uncv-rgb24.mp4
+
FATE_MOV_FFPROBE-$(CONFIG_MOV_DEMUXER) += fate-ffprobe-stream-entries-tmcd \
fate-ffprobe-group-stream-entries-tmcd \
fate-ffprobe-show-groups-tmcd
diff --git a/tests/ref/fate/mov-uncv-rgb24 b/tests/ref/fate/mov-uncv-rgb24
new file mode 100644
index 0000000000..86f0849413
--- /dev/null
+++ b/tests/ref/fate/mov-uncv-rgb24
@@ -0,0 +1,8 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
+0, 0, 0, 1, 12288, 0x670d211d
+0, 1, 1, 1, 12288, 0x57fd211d
+0, 2, 2, 1, 12288, 0xa64a211d