videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avformat/mxfenc: Add object model version 

Other tools (XFConvert at least) write this as well.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2018-03-17 21:16:26 +01:00
parent 86c9250923
commit 1b6c89ca8d
10 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/mxfenc.c
View File

@ -422,6 +422,7 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = {
{ 0x3C0A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x01,0x01,0x15,0x02,0x00,0x00,0x00,0x00}}, /* Instance UID */
{ 0x3B02, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x10,0x02,0x04,0x00,0x00}}, /* Last Modified Date */
{ 0x3B05, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x03,0x01,0x02,0x01,0x05,0x00,0x00,0x00}}, /* Version */
{ 0x3B07, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x03,0x01,0x02,0x01,0x04,0x00,0x00,0x00}}, /* Object Model Version */
{ 0x3B06, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x06,0x04,0x00,0x00}}, /* Identifications reference */
{ 0x3B03, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x02,0x01,0x00,0x00}}, /* Content Storage reference */
{ 0x3B09, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x01,0x02,0x02,0x03,0x00,0x00,0x00,0x00}}, /* Operational Pattern UL */
@ -681,7 +682,7 @@ static void mxf_write_preface(AVFormatContext *s)
mxf_write_metadata_key(pb, 0x012f00);
PRINT_KEY(s, "preface key", pb->buf_ptr - 16);
klv_encode_ber_length(pb, 130 + 16LL * DESCRIPTOR_COUNT(mxf->essence_container_count));
klv_encode_ber_length(pb, 138 + 16LL * DESCRIPTOR_COUNT(mxf->essence_container_count));
// write preface set uid
mxf_write_local_tag(pb, 16, 0x3C0A);
@ -696,6 +697,10 @@ static void mxf_write_preface(AVFormatContext *s)
mxf_write_local_tag(pb, 2, 0x3B05);
avio_wb16(pb, 259); // v1.3
// Object Model Version
mxf_write_local_tag(pb, 4, 0x3B07);
avio_wb32(pb, 1);
// write identification_refs
mxf_write_local_tag(pb, 16 + 8, 0x3B06);
mxf_write_refs_count(pb, 1);

2
tests/ref/fate/copy-trac4914
View File

@ -1,4 +1,4 @@
da66943da7ede9d7409c78befa3c1b95 *tests/data/fate/copy-trac4914.mxf
2bbcbc55eebf305aec776bce60d09f91 *tests/data/fate/copy-trac4914.mxf
561209 tests/data/fate/copy-trac4914.mxf
#tb 0: 1001/30000
#media_type 0: video

2
tests/ref/fate/mxf-reel_name
View File

@ -1 +1 @@
d35f74e97bb8a3d5cadc1df69d82dcf9
581d38fa877b2db15615989f335e9eaf

2
tests/ref/fate/time_base
View File

@ -1 +1 @@
6222dfa98933f06afb9992ab6c21486c
0979b614a34f668eb47278448b254000

6
tests/ref/lavf/mxf
View File

@ -1,9 +1,9 @@
707059147bb7569509cf3b697b54d701 *./tests/data/lavf/lavf.mxf
e3f486ec383f9df4e4e7063959c88dd5 *./tests/data/lavf/lavf.mxf
525881 ./tests/data/lavf/lavf.mxf
./tests/data/lavf/lavf.mxf CRC=0x8dddfaab
5af94bc17e47190a1e2943a461c836ff *./tests/data/lavf/lavf.mxf
4de1237dea5f8377eed4c8effe037ffb *./tests/data/lavf/lavf.mxf
561209 ./tests/data/lavf/lavf.mxf
./tests/data/lavf/lavf.mxf CRC=0xf21b1b48
523ed9d06ab7a4090f9a29fa7abf7a03 *./tests/data/lavf/lavf.mxf
73dec65269c3f5ebe67e4e7fa6f2f6b7 *./tests/data/lavf/lavf.mxf
525881 ./tests/data/lavf/lavf.mxf
./tests/data/lavf/lavf.mxf CRC=0x8dddfaab

2
tests/ref/lavf/mxf_d10
View File

@ -1,3 +1,3 @@
07a242f1881f0349e4ed10a4f1584ddb *./tests/data/lavf/lavf.mxf_d10
ea6d7025d72df9aaf63bdbc2be8c82dc *./tests/data/lavf/lavf.mxf_d10
5331501 ./tests/data/lavf/lavf.mxf_d10
./tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488

2
tests/ref/lavf/mxf_dv25
View File

@ -1,3 +1,3 @@
8117b64eaee48b9b6f8be964afbed8e0 *./tests/data/lavf/lavf.mxf_dv25
2f8cb1656178419950a9a3505cae3f5b *./tests/data/lavf/lavf.mxf_dv25
3833901 ./tests/data/lavf/lavf.mxf_dv25
./tests/data/lavf/lavf.mxf_dv25 CRC=0xbdaf7f52

2
tests/ref/lavf/mxf_dvcpro50
View File

@ -1,3 +1,3 @@
d6e87fb17a89a8a8fff96e0fd9d6fd4a *./tests/data/lavf/lavf.mxf_dvcpro50
9377a3afbf431442e17c5d891b4e6252 *./tests/data/lavf/lavf.mxf_dvcpro50
7430701 ./tests/data/lavf/lavf.mxf_dvcpro50
./tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4

2
tests/ref/lavf/mxf_opatom
View File

@ -1,3 +1,3 @@
fea3ed4c2e5088701154530cb2a57f98 *./tests/data/lavf/lavf.mxf_opatom
ebf818890f92bb9710798a3e2ab571fd *./tests/data/lavf/lavf.mxf_opatom
4717113 ./tests/data/lavf/lavf.mxf_opatom
./tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a

2
tests/ref/lavf/mxf_opatom_audio
View File

@ -1,3 +1,3 @@
71735ea72b3bdcfa3455d51bc439aa57 *./tests/data/lavf/lavf.mxf_opatom_audio
b79b636502d47239def6e85ab8cc06b3 *./tests/data/lavf/lavf.mxf_opatom_audio
102457 ./tests/data/lavf/lavf.mxf_opatom_audio
./tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff