diff options
| author | Bernhard Rosenkraenzer <bero@arklinux.org> | 2011-07-02 20:53:10 +0000 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <bero@arklinux.org> | 2011-07-02 20:53:10 +0000 |
| commit | dbfaf0539ced4c4ee275d5428ae9440786ec2d76 (patch) | |
| tree | 6026a97e758ae3b64b1c99219397d6a287f32581 | |
| parent | 04e7834cbcc92c0201b4fafbc9f254d7cf121918 (diff) | |
| parent | d89446f8dceb7119406a193f5dff35a0a5d61379 (diff) | |
| download | mmtest-dbfaf0539ced4c4ee275d5428ae9440786ec2d76.tar.gz | |
Merge branch 'master' of ssh://git.linaro.org/~/public_git/mmtest
| -rwxr-xr-x | creator/create-testfiles | 2 | ||||
| -rw-r--r-- | mmtest/src/org/linaro/mmtest/MultimediaTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/creator/create-testfiles b/creator/create-testfiles index 94b7416..7aae63d 100755 --- a/creator/create-testfiles +++ b/creator/create-testfiles @@ -95,7 +95,7 @@ ffmpeg -y -i "$IN" -vcodec h263 -s cif -r 25 -vb 768000 -acodec libfaac -ac 1 -a # H.264 AVC Baseline + AAC in an mp4 container ffmpeg -y -i "$IN" -vcodec libx264 -vb 1024000 -vpre libx264-baseline -acodec aac -strict experimental -ab 96000 -f mp4 test-H.264-AAC.mp4 # Same thing at a much higher resolution and bitrate -ffmpeg -y -i "$IN" -s hd1080 -vcodec libx264 -vb 2048000 -vpre libx264-baseline -acodec aac -strict experimental -ab 96000 -f mp4 test-H.264-AAC.mp4 +ffmpeg -y -i "$IN" -s hd1080 -vcodec libx264 -vb 2048000 -vpre libx264-baseline -acodec aac -strict experimental -ab 96000 -f mp4 test-H.264-AAC-HD.mp4 # MPEG-4 SP + MP3 in an mp4 container ffmpeg -y -i "$IN" -vcodec mpeg4 -vb 768000 -acodec libmp3lame -ab 64000 -f mp4 test-MPEG4-MP3.mp4 diff --git a/mmtest/src/org/linaro/mmtest/MultimediaTest.java b/mmtest/src/org/linaro/mmtest/MultimediaTest.java index ea50154..6644c2f 100644 --- a/mmtest/src/org/linaro/mmtest/MultimediaTest.java +++ b/mmtest/src/org/linaro/mmtest/MultimediaTest.java @@ -40,7 +40,7 @@ public class MultimediaTest extends Activity implements android.media.MediaPlaye // Mixed A/V new Test("test-H.263-AAC.3gp", "3GP(H.263/AAC)"), new Test("test-H.264-AAC.mp4", "MP4(H.264/AAC)"), - new Test("test-H.264-AAC.mp4", "HD-MP4(H.264/AAC)"), + new Test("test-H.264-AAC-HD.mp4", "HD-MP4(H.264/AAC)"), new Test("test-MPEG4-MP3.mp4", "MP4(MPEG4/MP3)"), new Test("test-VP8-Vorbis.webm", "WebM(VP8/Vorbis)", true, 10 /*android.os.Build.GINGERBREAD_MR1*/) }; |