avformat/mxfenc: add Coding Equations and Color Primaries to local tags

Fixes ticket #9079.

Signed-off-by: Marton Balint <cus@passwd.hu>

diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 6c5331ad62d4b71543772baa971cd2da74f65c38..0c464d4cfdb8674710a532c5047f070303666803 100644 (file)
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -361,6 +361,8 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = {
     { 0x3217, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x03,0x02,0x07,0x00,0x00,0x00}}, /* Display F2 offset */
     { 0x320E, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x00,0x00,0x00}}, /* Aspect Ratio */
     { 0x3210, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x02,0x01,0x01,0x01,0x02,0x00}}, /* Transfer characteristic */
+    { 0x321A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x02,0x01,0x01,0x03,0x01,0x00}}, /* Coding Equations (color space) */
+    { 0x3219, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x09,0x04,0x01,0x02,0x01,0x01,0x06,0x01,0x00}}, /* Color Primaries */
     { 0x3213, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x18,0x01,0x02,0x00,0x00,0x00,0x00}}, /* Image Start Offset */
     { 0x3214, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x18,0x01,0x03,0x00,0x00,0x00,0x00}}, /* Image End Offset */
     { 0x3201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x06,0x01,0x00,0x00,0x00,0x00}}, /* Picture Essence Coding */

diff --git a/tests/ref/fate/copy-trac4914 b/tests/ref/fate/copy-trac4914
index 7c8d0e91582c322d42132fb0e124b0699f45ca1f..e8f8afb4671c8d8f59b42520e5b5f00e2aee9cfc 100644 (file)
--- a/tests/ref/fate/copy-trac4914
+++ b/tests/ref/fate/copy-trac4914
@@ -1,4 +1,4 @@
-b37c4d5693cdb5b9ed9b33501ffb682a *tests/data/fate/copy-trac4914.mxf
+5d58a32f21b78169d925845f783054e6 *tests/data/fate/copy-trac4914.mxf
 561721 tests/data/fate/copy-trac4914.mxf
 #tb 0: 1001/30000
 #media_type 0: video

diff --git a/tests/ref/fate/mxf-d10-user-comments b/tests/ref/fate/mxf-d10-user-comments
index de4f26c6f8a5b2816f412e64a63689d9a2cf4511..3b9d9d2142a87d761a6d579a283f0724549c3819 100644 (file)
--- a/tests/ref/fate/mxf-d10-user-comments
+++ b/tests/ref/fate/mxf-d10-user-comments
@@ -1 +1 @@
-68f0fa62b6a676894afbbe4c34ebf70b
+fe9b43f5b6e7737fe2670b660fd3d860

diff --git a/tests/ref/fate/mxf-opatom-user-comments b/tests/ref/fate/mxf-opatom-user-comments
index 90e3fb229a80169847923fb7a787567b862bed53..be57eb4e19079e573f8432bb2a7a673fcdeaa3ee 100644 (file)
--- a/tests/ref/fate/mxf-opatom-user-comments
+++ b/tests/ref/fate/mxf-opatom-user-comments
@@ -1 +1 @@
-f6760a9e710ba478bc3949f3e5c9b34a
+9b3d7201c37c5783702774e46e0da141

diff --git a/tests/ref/fate/mxf-reel_name b/tests/ref/fate/mxf-reel_name
index 16022b178953ac2a8c1ae709f6e97ac3aeddefc5..acda8fe43a6eb605fe4d6d743d81459a93339e6d 100644 (file)
--- a/tests/ref/fate/mxf-reel_name
+++ b/tests/ref/fate/mxf-reel_name
@@ -1 +1 @@
-73a891041b2fc836a893ffb49fff4fff
+422d6ed4821e7bbecbcdecc553abc6e4

diff --git a/tests/ref/fate/mxf-user-comments b/tests/ref/fate/mxf-user-comments
index ddf51d939c35fed831bd44fae675e25a58e525db..3b77db9118a61a264e3a9118fdf38c985c2d9408 100644 (file)
--- a/tests/ref/fate/mxf-user-comments
+++ b/tests/ref/fate/mxf-user-comments
@@ -1 +1 @@
-1255faf854223a74d707553121e5eca3
+c77b632dbcdacd6466e1ec794917556e

diff --git a/tests/ref/fate/time_base b/tests/ref/fate/time_base
index 710fde1002d6d899921dcae1cdb19b76de027ac3..d3c97956d63cda94bea8017f73c295e87824108f 100644 (file)
--- a/tests/ref/fate/time_base
+++ b/tests/ref/fate/time_base
@@ -1 +1 @@
-42863a53f6c63efbc8c5a2eb76f13f5f
+e5c9da6972b6f6e7b15bcbbf20a9dbd1

diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf
index 5b16496f0679136de5f8c1f24619d91a57050a3f..1b1fe1a734593e9ee26868178ccc988a8c3639cd 100644 (file)
--- a/tests/ref/lavf/mxf
+++ b/tests/ref/lavf/mxf
@@ -1,9 +1,9 @@
-27b98795036b334e100c15c7e06d948f *tests/data/lavf/lavf.mxf
+1703da2e9f0ca49a5f0bcbcc6944c9c0 *tests/data/lavf/lavf.mxf
 526393 tests/data/lavf/lavf.mxf
 tests/data/lavf/lavf.mxf CRC=0x8dddfaab
-783b475a818602f54e947094d57e2981 *tests/data/lavf/lavf.mxf
+b44c4f138f1a87256211c3112dd52c87 *tests/data/lavf/lavf.mxf
 561721 tests/data/lavf/lavf.mxf
 tests/data/lavf/lavf.mxf CRC=0x96ff1b48
-02bf8f0cd8951a49e277306691cb1538 *tests/data/lavf/lavf.mxf
+9ede3c95054c30eb815fbe598a1f097b *tests/data/lavf/lavf.mxf
 526393 tests/data/lavf/lavf.mxf
 tests/data/lavf/lavf.mxf CRC=0x8dddfaab

diff --git a/tests/ref/lavf/mxf_d10 b/tests/ref/lavf/mxf_d10
index 30701619e0b355707170997e04bc83b1552d62d6..19e6f20b5100726f49bfe6208e2dc723a3434f9a 100644 (file)
--- a/tests/ref/lavf/mxf_d10
+++ b/tests/ref/lavf/mxf_d10
@@ -1,3 +1,3 @@
-da0ebbebb50a530b14c0f06017f464b3 *tests/data/lavf/lavf.mxf_d10
+c72f1f3d6ce555f96946c421f705f880 *tests/data/lavf/lavf.mxf_d10
 5332013 tests/data/lavf/lavf.mxf_d10
 tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488

diff --git a/tests/ref/lavf/mxf_dv25 b/tests/ref/lavf/mxf_dv25
index d4559df8625435c47daab674ca0ae9ed78a935b3..2951538caefa40c7e8b91e10c447dacae0fff17d 100644 (file)
--- a/tests/ref/lavf/mxf_dv25
+++ b/tests/ref/lavf/mxf_dv25
@@ -1,3 +1,3 @@
-57623b3b968c0bb0d8a0bbaeef6fe657 *tests/data/lavf/lavf.mxf_dv25
+5048796729fba47e9614a177c370e850 *tests/data/lavf/lavf.mxf_dv25
 3834413 tests/data/lavf/lavf.mxf_dv25
 tests/data/lavf/lavf.mxf_dv25 CRC=0xbdaf7f52

diff --git a/tests/ref/lavf/mxf_dvcpro50 b/tests/ref/lavf/mxf_dvcpro50
index 8bcf67d17f6632a99450b4a365abf1120f66f929..9df2fc925d53f523112f07a54a184c5dc2fea8df 100644 (file)
--- a/tests/ref/lavf/mxf_dvcpro50
+++ b/tests/ref/lavf/mxf_dvcpro50
@@ -1,3 +1,3 @@
-6e82b4cc962199e2593e30851ff7ccfb *tests/data/lavf/lavf.mxf_dvcpro50
+7023122fc4bcd5c12de6a33cc78ce9b8 *tests/data/lavf/lavf.mxf_dvcpro50
 7431213 tests/data/lavf/lavf.mxf_dvcpro50
 tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4

diff --git a/tests/ref/lavf/mxf_opatom b/tests/ref/lavf/mxf_opatom
index 1aa843a22ac73765f4f179ddb572a9d2c160bd53..bff36e02bedbf09ebfb620b36637582b05b5b090 100644 (file)
--- a/tests/ref/lavf/mxf_opatom
+++ b/tests/ref/lavf/mxf_opatom
@@ -1,3 +1,3 @@
-d5f56215c2b16dee204f03bfa653dd1b *tests/data/lavf/lavf.mxf_opatom
+8a4c5680b0955d4e2abecfb1c37a56d4 *tests/data/lavf/lavf.mxf_opatom
 4717625 tests/data/lavf/lavf.mxf_opatom
 tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a

diff --git a/tests/ref/lavf/mxf_opatom_audio b/tests/ref/lavf/mxf_opatom_audio
index 2b9306f1df3698a4be73225cfb8a77f51c63fad5..5c65a373e27ad758bc241da80896cccfb1728a92 100644 (file)
--- a/tests/ref/lavf/mxf_opatom_audio
+++ b/tests/ref/lavf/mxf_opatom_audio
@@ -1,3 +1,3 @@
-c45bb140605339556a77e751fda2c449 *tests/data/lavf/lavf.mxf_opatom_audio
+697f4eb4a472909945222d7750145f80 *tests/data/lavf/lavf.mxf_opatom_audio
 102969 tests/data/lavf/lavf.mxf_opatom_audio
 tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff