From e7a1bc5992d0409f31321ead841bb1b9497a8be3 Mon Sep 17 00:00:00 2001
From: Mike Bevz <me@mikebevz.com>
Date: Tue, 15 Nov 2011 15:38:06 +0100
Subject: [PATCH] Added some more streams to test

---
 jni/configure.sh                            |  11 +++++++----
 libs/armeabi/libffmpeg.so                   | Bin 1020 -> 1828 bytes
 src/dk/nordfalk/netradio/Afspiller_akt.java |   5 ++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/jni/configure.sh b/jni/configure.sh
index 9575bb6..25375ff 100755
--- a/jni/configure.sh
+++ b/jni/configure.sh
@@ -38,15 +38,18 @@ for version in $TARGET_ARCHS; do
 	FLAGS="$FLAGS --enable-zlib "	
     FLAGS="$FLAGS --enable-decoder=mp3 --enable-decoder=mp3adu --enable-decoder=mp3adufloat \
                   --enable-decoder=mp3float --enable-decoder=mp3on4 --enable-decoder=mp3on4floats \
-                  --enable-decoder=aac --enable-decoder=aac_latm --enable-decoder=ac3 --enable-decoder=alac"
+                  --enable-decoder=aac --enable-decoder=aac_latm --enable-decoder=ac3 --enable-decoder=alac\
+                  --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmavoice"
 	FLAGS="$FLAGS --enable-protocol=http --enable-protocol=tcp --enable-network --enable-protocol=applehttp \
 	              --enable-protocol=rtp  --enable-protocol=udp --enable-protocol=md5 --enable-protocol=concat \
-	              --enable-protocol=file --enable-protocol=crypto --enable-protocol=pipe --enable-protocol=rtsp"
+	              --enable-protocol=file --enable-protocol=crypto --enable-protocol=pipe --enable-protocol=rtsp \
+	              --enable-protocol=mmst --enable-protocol=mmsh"
 	FLAGS="$FLAGS --enable-muxer=mp3 --enable-muxer=wav --enable-muxer=pcm_alaw --enable-muxer=pcm_mulaw \
 	              --enable-muxer=pcm_s16be --enable-muxer=pcm_s16le --enable-muxer=pcm_u16be --enable-muxer=pcm_u16le \
-	              --enable-muxer=rtsp \
+	              --enable-muxer=rtsp --enable-muxer=asf --enable-muxer=asf_stream\
 	              --enable-demuxer=mp3 --enable-demuxer=wav --enable-demuxer=aac --enable-demuxer=applehttp \
-	              --enable-demuxer=mpegts --enable-demuxer=aac --enable-demuxer=ogg --enable-demuxer=rtsp"
+	              --enable-demuxer=mpegts --enable-demuxer=aac --enable-demuxer=ogg --enable-demuxer=rtsp \
+	              --enable-demuxer=asf "
     FLAGS="$FLAGS --enable-parser=mpegaudio --enable-parser=aac --enable-parser=aac_latm "
     #FLAGS="$FLAGS --enable-bsf=mp3_header_decompress --enable-bsf=aac_adtstoasc --enable-bsf=noise "
     
