avformat/mxfenc: use a zero based continuity counter
authorMarton Balint <cus@passwd.hu>
Sat, 29 Feb 2020 00:25:56 +0000 (01:25 +0100)
committerMarton Balint <cus@passwd.hu>
Mon, 2 Mar 2020 21:01:47 +0000 (22:01 +0100)
The standard does not seem to require the counter to be zero based, but some
checker tools (MyriadBits MXFInspect, Interra Baton) have validations against 0
start...

Fixes ticket #6781.

Signed-off-by: Marton Balint <cus@passwd.hu>
libavformat/mxfenc.c
tests/ref/fate/mxf-user-comments
tests/ref/lavf/mxf

index 7ea47d7..5e0dc0e 100644 (file)
@@ -2686,7 +2686,7 @@ static void mxf_write_system_item(AVFormatContext *s)
     avio_w8(pb, mxf->content_package_rate); // content package rate
     avio_w8(pb, 0x00); // content package type
     avio_wb16(pb, 0x00); // channel handle
-    avio_wb16(pb, (mxf->tc.start + frame) & 0xFFFF); // continuity count, supposed to overflow
+    avio_wb16(pb, frame & 0xFFFF); // continuity count, supposed to overflow
     if (mxf->essence_container_count > 1)
         avio_write(pb, multiple_desc_ul, 16);
     else {
index 4b734a0..e91b23b 100644 (file)
@@ -1 +1 @@
-683bacb0105e5bc5bbf46aa430c644d1
+c6469c0ae2aaee602eacbc009080ae8e
index 471fc55..5b16496 100644 (file)
@@ -1,7 +1,7 @@
-649009e3d3d62eb3b6c56334d057cc4d *tests/data/lavf/lavf.mxf
+27b98795036b334e100c15c7e06d948f *tests/data/lavf/lavf.mxf
 526393 tests/data/lavf/lavf.mxf
 tests/data/lavf/lavf.mxf CRC=0x8dddfaab
-9076b7015cffe8aa72883e900a2041a5 *tests/data/lavf/lavf.mxf
+783b475a818602f54e947094d57e2981 *tests/data/lavf/lavf.mxf
 561721 tests/data/lavf/lavf.mxf
 tests/data/lavf/lavf.mxf CRC=0x96ff1b48
 02bf8f0cd8951a49e277306691cb1538 *tests/data/lavf/lavf.mxf