wader/fq
1
1
Fork 0
mirror of https://github.com/wader/fq.git synced 2024-11-23 18:56:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #441 from wader/mp4-data-format-typo

Browse Source 
mp4: Fix data_format typo
This commit is contained in:
Mattias Wadman 2022-10-02 23:37:50 +02:00 committed by GitHub
commit 56474a6d28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
format/mp4/mp4.go
View File

@ -271,7 +271,7 @@ func mp4Tracks(d *decode.D, ctx *decodeContext) {
}
}
d.FieldValueStr("data_foramt", trackSDDataFormat, dataFormatNames)
d.FieldValueStr("data_format", trackSDDataFormat, dataFormatNames)
switch trackSDDataFormat {
case "lpcm",

2
format/mp4/testdata/aac.fqtest vendored
View File

@ -429,4 +429,4 @@ $ fq -d mp4 dv aac.mp4
0x290|b4 |. | [1]: raw bits byte_align 0x290.6-0x290.7 (0.2)
0x290| 70 | p | [2]: raw bits data 0x291-0x291.7 (1)
| | | id: 1 0x59d-NA (0)
| | | data_foramt: "mp4a" (MPEG-4 Audio) 0x59d-NA (0)
| | | data_format: "mp4a" (MPEG-4 Audio) 0x59d-NA (0)

2
format/mp4/testdata/av1.fqtest vendored
View File

@ -341,4 +341,4 @@ $ fq -d mp4 dv av1.mp4
0x0050|f6 0a 4f ae f3 fe ec e7 30 4f 3f 13 9c 75 c9 6a|..O.....0O?..u.j| data: raw bits 0x50-0x11bf.7 (4464)
* |until 0x11bf.7 (4464) | |
| | | id: 1 0x14b2-NA (0)
| | | data_foramt: "av01" (AV1 video) 0x14b2-NA (0)
| | | data_format: "av01" (AV1 video) 0x14b2-NA (0)

2
format/mp4/testdata/avc.fqtest vendored
View File

@ -514,4 +514,4 @@ $ fq -d mp4 dv avc.mp4
0x00d50|79 0a ff 01 f9 2d 04 d3 29 fe 4d 76 42 26 f6 cd|y....-..).MvB&..|
* |until 0xd80.7 (51) | |
| | | id: 1 0x10e0-NA (0)
| | | data_foramt: "avc1" (Advanced Video Coding) 0x10e0-NA (0)
| | | data_format: "avc1" (Advanced Video Coding) 0x10e0-NA (0)

8
format/mp4/testdata/dash.fqtest vendored
View File

@ -348,7 +348,7 @@ $ fq -d mp4 dv dash_audio_init.mp4
| | | tracks[0:1]: 0x330-NA (0)
| | | [0]{}: track 0x330-NA (0)
| | | id: 1 0x330-NA (0)
| | | data_foramt: "mp4a" (MPEG-4 Audio) 0x330-NA (0)
| | | data_format: "mp4a" (MPEG-4 Audio) 0x330-NA (0)
| | | samples[0:0]: 0x330-NA (0)
$ fq -d mp4 dv dash_audio_1.m4s
|00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f|0123456789abcdef|.{}: dash_audio_1.m4s (mp4) 0x0-0x4eb.7 (1260)
@ -491,7 +491,7 @@ $ fq -d mp4 dv dash_audio_1.m4s
* |until 0x4e6.7 (193) | |
0x4e0| 01 18 81 b4 70| | ....p| | [5]: raw bits sample 0x4e7-0x4eb.7 (5)
| | | id: 1 0x4ec-NA (0)
| | | data_foramt: "unknown" 0x4ec-NA (0)
| | | data_format: "unknown" 0x4ec-NA (0)
$ fq -d mp4 dv dash_video_init.mp4
|00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f|0123456789abcdef|.{}: dash_video_init.mp4 (mp4) 0x0-0x332.7 (819)
| | | boxes[0:2]: 0x0-0x332.7 (819)
@ -886,7 +886,7 @@ $ fq -d mp4 dv dash_video_init.mp4
| | | tracks[0:1]: 0x333-NA (0)
| | | [0]{}: track 0x333-NA (0)
| | | id: 1 0x333-NA (0)
| | | data_foramt: "avc1" (Advanced Video Coding) 0x333-NA (0)
| | | data_format: "avc1" (Advanced Video Coding) 0x333-NA (0)
| | | samples[0:0]: 0x333-NA (0)
$ fq -d mp4 dv dash_video_1.m4s
|00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f|0123456789abcdef|.{}: dash_video_1.m4s (mp4) 0x0-0x1fd0.7 (8145)
@ -1001,4 +1001,4 @@ $ fq -d mp4 dv dash_video_1.m4s
0x1720|53 23 af ff f2 50 06 7f 30 02 17 55 d4 5a 6f db|S#...P..0..U.Zo.|
* |until 0x1fd0.7 (end) (2240) | |
| | | id: 1 0x1fd1-NA (0)
| | | data_foramt: "unknown" 0x1fd1-NA (0)
| | | data_format: "unknown" 0x1fd1-NA (0)