diff --git a/libs/armeabi/libffmpeg.so b/libs/armeabi/libffmpeg.so
index f175e267bed10fc6ec9d8a6e82a91f0703dacd12..ce197aa379199117c2aae4fb0d4892f919858c19 100755
GIT binary patch
literal 1828
zcma)6&ubG=5T4kyMy+kCQh!B=H?egQtWdEB18uRO(v}M9WqHYNn}z%+yH82=;MIc=
z?;bqsS#RpmL-CIYg+TFSZ|Ws}-)1Mqw1*CSJ2P*-_iJX}zFfGsm`bHYWk{|Fz5I~K
z4D|Q3$Ptm@8Oci;v2huT<I1PL4lXfFCo6G09y^V3U=$1HfsrJR^<*CWdBlia_yptF
zPFC91gW4w=$5fdB#(;4ETkaEbxR%OM7@U6$;5knKqd*2Y4x9uI66S$2BwRt{&Y4)j
zAC)>x-jkA*z0L>d<s?p@c~m(CV;Y#neJNR-<Sq1EAD{Q&`aJgp);G}o>%WKJzy2l0
zd+TMS3BP~6PXqi{1Mz1A@fZKaks;SDHH^C+)J!FK?!)z>x?46iuR>?(!P1&rSY0hV
zc3rrO@Oy40C`Q&RO-(sbUEov`T}rf9q2aoIBk&q-WKC#$o?r7|d&U|K_;fH<j3OQS
zXUCf}f_bss)!1}>y}Idda3ka%bvn!YAz#$9$nzu`A>F#xPPg8*$6C!+=I7UTj*a!L
zxs%#{y_4Jf+)hh#N90ZWcc=4%wdp{>h_&_x>wFuazMJUfL_dONpMC+fPtU_<-7Z42
z|1JRRiySn2lJ)-xuupS%EbLppA@=Duz~1FrY`tlmiSLQ)z>MDo@AnIXyvi;#dyjm!
z3VD+N<xi(m=iI{z-)c{=dEp#9<C|h2Dc*7T=Guacq%$dTqH<(IYl`BOO;i@g+p0xd
z)vmUoIH6zRSl8IBSaGc1z&EG`)-_>hw!}f-1!{w9szFJdjXGGUwm5~=`;M_T42n;!
zAN9_42!r`!Zh3d+nP8nX7tDY64R&+Qaps@M0?a!>4)e--(kGAgB3LICOo`<(zWo1?
z$GQ-lPoKi|Sf8ta@>oZL<K*c-kiG+OZI0=o^0X7td)$DpygUv{a9<VjD7OICk#}K#
z^54UKRP-JT7~p@GJofD@4EC*x@>Vdwvym77>tXCBK2-0%PhfKndF<zD9BA--JfjQn
jJmm2$&JFN%j@RXELd8NJYowy*(>-<kA$V3DXyyF{g5TAV

literal 1020
zcma)*Jx;?w5QR4+B>V{lIyz_|qA&$HKpLQ-K^(xc<NQfDL9vk%8lu!3gCZqGjsyol
zqKEg{-Xxd;MtPcfGjG<rvzw=j>&rr+V5}8Q&A@7F#?<BC<n=4n&7mo&Rx#zIZuR(M
z2|x)_HH-e*zSa?*l?LUkE@`s9txv=Ob=J6fj{~`1X6r>&wuKF0Q`i!$El-lJ#kc6A
zXI-cWc{@>p{bN=0@#V|UwQmf5E5FJQ#8>rRu6~u{VU9O)+{y9tA6&b>>-kM58sHx@
zAL3oNHR=T;H;TPsykM<<pg8bi&lXw`<@_kJsb%cCSw($GoO*q$-45?t9X^!aDYFI4
z9KR>*3J-#=Ju&WYE->pCiJ1MTz#UBm?#*fy{@Zvf3v;4w6c1z1H%`}!y2c5{{b(Gf
zJ{~6C3wurDbO!OF>(79_v2UINX8;WWj&U}?xzUp6Y~WSkjWHKAoRN1z4jr=qQ^nTM
tVn>2~qsf0l4HM<)#aNHGek#yIex`ZMq}x$!4IQu=o1aT}W=U3ueggvFae4p%

diff --git a/src/dk/nordfalk/netradio/Afspiller_akt.java b/src/dk/nordfalk/netradio/Afspiller_akt.java
index 63c2f64..3a4a068 100644
--- a/src/dk/nordfalk/netradio/Afspiller_akt.java
+++ b/src/dk/nordfalk/netradio/Afspiller_akt.java
@@ -58,12 +58,15 @@ public class Afspiller_akt extends Activity implements OnClickListener {
   private CheckBox addBuzzTone;
   //private Spinner kanalSpinner;
   private String[][] kanaler = {
-    {"P3 rtsp LQ", "rtsp://live-rtsp.dr.dk/rtplive/_definst_/Channel5_LQ.stream"},
+    {"P3 rtsp LQ", "rtsp://live-rtsp.dr.dk/rtplive/_definst_/Channel5_LQ.stream", "aac"},
     {"Sverige P3 rtsp", "rtsp://mobil-live.sr.se/mobilradio/kanaler/p3-aac-96"},
     {"P3 mp3 ICE LQ", "http://live-icy.gss.dr.dk:8000/Channel5_LQ.mp3", "mp3"},
 //    {"P3 httplive", "httplive://live-http.gss.dr.dk/streaming/audio/channel5.m3u8"},
     {"P3 http(live)2", "http://live-http.gss.dr.dk/streaming/audio/channel5.m3u8"},
     {"Mikes URL", "http://live-http.gss.dr.dk/streaming/audio/Channel21/Channel21_LQ0.m3u8", "applehttp"},
+    {"Dubstep Radio 1 mp3 80", "http://178.32.253.144:8026"},
+    {"Dubstep Radio 2 mp3 196", "http://lemon.citrus3.com:8062"},
+    {"DR ASF", "http://172.18.200.13:80/e02ch01m?wmcontentbitrate=40000&MSWMExt=.asf"}
 
 
   };