Added some more streams to test

jameschu · Nov 15, 2011 · e7a1bc5 · e7a1bc5
1 parent fe43317
commit e7a1bc5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git 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
diff --git 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"}
 
 
   };