MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/mxfenc: allow more bits for variable part in uuid generation

Browse Source 
Also make sure we do not change the product UID.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2022-03-14 19:13:50 +01:00
parent 2bcfe78ddf
commit 4afe4a542e
13 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/mxfenc.c
View File

@ -228,7 +228,8 @@ static const UID mxf_d10_container_uls[] = {
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x06,0x01 }, // D-10 525/50 NTSC 30mb/s
};
static const uint8_t uuid_base[] = { 0xAD,0xAB,0x44,0x24,0x2f,0x25,0x4d,0xc7,0x92,0xff,0x29,0xbd };
static const uint8_t product_uid[] = { 0xAD,0xAB,0x44,0x24,0x2f,0x25,0x4d,0xc7,0x92,0xff,0x29,0xbd,0x00,0x0c,0x00,0x02};
static const uint8_t uuid_base[] = { 0xAD,0xAB,0x44,0x24,0x2f,0x25,0x4d,0xc7,0x92,0xff };
static const uint8_t umid_ul[] = { 0x06,0x0A,0x2B,0x34,0x01,0x01,0x01,0x05,0x01,0x01,0x0D,0x00,0x13 };
/**
@ -425,9 +426,9 @@ typedef struct MXFContext {
static void mxf_write_uuid(AVIOContext *pb, enum MXFMetadataSetType type, int value)
{
avio_write(pb, uuid_base, 12);
avio_write(pb, uuid_base, 10);
avio_wb16(pb, type);
avio_wb16(pb, value);
avio_wb32(pb, value);
}
static void mxf_write_umid(AVFormatContext *s, int type)
@ -798,7 +799,7 @@ static void mxf_write_identification(AVFormatContext *s)
// write product uid
mxf_write_local_tag(s, 16, 0x3C05);
mxf_write_uuid(pb, Identification, 2);
avio_write(pb, product_uid, 16);
// modification date
mxf_write_local_tag(s, 8, 0x3C06);

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

@ -1,4 +1,4 @@
f5150fb82c1bb5a90906fce93dcc3f76 *tests/data/fate/copy-trac4914.mxf
a0f68fa1d9ed5d3030d8244ea0b0299a *tests/data/fate/copy-trac4914.mxf
561721 tests/data/fate/copy-trac4914.mxf
#tb 0: 1001/30000
#media_type 0: video

6
tests/ref/fate/mxf-d10-user-comments
View File

@ -1,4 +1,4 @@
6dc13ae283257e898e069e5041ac8435 *tests/data/fate/mxf-d10-user-comments.mxf_d10
8c831b8e01aa4c86e98ab87930d06f3e *tests/data/fate/mxf-d10-user-comments.mxf_d10
3782189 tests/data/fate/mxf-d10-user-comments.mxf_d10
#extradata 0: 34, 0x716b05c4
#tb 0: 1/25
@ -13,8 +13,8 @@
0, 3, 4, 1, 150000, 0x9bbe6feb, F=0x0
[FORMAT]
TAG:operational_pattern_ul=060e2b34.04010101.0d010201.01010900
TAG:uid=adab4424-2f25-4dc7-92ff-29bd000c0000
TAG:generation_uid=adab4424-2f25-4dc7-92ff-29bd000c0001
TAG:uid=adab4424-2f25-4dc7-92ff-000c00000000
TAG:generation_uid=adab4424-2f25-4dc7-92ff-000c00000001
TAG:company_name=FATE-company
TAG:product_name=FATE-test
TAG:product_version_num=0.0.0.0.0

2
tests/ref/fate/mxf-opatom-user-comments
View File

@ -1 +1 @@
8475bebf3448a972ae89ba59309fd7d6
d40b64e492133c74faa07e605eb65b2f

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

@ -1 +1 @@
ce49a0361d3f79106e1952d387eace51
75e0ac14d5632d709bd805f1cacb1fbb

2
tests/ref/fate/mxf-user-comments
View File

@ -1 +1 @@
956f653cd75e1a319569caec9df81b4f
620ae205fefbb6dba74418f357a62c36

2
tests/ref/fate/time_base
View File

@ -1 +1 @@
78ac0348027b75d73acb8bea14e67a59
d408aba82d62a90ed7f46a1999b014f1

6
tests/ref/lavf/mxf
View File

@ -1,9 +1,9 @@
8938d5c4a396ff1b24d10d4f917ae1c9 *tests/data/lavf/lavf.mxf
9ec1ad83b3400de11ca2f70b3b2d4c4d *tests/data/lavf/lavf.mxf
526393 tests/data/lavf/lavf.mxf
tests/data/lavf/lavf.mxf CRC=0x8dddfaab
93ea2cfdf5dda7fffdc0d2fdcfb6a9a4 *tests/data/lavf/lavf.mxf
546eb8c864c0d76c6a9d5303701e9031 *tests/data/lavf/lavf.mxf
561721 tests/data/lavf/lavf.mxf
tests/data/lavf/lavf.mxf CRC=0x96ff1b48
87bdf844ae34bcc758e44419e80177a0 *tests/data/lavf/lavf.mxf
5bd0ce691510e6fae969886c32ad7a14 *tests/data/lavf/lavf.mxf
526393 tests/data/lavf/lavf.mxf
tests/data/lavf/lavf.mxf CRC=0x8dddfaab

2
tests/ref/lavf/mxf_d10
View File

@ -1,3 +1,3 @@
7f16902e28718c2a92bc082400a1c6ee *tests/data/lavf/lavf.mxf_d10
74269c0a64b19269b127f64f3ce7fa6a *tests/data/lavf/lavf.mxf_d10
5332013 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 @@
106e33eb1634595623f0334e92204b65 *tests/data/lavf/lavf.mxf_dv25
3339def72599c79ad5860c6860cc3123 *tests/data/lavf/lavf.mxf_dv25
3834413 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 @@
3d5a303c22666996700f0e8f6e4cb938 *tests/data/lavf/lavf.mxf_dvcpro50
8494122b2a8e8e5998ace60d4d508d46 *tests/data/lavf/lavf.mxf_dvcpro50
7431213 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 @@
b2da9e38d692fd1866101ebae273bfc0 *tests/data/lavf/lavf.mxf_opatom
215ea72602bfeb70e99fc9d79fef073c *tests/data/lavf/lavf.mxf_opatom
4717625 tests/data/lavf/lavf.mxf_opatom
tests/data/lavf/lavf.mxf_opatom CRC=0xb13ba2f8

2
tests/ref/lavf/mxf_opatom_audio
View File

@ -1,3 +1,3 @@
c356a3fdd49a1e015961678e837c12bb *tests/data/lavf/lavf.mxf_opatom_audio
633b6d373009416f214edcf456208580 *tests/data/lavf/lavf.mxf_opatom_audio
102969 tests/data/lavf/lavf.mxf_opatom_audio
tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff