Update and add new tests

zmwangx · Oct 22, 2017 · 5a96fe0 · 5a96fe0
1 parent 0ce1ee7
commit 5a96fe0
Show file tree

Hide file tree

Showing 24 changed files with 75 additions and 14 deletions.
diff --git a/src/storyboard/metadata.py b/src/storyboard/metadata.py
@@ -425,7 +425,7 @@ def format_metadata(self, params=None):
         Bit rate:               19 kb/s
         Streams:
             #0: Video, H.264 (High Profile level 1.0), 128x72 (DAR 16:9), 25 fps
-            #1: Audio (und), AAC (Low-Complexity)
+            #1: Audio (und), AAC (Low-Complexity), 44100 Hz, mono
             #2: Subtitle, SubRip
         >>> os.remove(video_file)
         >>> os.rmdir(tempdir)

diff --git a/tests/more/gen-samples.sh b/tests/more/gen-samples.sh
@@ -75,11 +75,12 @@ cat >srt.srt <<EOF
 SubRip is the way to go
 EOF
 ffmpeg -i h264.mp4 -i srt.srt -map 0 -map 1 -metadata:s:2 language=en -c copy h264.srt.mkv
-rm srt.srt
 
 # H.264 + ASS in Matroska container
 ffmpeg -i srt.srt -c:s ass ass.ass
 ffmpeg -i h264.mp4 -i ass.ass -map 0 -map 1 -metadata:s:2 language=en -c copy h264.ass.mkv
+
+rm srt.srt
 rm ass.ass
 
 # Interlaced H.264 in MP4 container
@@ -118,6 +119,21 @@ ffmpeg -i mp3.mp3 -i jpeg.jpeg -map 0 -map 1 mp3.jpeg.mp3
 # MP3 + PNG in MP3 container
 ffmpeg -i mp3.mp3 -i png.png -map 0 -map 1 mp3.png.mp3
 
+# Mono PCM in WAV container
+ffmpeg -f lavfi -i aevalsrc=0:d=0.1 mono.wav
+
+# Stereo PCM in WAV container
+ffmpeg -i mono.wav -filter_complex '[0:a][0:a]amerge=inputs=2' stereo.wav
+
+# Stereo MP3 in MP3 container
+ffmpeg -i stereo.wav -c:a mp3 stereo.mp3
+
+# 5.1 PCM in WAV container
+ffmpeg -i mono.wav -filter_complex '[0:a][0:a][0:a][0:a][0:a][0:a]amerge=inputs=6,channelmap=0|1|2|3|4|5:5.1' -y 5.1.wav
+
+# 5.1 (side) PCM in WAV container
+ffmpeg -i mono.wav -filter_complex '[0:a][0:a][0:a][0:a][0:a][0:a]amerge=inputs=6,channelmap=0|1|2|3|4|5:5.1(side)' -y 5.1-side.wav
+
 # H.264 + AAC in MP4 container
 ffmpeg -i h264.mp4 -i aac.aac -c copy -bsf:a aac_adtstoasc -map 0 -map 1 h264.aac.mp4
 

diff --git a/tests/more/samples/5.1-side.wav b/tests/more/samples/5.1-side.wav
diff --git a/tests/more/samples/5.1-side.wav.out b/tests/more/samples/5.1-side.wav.out
@@ -0,0 +1,9 @@
+Filename:               5.1-side.wav
+File size:              53022 (51.8KiB)
+SHA-1 digest:           DCE7C65D4ACF4E22FEFE2245FCAAE8B04B4BEBE1
+Container format:       WAV
+Duration:               00:00:00.10
+Bit rate:               4242 kb/s
+Streams:
+    #0: Audio, PCM signed 16-bit little-endian, 44100 Hz, 5.1(side), 4234 kb/s
+
diff --git a/tests/more/samples/5.1.wav b/tests/more/samples/5.1.wav
diff --git a/tests/more/samples/5.1.wav.out b/tests/more/samples/5.1.wav.out
@@ -0,0 +1,9 @@
+Filename:               5.1.wav
+File size:              53022 (51.8KiB)
+SHA-1 digest:           8FC57B7FFCAF685F50FBD3E52D3DAC74451C6B0D
+Container format:       WAV
+Duration:               00:00:00.10
+Bit rate:               4242 kb/s
+Streams:
+    #0: Audio, PCM signed 16-bit little-endian, 44100 Hz, 5.1, 4234 kb/s
+
diff --git a/tests/more/samples/aac.aac.out b/tests/more/samples/aac.aac.out
@@ -5,5 +5,5 @@ Container format:       Raw ADTS AAC
 Duration:               00:00:00.16
 Bit rate:               96 kb/s
 Streams:
-    #0: Audio, AAC (Low-Complexity), 96 kb/s
+    #0: Audio, AAC (Low-Complexity), 44100 Hz, mono, 96 kb/s
 
diff --git a/tests/more/samples/aac_he.aac.out b/tests/more/samples/aac_he.aac.out
@@ -5,5 +5,5 @@ Container format:       Raw ADTS AAC
 Duration:               00:00:00.23
 Bit rate:               48 kb/s
 Streams:
-    #0: Audio, AAC (HE-AAC v2), 48 kb/s
+    #0: Audio, AAC (HE-AAC v2), 44100 Hz, stereo, 48 kb/s
 
diff --git a/tests/more/samples/ac3.ac3.out b/tests/more/samples/ac3.ac3.out
@@ -5,5 +5,5 @@ Container format:       Raw AC-3
 Duration:               00:00:00.14
 Bit rate:               96 kb/s
 Streams:
-    #0: Audio, Dolby AC-3, 96 kb/s
+    #0: Audio, Dolby AC-3, 44100 Hz, mono, 96 kb/s
 
diff --git a/tests/more/samples/aiff.aiff.out b/tests/more/samples/aiff.aiff.out
@@ -5,5 +5,5 @@ Container format:       Audio Interchange File Format (AIFF)
 Duration:               00:00:00.12
 Bit rate:               709 kb/s
 Streams:
-    #0: Audio, PCM signed 16-bit big-endian, 706 kb/s
+    #0: Audio, PCM signed 16-bit big-endian, 44100 Hz, mono, 706 kb/s
 
diff --git a/tests/more/samples/flac.flac.out b/tests/more/samples/flac.flac.out
@@ -5,5 +5,5 @@ Container format:       Native FLAC
 Duration:               00:00:00.12
 Bit rate:               573 kb/s
 Streams:
-    #0: Audio, FLAC (Free Lossless Audio Codec)
+    #0: Audio, FLAC (Free Lossless Audio Codec), 44100 Hz, mono
 
diff --git a/tests/more/samples/h264.aac.mp4.out b/tests/more/samples/h264.aac.mp4.out
@@ -10,5 +10,5 @@ Frame rate:             25 fps
 Bit rate:               21 kb/s
 Streams:
     #0: Video, H.264 (High Profile level 1.0), 128x72 (DAR 16:9), 25 fps, 6 kb/s
-    #1: Audio (und), AAC (Low-Complexity), 94 kb/s
+    #1: Audio (und), AAC (Low-Complexity), 44100 Hz, mono, 94 kb/s
 
diff --git a/tests/more/samples/h264.aac.srt.mkv.out b/tests/more/samples/h264.aac.srt.mkv.out
@@ -11,6 +11,6 @@ Frame rate:             25 fps
 Bit rate:               19 kb/s
 Streams:
     #0: Video, H.264 (High Profile level 1.0), 128x72 (DAR 16:9), 25 fps
-    #1: Audio (und), AAC (Low-Complexity)
+    #1: Audio (und), AAC (Low-Complexity), 44100 Hz, mono
     #2: Subtitle, SubRip
 
