From db1e6a133d1e29d3eb5bf8d526b76423d523d6a9 Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Tue, 23 Feb 2010 13:59:04 +0100 Subject: [PATCH] test: Use image.jpg for testing tracks reading. image.jpg is a very small 1x1 image. --- test/Makefile.am | 2 +- test/libvlc/media.c | 5 +++-- test/samples/image.jpg | Bin 0 -> 2170 bytes 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100755 test/samples/image.jpg diff --git a/test/Makefile.am b/test/Makefile.am index 4088a98c48..0b11a9bbac 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -29,7 +29,7 @@ EXTRA_PROGRAMS = \ $(NULL) #check_DATA = samples/test.sample samples/meta.sample -EXTRA_DIST = samples/empty.voc +EXTRA_DIST = samples/empty.voc samples/image.jpg check_HEADERS = libvlc/test.h libvlc/libvlc_additions.h diff --git a/test/libvlc/media.c b/test/libvlc/media.c index 90aedb6ab1..95ed765c82 100644 --- a/test/libvlc/media.c +++ b/test/libvlc/media.c @@ -33,7 +33,8 @@ static void preparsed_changed(const libvlc_event_t *event, void *user_data) static void test_media_preparsed(const char** argv, int argc) { - const char * file = test_default_sample; + // We use this image file because "empty.voc" has no track. + const char * file = SRCDIR"/samples/image.jpg"; log ("Testing set_media\n"); @@ -58,7 +59,7 @@ static void test_media_preparsed(const char** argv, int argc) // We are good, now check Elementary Stream info. libvlc_media_track_info_t *tracks; int num = libvlc_media_get_tracks_info(media, &tracks); - assert(num > 0); + assert(num == 1); free(tracks); libvlc_media_release (media); diff --git a/test/samples/image.jpg b/test/samples/image.jpg new file mode 100755 index 0000000000000000000000000000000000000000..7a8d3089714a21ea07ef18967fc1e623844e91ed GIT binary patch literal 2170 zcmbVNYj6`)6h3$N=GByzKq;kkWGN3T({@6OP<%m?K1gXx2rUTX43j3CW?`Fz-J~rY zbf7*!{zws@f8?d2!yi->9e#i!RYwM~l$VTS@mU-k9*Uwe>$$rz2@F1OW;frS^WAg4 z?{4mmc1rsKMmE%W>VOae^Y8=O1-Qo>j>e;EI2scw%bif=@-$HjY)mL3%YYw0rM`#* z;D9UQ#(`aD3$AE19tQ24X|BiZUhefRsPi<|Vp#x_(;th;oB+@fi7UQ(mvH~mWrF22 z7Qoq12zGx!ja7TSjjRRZvhN$m)f0e~00zo#oxhQN(~~`@208$U6*XTDifRCW{~bBe zb`%0YS--rlcr1>1EyIct-@nb zjD!pcqbx6CR00)N-jXSUH#JK}Mm-GUoMC;=DoEgLR(~G+;<|D@k!MC{n_oWRu8%TYxWnUdkxZk4-91YugO${ z+HZDctTc0#x$=PwUglbh^fo%3dT14$4Fa7*=hFLV4L;pX8&fk{ajhiiLfs0g_oIgh ztj28mO{doujJ<}x7~DtoVnkG=fWY>@SBZusS=1B8?H|$^%)f)|Tru*?5&*kZfUz^u zu`53P3?cbP)3JCHz`Z}UXR;q5M*!ktH|}`=cQm$Ik=ny? zp~C5$B~;^)B?_KMpuAM@%d()SR6!9{QRx(e<)DTtEA%=f+lA-E=bCl}_n&1m!1X>& z`)#|XUEhHk&H@~ewINtr+bx9vnwnr5&a#4ui~=4JVfslSm~;%#K*p!AkCY@icrve- zfSpCi20Y*NfhW8EYr}92-Qxa~#i`DUZWqGEuYDVzsi%mNmj| zvt?<@d1d_J|xDHv33NZjOUtR)kH*S!PPjIX0_}G5*`o4uHeTZ1bcTI0xY!L^}i% z(1{8Euh?H!auANECbI=K*^#h!Byfc1Im)A6TnO?Y=7Bm)qb5$THjiHDw-m3+t60~! z%{s}o=inIMv5S){+mv2gR{q$6afMT+-d=LYv>A8KoK-dZE_Y3BUHv>y!=jef#Y^xf z5(tW+_OP@xr+{K%t^t>5tY#?4P|dFttBo_+55?K^h9_|nU}UU~Jk*WcLt z=3D#Te&^ly4!wW4|AP-d`gGv<;E9u`PM;Y%_vKe#fAj5k!{;wuzVhQwSAYKH+ONzP z0p75ca(0t12m0bD<*9}FB3u_J8eLqm&YI`y+qUPRZBnK0;+Qt& uSXTbz8ADSpF>AWBe`l=se>qDTOZz$l**w9Q$2(vST#IZh*?lBeJN*a9#@kZ> literal 0 HcmV?d00001 -- 2.39.2