2
format/mp4/testdata/decode_samples.fqtest vendored
View File

@ -14,4 +14,4 @@ $ fq -o decode_samples=false -d mp4 '.tracks | dv' aac.mp4
0x280| 01 18 81| ...| [3]: raw bits sample 0x28d-0x291.7 (5)
0x290|b4 70 |.p |
| | | id: 1 0x59d-NA (0)
| | | data_foramt: "mp4a" (MPEG-4 Audio) 0x59d-NA (0)
| | | data_format: "mp4a" (MPEG-4 Audio) 0x59d-NA (0)

2
format/mp4/testdata/flac.fqtest vendored
View File

@ -372,4 +372,4 @@ $ fq -d mp4 dv flac.mp4
0x280| 00 | . | byte_align: 0 (valid) 0x287.2-0x287.7 (0.6)
0x280| 82 cb | .. | footer_crc: "82cb" (raw bits) (valid) 0x288-0x289.7 (2)
| | | id: 1 0x543-NA (0)
| | | data_foramt: "fLaC" (Fres Lossless Audio Codec) 0x543-NA (0)
| | | data_format: "fLaC" (Fres Lossless Audio Codec) 0x543-NA (0)

4
format/mp4/testdata/fragmented.fqtest vendored
View File

@ -1167,7 +1167,7 @@ $ fq -d mp4 dv fragmented.mp4
0x02240|86 f8 14 d8 53 23 af ff f2 50 06 7f 30 02 17 55|....S#...P..0..U|
* |until 0x2af4.7 (2234) | |
| | | id: 1 0x2bb4-NA (0)
| | | data_foramt: "avc1" (Advanced Video Coding) 0x2bb4-NA (0)
| | | data_format: "avc1" (Advanced Video Coding) 0x2bb4-NA (0)
| | | [1]{}: track 0x13e0-0x2bb3.7 (6100)
| | | samples[0:6]: 0x13e0-0x2af9.7 (5914)
|00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f|0123456789abcdef| [0][0:4]: sample (aac_frame) 0x13e0-0x14ad.7 (206)
@ -1270,4 +1270,4 @@ $ fq -d mp4 dv fragmented.mp4
0x02af0| b4 | . | [1]: raw bits byte_align 0x2af8.6-0x2af8.7 (0.2)
0x02af0| 70 | p | [2]: raw bits data 0x2af9-0x2af9.7 (1)
| | | id: 2 0x2bb4-NA (0)
| | | data_foramt: "mp4a" (MPEG-4 Audio) 0x2bb4-NA (0)
| | | data_format: "mp4a" (MPEG-4 Audio) 0x2bb4-NA (0)

2
format/mp4/testdata/hevc.fqtest vendored
View File

@ -636,4 +636,4 @@ $ fq -d mp4 dv hevc.mp4
0x0040|fd a9 78 83 ff fb 75 6c 0b 3f ff 94 ce 7f aa fe|..x...ul.?......|
* |until 0x880.7 (2127) | |
| | | id: 1 0x149b-NA (0)
| | | data_foramt: "hev1" (High Efficiency Video Coding) 0x149b-NA (0)
| | | data_format: "hev1" (High Efficiency Video Coding) 0x149b-NA (0)

2
format/mp4/testdata/in24.fqtest vendored
View File

@ -280,4 +280,4 @@ $ fq dv in24.mp4
| | | tracks[0:1]: 0x3ec-NA (0)
| | | [0]{}: track 0x3ec-NA (0)
| | | id: 1 0x3ec-NA (0)
| | | data_foramt: "in24" 0x3ec-NA (0)
| | | data_format: "in24" 0x3ec-NA (0)