diff --git a/tests/more/samples/mono.wav b/tests/more/samples/mono.wav
diff --git a/tests/more/samples/mono.wav.out b/tests/more/samples/mono.wav.out
@@ -0,0 +1,9 @@
+Filename:               mono.wav
+File size:              8898 (8.69KiB)
+SHA-1 digest:           D4DE35B7D485200F9017B617616CF071E77FBC30
+Container format:       WAV
+Duration:               00:00:00.10
+Bit rate:               712 kb/s
+Streams:
+    #0: Audio, PCM signed 16-bit little-endian, 44100 Hz, mono, 706 kb/s
+
diff --git a/tests/more/samples/mp3.jpeg.mp3.out b/tests/more/samples/mp3.jpeg.mp3.out
@@ -8,6 +8,6 @@ Display aspect ratio:   1:1
 Frame rate:             90000 fps
 Bit rate:               81 kb/s
 Streams:
-    #0: Audio, MP3, 64 kb/s
+    #0: Audio, MP3, 44100 Hz, mono, 64 kb/s
     #1: Video, PNG, 100x100 (DAR 1:1), 90000 fps
 
diff --git a/tests/more/samples/mp3.mp3.out b/tests/more/samples/mp3.mp3.out
@@ -5,5 +5,5 @@ Container format:       MP3
 Duration:               00:00:00.16
 Bit rate:               76 kb/s
 Streams:
-    #0: Audio, MP3, 64 kb/s
+    #0: Audio, MP3, 44100 Hz, mono, 64 kb/s
 
diff --git a/tests/more/samples/mp3.png.mp3.out b/tests/more/samples/mp3.png.mp3.out
@@ -8,6 +8,6 @@ Display aspect ratio:   1:1
 Frame rate:             90000 fps
 Bit rate:               79 kb/s
 Streams:
-    #0: Audio, MP3, 64 kb/s
+    #0: Audio, MP3, 44100 Hz, mono, 64 kb/s
     #1: Video, PNG, 100x100 (DAR 1:1), 90000 fps
 
diff --git a/tests/more/samples/realvideo1.realaudio1.rm.out b/tests/more/samples/realvideo1.realaudio1.rm.out
@@ -10,5 +10,5 @@ Frame rate:             25 fps
 Bit rate:               30 kb/s
 Streams:
     #0: Video, RealVideo 1.0, 256x144 (DAR 16:9), 25 fps, 200 kb/s
-    #1: Audio, RealAudio 1.0, 8 kb/s
+    #1: Audio, RealAudio 1.0, 8000 Hz, mono, 8 kb/s
 
diff --git a/tests/more/samples/stereo.mp3 b/tests/more/samples/stereo.mp3
diff --git a/tests/more/samples/stereo.mp3.out b/tests/more/samples/stereo.mp3.out
@@ -0,0 +1,9 @@
+Filename:               stereo.mp3
+File size:              2342 (2.29KiB)
+SHA-1 digest:           E9D1992B782536ADE0FC670CD1A73C307DBFFAF4
+Container format:       MP3
+Duration:               00:00:00.13
+Bit rate:               143 kb/s
+Streams:
+    #0: Audio, MP3, 44100 Hz, stereo, 128 kb/s
+
diff --git a/tests/more/samples/stereo.wav b/tests/more/samples/stereo.wav
diff --git a/tests/more/samples/stereo.wav.out b/tests/more/samples/stereo.wav.out
@@ -0,0 +1,9 @@
+Filename:               stereo.wav
+File size:              17718 (17.4KiB)
+SHA-1 digest:           75167A833264234C6CCE76AA5CB56A71E7A21365
+Container format:       WAV
+Duration:               00:00:00.10
+Bit rate:               1417 kb/s
+Streams:
+    #0: Audio, PCM signed 16-bit little-endian, 44100 Hz, 2 channels, 1411 kb/s
+
diff --git a/tests/more/samples/vorbis.oga.out b/tests/more/samples/vorbis.oga.out
@@ -5,5 +5,5 @@ Container format:       Ogg
 Duration:               00:00:00.12
 Bit rate:               234 kb/s
 Streams:
-    #0: Audio, Vorbis, 80 kb/s
+    #0: Audio, Vorbis, 44100 Hz, mono, 80 kb/s