Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

libavformat/mxfenc: add container duration and package name to primer pack

Browse Source 
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/127/head
Mark Reid 10 years ago committed by Michael Niedermayer
parent ad3c5ff347
commit 001b28b021
5 changed files with 35 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavformat/mxfenc.c
  2. 6
      tests/ref/lavf/mxf
  3. 2
      tests/ref/lavf/mxf_d10
  4. 4
      tests/ref/lavf/mxf_opatom
  5. 54
      tests/ref/seek/lavf-mxf_opatom

2
libavformat/mxfenc.c
Unescape View File

@ -368,6 +368,7 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = {
{ 0x4401, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x01,0x01,0x15,0x10,0x00,0x00,0x00,0x00}}, /* Package UID */
{ 0x4405, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x10,0x01,0x03,0x00,0x00}}, /* Package Creation Date */
{ 0x4404, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x10,0x02,0x05,0x00,0x00}}, /* Package Modified Date */
{ 0x4402, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x01,0x03,0x03,0x02,0x01,0x00,0x00,0x00}}, /* Package Name */
{ 0x4403, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x06,0x05,0x00,0x00}}, /* Tracks Strong reference array */
{ 0x4406, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x03,0x02,0x01,0x02,0x0C,0x00,0x00,0x00}}, /* User Comments */
{ 0x4701, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x02,0x03,0x00,0x00}}, /* Descriptor */
@ -396,6 +397,7 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = {
{ 0x3F01, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x04,0x06,0x01,0x01,0x04,0x06,0x0B,0x00,0x00}}, /* Sub Descriptors reference array */
{ 0x3006, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x06,0x01,0x01,0x03,0x05,0x00,0x00,0x00}}, /* Linked Track ID */
{ 0x3001, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x06,0x01,0x01,0x00,0x00,0x00,0x00}}, /* SampleRate */
{ 0x3002, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x06,0x01,0x02,0x00,0x00,0x00,0x00}}, /* ContainerDuration */
{ 0x3004, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x01,0x02,0x00,0x00}}, /* Essence Container */
// Generic Picture Essence Descriptor
{ 0x320C, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x03,0x01,0x04,0x00,0x00,0x00}}, /* Frame Layout */

6
tests/ref/lavf/mxf
Unescape View File

@ -1,9 +1,9 @@
57d6a4992ab92f4c2c9385803962f466 *./tests/data/lavf/lavf.mxf
306708cc2ad2414def89fa2f3c0bfc5c *./tests/data/lavf/lavf.mxf
525369 ./tests/data/lavf/lavf.mxf
./tests/data/lavf/lavf.mxf CRC=0xdbfff6f1
0d04b523972648406e506b26fbd63d23 *./tests/data/lavf/lavf.mxf
f465084f0c365926a81aab56fb6b945c *./tests/data/lavf/lavf.mxf
560697 ./tests/data/lavf/lavf.mxf
./tests/data/lavf/lavf.mxf CRC=0x11a6178e
10f4607a8db351854f3aeb3b1f2c89f9 *./tests/data/lavf/lavf.mxf
52fc707e1177c97232e2537168c232e6 *./tests/data/lavf/lavf.mxf
525369 ./tests/data/lavf/lavf.mxf
./tests/data/lavf/lavf.mxf CRC=0xdbfff6f1

2
tests/ref/lavf/mxf_d10
Unescape View File

@ -1,3 +1,3 @@
6ac315755a974f38796a90c80ac6737b *./tests/data/lavf/lavf.mxf_d10
8f601d5b55a0665cc105a115dc8b3af0 *./tests/data/lavf/lavf.mxf_d10
5330989 ./tests/data/lavf/lavf.mxf_d10
./tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488

4
tests/ref/lavf/mxf_opatom
Unescape View File

@ -1,3 +1,3 @@
e1264a5d716f1289473689b5a1245809 *./tests/data/lavf/lavf.mxf_opatom
4716601 ./tests/data/lavf/lavf.mxf_opatom
0f753a141424e2a1b44e6390f70172eb *./tests/data/lavf/lavf.mxf_opatom
4717113 ./tests/data/lavf/lavf.mxf_opatom
./tests/data/lavf/lavf.mxf_opatom CRC=0xbdd696b9

54
tests/ref/seek/lavf-mxf_opatom
Unescape View File

@ -1,53 +1,53 @@
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size:188416
ret: 0 st:-1 flags:0 ts:-1.000000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size:188416
ret: 0 st:-1 flags:1 ts: 1.894167
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
ret: 0 st: 0 flags:0 ts: 0.800000
ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3772953 size:188416
ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3773465 size:188416
ret: 0 st: 0 flags:1 ts:-0.320000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size:188416
ret: 0 st:-1 flags:0 ts: 2.576668
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
ret: 0 st:-1 flags:1 ts: 1.470835
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
ret: 0 st: 0 flags:0 ts: 0.360000
ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1700377 size:188416
ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1700889 size:188416
ret: 0 st: 0 flags:1 ts:-0.760000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size:188416
ret: 0 st:-1 flags:0 ts: 2.153336
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
ret: 0 st:-1 flags:1 ts: 1.047503
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
ret: 0 st: 0 flags:0 ts:-0.040000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size:188416
ret: 0 st: 0 flags:1 ts: 2.840000
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
ret: 0 st:-1 flags:0 ts: 1.730004
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
ret: 0 st:-1 flags:1 ts: 0.624171
ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:3019289 size:188416
ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:3019801 size:188416
ret: 0 st: 0 flags:0 ts:-0.480000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size:188416
ret: 0 st: 0 flags:1 ts: 2.400000
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
ret: 0 st:-1 flags:0 ts: 1.306672
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
ret: 0 st:-1 flags:1 ts: 0.200839
ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 946713 size:188416
ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 947225 size:188416
ret: 0 st: 0 flags:0 ts:-0.920000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size:188416
ret: 0 st: 0 flags:1 ts: 2.000000
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
ret: 0 st:-1 flags:0 ts: 0.883340
ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:4149785 size:188416
ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:4150297 size:188416
ret: 0 st:-1 flags:1 ts:-0.222493
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size:188416
ret: 0 st: 0 flags:0 ts: 2.680000
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
ret: 0 st: 0 flags:1 ts: 1.560000
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
ret: 0 st:-1 flags:0 ts: 0.460008
ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:2265625 size:188416
ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:2266137 size:188416
ret: 0 st:-1 flags:1 ts:-0.645825
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size:188416

Write Preview
Loading…
Cancel
Save