updated assets + updated tests

JimBoomGH · Sep 18, 2014 · 79a5d53 · 79a5d53
1 parent 3b57c74
commit 79a5d53
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,8 @@ android:
 
     - sys-img-x86-android-19
     - sys-img-armeabi-v7a-android-16
+    - sys-img-armeabi-v7a-android-l
+    - sys-img-x86-android-l
 
 script:
   - ./runTests.sh || exit 1
diff --git a/FFmpegAndroid/assets/armeabi-v7a-neon/ffmpeg b/FFmpegAndroid/assets/armeabi-v7a-neon/ffmpeg
diff --git a/FFmpegAndroid/assets/armeabi-v7a/ffmpeg b/FFmpegAndroid/assets/armeabi-v7a/ffmpeg
diff --git a/FFmpegAndroid/assets/x86/ffmpeg b/FFmpegAndroid/assets/x86/ffmpeg
diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArch.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArch.java
@@ -3,9 +3,9 @@
 import android.text.TextUtils;
 
 enum CpuArch {
-    x86("f04974831890b3750761e487f3e4b0d9bdb688a1"),
-    ARMv7("3f4580bce9187f94b6cf8ef530074ef0975cb476"),
-    ARMv7_NEON("fc544c42cf0ef993c0b55463807e5c68cd323c93"),
+    x86("cbc1a2b2f1b832265e030f77ce1a25f5c7e0d11a"),
+    ARMv7("93deccc6257ade540302fcd2a08a04cff7bc3f21"),
+    ARMv7_NEON("ca1729aba3c5a4cb802d3fc0deca80a5c45ea0b8"),
     NONE(null);
 
     private String sha1;

diff --git a/app/assets/sample_videos/sample_1.mkv b/app/assets/sample_videos/sample_1.mkv
diff --git a/runTests.sh b/runTests.sh
@@ -1,16 +1,18 @@
 #!/bin/bash
 
 # x86 emulator
-echo no | android create avd -c 50M --force -n testx86 -t android-19 --abi x86
-emulator -ports 5554,5555 -partition-size 256 -avd testx86 -no-skin -no-boot-anim -no-audio -no-window &
+echo no | android create avd -c 50M --force -n testx86 -t android-16 --abi x86
+emulator -ports 5554,5555 -partition-size 256 -avd testx86 -no-skin -no-boot-anim -no-audio -no-window -gpu on &
 PID_EMU1=$!
-./wait_for_emulator emulator-5554
+./wait_for_emulator emulator-5554 || exit 1
+adb -s emulator-5554 shell input keyevent 82 &
 
 # armeabi-v7a emulator
 echo no | android create avd -c 50M --force -n testarm -t android-16 --abi armeabi-v7a
-emulator -ports 5556,5557 -partition-size 256 -avd testarm -no-skin -no-boot-anim -no-audio -no-window &
+emulator -ports 5556,5557 -partition-size 256 -avd testarm -no-skin -no-boot-anim -no-audio -no-window -gpu on &
 PID_EMU2=$!
-./wait_for_emulator emulator-5556
+./wait_for_emulator emulator-5556 || exit 1
+adb -s emulator-5556 shell input keyevent 82 &
 
 # Running Tests
 ./gradlew --info build connectedCheck || exit 1

diff --git a/wait_for_emulator b/wait_for_emulator
@@ -16,7 +16,7 @@ until [[ "$bootanim" =~ "stopped" ]]; do
    if [[ "$bootanim" =~ "not found" ]]; then
       let "failcounter += 1"
       sleep 5
-      if [[ $failcounter -gt 100 ]]; then
+      if [[ $failcounter -gt 15 ]]; then
         echo "Failed to start emulator"
         exit 1
       fi