diff --git a/.travis.yml b/.travis.yml index b75567ac..5fef8dc6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,6 @@ node_js: - "0.10" env: - DISPLAY=:99.0 -before_install: - - sudo apt-get update -qq - - sudo apt-get install -y gstreamer0.10-plugins-good gstreamer0.10-ffmpeg before_script: - "sh -e /etc/init.d/xvfb start" - npm install casperjs @@ -20,6 +17,7 @@ before_script: - export PATH=$PATH:/tmp/js script: - make test +sudo: false cache: directories: - node_modules diff --git a/tests/Makefile b/tests/Makefile index 269ac747..35401b52 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -33,7 +33,7 @@ PACKAGE_FILES = \ javax/microedition/media/audio.3gp \ javax/microedition/media/audio.amr \ javax/microedition/media/hello.ogg \ - javax/microedition/media/test.mp4 \ + javax/microedition/media/test.webm \ $(NULL) ifeq ($(JSR_256),1) @@ -45,8 +45,8 @@ all: tests.jar ../java/classes.jar: cd ../java && make -javax/microedition/media/test.mp4: gfx/images/red.png - ffmpeg -loop 1 -i gfx/images/red.png -c:v libx264 -t 10 javax/microedition/media/test.mp4 +javax/microedition/media/test.webm: gfx/images/red.png + ffmpeg -loop 1 -i gfx/images/red.png -t 10 javax/microedition/media/test.webm Testlets.java: $(SRCS) $(JASMIN_SRCS) Makefile echo "public class Testlets {" > $@ diff --git a/tests/gfx/VideoPlayerTest.java b/tests/gfx/VideoPlayerTest.java index 3cee4339..1f27a969 100644 --- a/tests/gfx/VideoPlayerTest.java +++ b/tests/gfx/VideoPlayerTest.java @@ -34,16 +34,16 @@ public class VideoPlayerTest extends MIDlet implements PlayerListener { public void startApp() { try { String dirPath = System.getProperty("fileconn.dir.private"); - FileConnection file = (FileConnection)Connector.open(dirPath + "test.mp4", Connector.READ_WRITE); + FileConnection file = (FileConnection)Connector.open(dirPath + "test.webm", Connector.READ_WRITE); if (!file.exists()) { file.create(); } OutputStream os = file.openDataOutputStream(); - InputStream is = getClass().getResourceAsStream("/javax/microedition/media/test.mp4"); + InputStream is = getClass().getResourceAsStream("/javax/microedition/media/test.webm"); os.write(TestUtils.read(is)); os.close(); - Player player = Manager.createPlayer(dirPath + "test.mp4"); + Player player = Manager.createPlayer(dirPath + "test.webm"); player.addPlayerListener(this); diff --git a/tests/gfx/VideoPlayerTest.png b/tests/gfx/VideoPlayerTest.png index f21cf3e6..2a6b0915 100644 Binary files a/tests/gfx/VideoPlayerTest.png and b/tests/gfx/VideoPlayerTest.png differ diff --git a/tests/javax/microedition/media/TestVideoPlayer.java b/tests/javax/microedition/media/TestVideoPlayer.java index cebddc8a..add86e84 100644 --- a/tests/javax/microedition/media/TestVideoPlayer.java +++ b/tests/javax/microedition/media/TestVideoPlayer.java @@ -23,16 +23,16 @@ public class TestVideoPlayer implements Testlet, PlayerListener { Form form = new Form("Test"); String dirPath = System.getProperty("fileconn.dir.private"); - FileConnection file = (FileConnection)Connector.open(dirPath + "test.mp4", Connector.READ_WRITE); + FileConnection file = (FileConnection)Connector.open(dirPath + "test.webm", Connector.READ_WRITE); if (!file.exists()) { file.create(); } OutputStream os = file.openDataOutputStream(); - InputStream is = getClass().getResourceAsStream("/javax/microedition/media/test.mp4"); + InputStream is = getClass().getResourceAsStream("/javax/microedition/media/test.webm"); os.write(TestUtils.read(is)); os.close(); - Player player = Manager.createPlayer(dirPath + "test.mp4"); + Player player = Manager.createPlayer(dirPath + "test.webm"); player.addPlayerListener(this); diff --git a/tests/javax/microedition/media/test.mp4 b/tests/javax/microedition/media/test.mp4 deleted file mode 100644 index 1f0073a5..00000000 Binary files a/tests/javax/microedition/media/test.mp4 and /dev/null differ diff --git a/tests/javax/microedition/media/test.webm b/tests/javax/microedition/media/test.webm new file mode 100644 index 00000000..811167ae Binary files /dev/null and b/tests/javax/microedition/media/test.webm differ