2
format/mp4/testdata/lpcm.fqtest vendored
View File

@ -271,4 +271,4 @@ $ fq dv lpcm.mp4
| | | tracks[0:1]: 0x512-NA (0)
| | | [0]{}: track 0x512-NA (0)
| | | id: 1 0x512-NA (0)
| | | data_foramt: "lpcm" 0x512-NA (0)
| | | data_format: "lpcm" 0x512-NA (0)

2
format/mp4/testdata/mp3.fqtest vendored
View File

@ -506,4 +506,4 @@ $ fq -d mp4 dv mp3.mp4
* |until 0x29d.7 (188) | |
| | | crc_calculated: "c36b" (raw bits) 0x29e-NA (0)
| | | id: 1 0x565-NA (0)
| | | data_foramt: "mp4a" (MPEG-4 Audio) 0x565-NA (0)
| | | data_format: "mp4a" (MPEG-4 Audio) 0x565-NA (0)

2
format/mp4/testdata/mpeg2.fqtest vendored
View File

@ -356,4 +356,4 @@ $ fq -d mp4 dv mpeg2.mp4
0x0040|00 00 00 00 01 b8 00 08 00 40 00 00 01 00 00 0f|.........@......|
* |until 0x1fa5.7 (8046) | |
| | | id: 1 0x22a9-NA (0)
| | | data_foramt: "mp4v" (MPEG-4 Visual) 0x22a9-NA (0)
| | | data_format: "mp4v" (MPEG-4 Visual) 0x22a9-NA (0)

2
format/mp4/testdata/opus.fqtest vendored
View File

@ -353,4 +353,4 @@ $ fq -d mp4 dv opus.mp4
0x120|02 cc 49 57 27 d4 a3 83 e9 53 33 fe 45 62 33 33|..IW'....S3.Eb33|
* |until 0x196.7 (120) | |
| | | id: 1 0x439-NA (0)
| | | data_foramt: "Opus" (Opus audio coding) 0x439-NA (0)
| | | data_format: "Opus" (Opus audio coding) 0x439-NA (0)

2
format/mp4/testdata/stz2.fqtest vendored
View File

@ -463,4 +463,4 @@ $ fq -d mp4 'dv' stz2.mp4
* |until 0x4f5.7 (188) | |
| | | crc_calculated: "c36b" (raw bits) 0x4f6-NA (0)
| | | id: 1 0x530-NA (0)
| | | data_foramt: "mp4a" (MPEG-4 Audio) 0x530-NA (0)
| | | data_format: "mp4a" (MPEG-4 Audio) 0x530-NA (0)

2
format/mp4/testdata/vorbis.fqtest vendored
View File

@ -383,4 +383,4 @@ $ fq -d mp4 dv vorbis.mp4
0x0130|f2 81 46 bb c2 48 52 08 27 b8 83 10 ca 08 b1 a7|..F..HR.'.......|
* |until 0x1dc.7 (174) | |
| | | id: 1 0x1189-NA (0)
| | | data_foramt: "mp4a" (MPEG-4 Audio) 0x1189-NA (0)
| | | data_format: "mp4a" (MPEG-4 Audio) 0x1189-NA (0)

2
format/mp4/testdata/vp9.fqtest vendored
View File

@ -336,4 +336,4 @@ $ fq -d mp4 dv vp9.mp4
0x0040|f9 be 8f e7 71 ff 5f 97 ef c3 f9 7e 37 b0 7e ad|....q._....~7.~.|
* |until 0x1563.7 (5424) | |
| | | id: 1 0x184f-NA (0)
| | | data_foramt: "vp09" (VP9 video) 0x184f-NA (0)
| | | data_format: "vp09" (VP9 video) 0x184f-NA (0)

2
format/prores/testdata/prores_frame.fqtest vendored
View File

@ -325,4 +325,4 @@ $ fq -d mp4 dv prores_frame.mov
0x00c0|40 00 00 6b 7d 00 2d 30 05 a7 05 df 00 25 05 6c|@..k}.-0.....%.l| picture_data: raw bits 0xc0-0x6c3c.7 (27517)
* |until 0x6c3c.7 (27517) | |
| | | id: 1 0x6eff-NA (0)
| | | data_foramt: "ap4h" (Apple ProRes 4444) 0x6eff-NA (0)
| | | data_format: "ap4h" (Apple ProRes 4444) 0x6eff-NA (0)