Commit 329157f585 for ffmpeg
commit 329157f5853150baf378a224b9dc828602e9045a
Author: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Fri Nov 13 16:30:29 2026 -0800
avformat/mxfenc: set the OP1a uni-track qualifier for a single track
The timecode track is not an essence track, ST 378 6.4.3.
Signed-off-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 5f8439913e..7f5d630737 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -756,6 +756,20 @@ static void mxf_write_essence_container_refs(AVFormatContext *s)
avio_write(pb, multiple_desc_ul, 16);
}
+static void mxf_write_operational_pattern(AVFormatContext *s)
+{
+ AVIOContext *pb = s->pb;
+
+ if (IS_OPATOM(s)) {
+ avio_write(pb, opatom_ul, 16);
+ } else {
+ avio_write(pb, op1a_ul, 14);
+ // qualifiers, ST 378 6.4: multi-track if more than one essence track
+ avio_w8(pb, s->nb_streams > 1 ? 0x09 : 0x01);
+ avio_w8(pb, op1a_ul[15]);
+ }
+}
+
static void mxf_write_preface(AVFormatContext *s)
{
MXFContext *mxf = s->priv_data;
@@ -793,10 +807,7 @@ static void mxf_write_preface(AVFormatContext *s)
// operational pattern
mxf_write_local_tag(s, 16, 0x3B09);
- if (IS_OPATOM(s))
- avio_write(pb, opatom_ul, 16);
- else
- avio_write(pb, op1a_ul, 16);
+ mxf_write_operational_pattern(s);
// write essence_container_refs
mxf_write_local_tag(s, 8 + 16LL * DESCRIPTOR_COUNT(mxf->essence_container_count), 0x3B0A);
@@ -2301,10 +2312,7 @@ static int mxf_write_partition(AVFormatContext *s, int bodysid,
avio_wb32(pb, bodysid); // bodySID
// operational pattern
- if (IS_OPATOM(s))
- avio_write(pb, opatom_ul, 16);
- else
- avio_write(pb, op1a_ul, 16);
+ mxf_write_operational_pattern(s);
// essence container
mxf_write_essence_container_refs(s);
diff --git a/tests/ref/fate/mxf-d10-user-comments b/tests/ref/fate/mxf-d10-user-comments
index 614c7c19a3..60f23f31c2 100644
--- a/tests/ref/fate/mxf-d10-user-comments
+++ b/tests/ref/fate/mxf-d10-user-comments
@@ -1,4 +1,4 @@
-ca2d9a476892e92928d48ada9e72b152 *tests/data/fate/mxf-d10-user-comments.mxf_d10
+f4c03e7304d45b2f2b9b4727f115ed61 *tests/data/fate/mxf-d10-user-comments.mxf_d10
3782189 tests/data/fate/mxf-d10-user-comments.mxf_d10
#extradata 0: 34, 0x717105c5
#tb 0: 1/25
@@ -12,7 +12,7 @@ ca2d9a476892e92928d48ada9e72b152 *tests/data/fate/mxf-d10-user-comments.mxf_d10
0, 2, 3, 1, 150000, 0x36dbac43, F=0x0
0, 3, 4, 1, 150000, 0xe1c2955a, F=0x0
[FORMAT]
-TAG:operational_pattern_ul=060e2b34.04010101.0d010201.01010900
+TAG:operational_pattern_ul=060e2b34.04010101.0d010201.01010100
TAG:uid=adab4424-2f25-4dc7-92ff-000c00000000
TAG:generation_uid=adab4424-2f25-4dc7-92ff-000c00000001
TAG:company_name=FATE-company
diff --git a/tests/ref/fate/time_base b/tests/ref/fate/time_base
index ae96232e60..16a4bb9f4e 100644
--- a/tests/ref/fate/time_base
+++ b/tests/ref/fate/time_base
@@ -1 +1 @@
-69ffc45e19ab070bc3e964d7b718fe53
+6e5f2c57c2d4a3bf4cdd3e64cae5e5bf
diff --git a/tests/ref/lavf/mxf_ffv1 b/tests/ref/lavf/mxf_ffv1
index 1fcf09250a..e876d9e5b2 100644
--- a/tests/ref/lavf/mxf_ffv1
+++ b/tests/ref/lavf/mxf_ffv1
@@ -1,3 +1,3 @@
-bf91a74a741da5435ff4577358c269f8 *tests/data/lavf/lavf.mxf_ffv1
+cda1615f44d0ed0dd63971d8f72a7a95 *tests/data/lavf/lavf.mxf_ffv1
5587001 tests/data/lavf/lavf.mxf_ffv1
tests/data/lavf/lavf.mxf_ffv1 CRC=0x02354cdc