From 1c04cf1387b8ce6737952d14ac16694358483ffd Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Fri, 13 Feb 2015 22:48:38 +0100 Subject: [PATCH] Use a video encoded with VP8 instead of h264 --- .travis.yml | 4 +--- tests/Makefile | 6 +++--- tests/gfx/VideoPlayerTest.java | 6 +++--- tests/gfx/VideoPlayerTest.png | Bin 1072 -> 1068 bytes .../microedition/media/TestVideoPlayer.java | 6 +++--- tests/javax/microedition/media/test.mp4 | Bin 8171 -> 0 bytes tests/javax/microedition/media/test.webm | Bin 0 -> 19450 bytes 7 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 tests/javax/microedition/media/test.mp4 create mode 100644 tests/javax/microedition/media/test.webm 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 f21cf3e61405bdbd9f1f1eed724159deff0865f8..2a6b0915092632e3576cf654e43e83858b6d4a4f 100644 GIT binary patch literal 1068 zcmeAS@N?(olHy`uVBq!ia0vp^9~c-I9XQy4tfm(qgBci@KYO}3hE&XXd-)(|LjVu! zL6hW{+g4s%P&4JIWW{%f8+(xf^pomK(!yj^HPOjuG^l74RBxD=;-Yq!%R5d4 PmI4f(u6{1-oD!M<5Ar;9 literal 1072 zcmeAS@N?(olHy`uVBq!ia0vp^9~c-I9XQy4tfm(qgBci@zk9kkhE&XXd)bkTiIIop z;NSm?ubNwMEL+I+Y@YM4O6JJ(`}rBlnA!{&oo6&C`Wz5YOW+VTXyKGN#KMz^Px!`p z<~rN{TFVH|9|satA22shZQ$n#W3n?C+yYOl6-e+TX+bion&{Ls8dNk5s&9;J7h(-F T|6Y>^mIMr*u6{1-oD!M`XIF;3WCIfrG2Om^&hCMg0+HJ3fhMvSZmhLclVOpq($tDAnuUe z?|0_={d_+&-KfKK9G6&0?j@hq>VelB?w+4~pg8J9$Nv6tz}?VWI$skpnM| zzc5_p)q`X3G^GK-Li?%GXh>J(80LJve^Qfg|28&=@CLI+gkQ6L@14x#O8?lO%C ziZShK3c4W7LtaB_MRiD3d0m8&?uS#hPabK2Xc&;xZ)D5I43WVK22sj3UeCmO4 zWr$?ebiW1NHnk#jVG5r{QPXR-2#LfFWHPQfX-`^F4K~l04Smw{VNDx-K&NC2v9;n( zrK9Su-9VLxhHOY<2BTD{n}MK|1~Rk&4-9>ExMU9u%?Rq;ts$>8EL5~&si5#_8jPkC zDo}k2oJi5sD!b7TM$$(TZ6A|_1%Ww4EHRDwr`cq0Ur#LK_ky47o4`0DzT z^M}9RxbST$j!*r$W5<&rTx zJMta?=&1xaD9tE@HXxl4Uv`p$2o(38PM`Z6*R%yJ+%?yay$GKh?B#O_ZrC!NAPvD7 zeY087NgkwcI1{2_I+A?)9>yuY4rSY{n*_~vd(cd6113Hd5EzB*TV?`>r}~x)VN`RV zzZXW~%7l>5+w|EAl1esa+HwHHo`6ahmD@ei_U?Uq9HXKl>KI1a8~?zzPeL9!_Qa>> zpXH48Fx)m(uk8Ko>;|^Uy7uF_iM;@952GZnP!p1y^kofY8@fyRrb6Vn?z?Psec?xK z$bBMvJ94E?RkA0sAai?~k32tV9%y;w>mz?Y^8F!w4)Xmm%|pIFrg^~qU)>**ybs`= zZzRkKH|@`?^Pcay1>2#HjRgHpxCFTs*Ott+ZCzVlUz?*mA9+5q&&+>eJ>V>0czCX< z(4L^+5;JBbAYXN5BB8QJv*#+D#RB2`bo5y*Lw0(28$20#6mS6lrKcbilt`~Uy| diff --git a/tests/javax/microedition/media/test.webm b/tests/javax/microedition/media/test.webm new file mode 100644 index 0000000000000000000000000000000000000000..811167aeb105a725d8e07e62f113a6182d7c3ca2 GIT binary patch literal 19450 zcmeI)Z)h8J9LMqBrEPjm|0M0^3^G{QbcU#1%5+pvnq^ZfT`&@9727Tfw(?v?9f&$66er7u&e!Z?J_nr?DsyXEQOR@ zI9~U=B;U&i@*(#;F?m7}OMjcZhc(6f*TU_JR_gsjQ@!22Z@kjp={=&EynUL<9*DfU zylcyaTHlASdmi+Sy%qSZ_pYZu-5(gyCVgWA3tJnWJN;TL0Fea5p@^^M=iXCu8pW-~M=HWXq4c zzv}Pre7vT0cYoA#A-Z&)i_eM9HJ#S)?6{;U2fx*nO zEth+GP3x=gFMolKu>`#?B>y$ZhM)~`Jx$VOxHq(YHj}0_E^nGV~PF$NiF!4+1&!*hZ+x9xX z`E`CO@!}`#M;p$x%s%_%qtkOIwmvgEd2GJpyZ5e&t|9$s+fV6tT)%0`@Nn96i=ztj zp`9-^{2*MHQ`hFt_pGkeJM_LLoZ_M)6q`-hg}rUtRiPdc*LBB=e)ppO?#+9yob(dq z=cq78#W`x6qp}#K*mY`sQ0xnSofexn{?{v*zi0j{sCc+lb#PRSqeeL@gHa}xqudP^}>3~OJDw;`GaH1VXG=}a8xr#g*a-Eqf#6-gHfe6j%wtnAV)=Y zDt{bqZ*WSJ+^Qxps!VW{lcW3`73QcoM~!n-7Ng8|j`HY~{NR{7xK+hCYLufg7*(!v zl$)d4I4Z(X364s0R8FVl2S;^at5TaeD#THP9F^jz8H}p1aa1Em1vx6pQAwSWADoH_ zY*iM)QBIEXb5xk4;v6;3QCW|%&jWKQG*9Cfj*97&{NUI|xm9H_s#fJFH%GN`RD`1v9F^v%97feSII3Bv zXUYE@OqJ5#mb#n>n-@kgyFE-sk zIT329?&bgA)V;#UNiWsC;v6;3QCW;yEmq~fgKqD=W<;?{{-UkKxaVq=qcRv(ELJUd zdkblAniAa8p5~|=My(dB|eTT{R>=>J%H=DS z%U3FwuT(By6^m7ck8?#5i?v1+tK1qS;^(L^M{)Ve!sRPV7CXT;UaXRjYDN^R zRpA%pDlT7DrLh^T;_}sMu}Xe$j3`#g4^B0gud2CxRn6tAVzH|5ajxO= zRm}u8&PEigLy|uhvenYVoJG^xtLLGWO0{O`JQr@MB)TcPnpZwUV*e P+3xi#k8Hh|)js$K-^{