Changeset 90

Timestamp:

08/22/10 22:14:41 (18 months ago)

Author:

shiretu

Message:

-- added WaitEnvReady? for android

Location:

trunk

Files:

• builders/androidapplestreaming/src/org/apache/android/media/VideoViewDemo.java (modified) (4 diffs)
• builders/cmake/run (modified) (1 diff)
• sources/androidapplestreaming/include/api.h (modified) (1 diff)
• sources/androidapplestreaming/include/jniwrapper.h (modified) (1 diff)
• sources/androidapplestreaming/src/api.cpp (modified) (1 diff)
• sources/androidapplestreaming/src/jniwrapper.cpp (modified) (1 diff)

trunk/builders/androidapplestreaming/src/org/apache/android/media/VideoViewDemo.java

@@ -68 +68 @@
         _thread = new Thread() {
                 public void run() {
-                    _ci.EnvRun(callbackObj, "0.0.0.0", 55544);
+                    _ci.EnvRun(callbackObj, "0.0.0.0", 5544);
                 }
             };
@@ -144 +144 @@
             return;
 
-        url="http://10.0.2.1/~shiretu/jwp/m.m3u8";
-        String key="mv/riCUfFPozkOrRbr5ddlSFozU=";
-        String sessId="playback=HTTP_CLOUD_WIRED&contentId=7320085&appAccountName=mlb&eventId=14-263849-2010-04-08&ipid=11627706&sessionKey=f8ZFssJ4sqRLYIU1VAXCxyvM5mc%3D";
+        //url="http://10.0.2.1/~shiretu/jwp/m.m3u8";
+        //String key="mv/riCUfFPozkOrRbr5ddlSFozU=";
+        //String sessId="playback=HTTP_CLOUD_WIRED&contentId=7320085&appAccountName=mlb&eventId=14-263849-2010-04-08&ipid=11627706&sessionKey=f8ZFssJ4sqRLYIU1VAXCxyvM5mc%3D";
 
         //url="http://mlbvod-akc.mlb.com/mlbam/2010/04/08/MLB_GAME_VIDEO_LANPIT_HOME_20100408/master_mobile.m3u8";
@@ -152 +152 @@
         //String sessId="playback=HTTP_CLOUD_WIRED&contentId=7320085&appAccountName=mlb&eventId=14-263849-2010-04-08&ipid=11627706&sessionKey=GBncPsxRBV02IC9n80RP1Sdr9ew%3D";
  
-        //url="http://mediadownloads.mlb.com/mlbam/2010/06/29/9505835_m3u8/128/dropf_9505835_100m_128K.m3u8";
-        //String key="";
-        //String sessId="";
+        url="http://mediadownloads.mlb.com/mlbam/2010/06/29/9505835_m3u8/128/dropf_9505835_100m_128K.m3u8";
+        String key="";
+        String sessId="";
 
         //url="http://mlbsegqa.mlb.com/mlbam/2010/08/17/MLB_GAME_VIDEO_DETNYA_HOME_20100817/master_mobile.m3u8";
         //String key="/AMhXX7vmDTcQrsJndNI/TEw+sM=";
         //String sessId="playback=HTTP_CLOUD_MOBILE&contentId=10111969&appAccountName=mlb&eventId=14-265611-2010-08-18&ipid=11627706&sessionKey=f8ZFssJ4sqRLYIU1VAXCxyvM5mc%3D&deviceId=ANDROID_356698030670609&country=us&postalCode=10011&platform=ANDROID";
+
+
+        //url="http://mlbsegqa.mlb.com/mlbam/2010/08/17/MLB_GAME_VIDEO_DETNYA_HOME_20100817/master_mobile.m3u8";
+        //String key="fzi/ekWlN/nJY7M7zyODvnWvwCk=";
+        //String sessId="playback=HTTP_CLOUD_MOBILE&contentId=10111969&appAccountName=mlb&eventId=14-265611-2010-08-18&ipid=23272205&sessionKey=lCzgmwnNPsLrnlcqm8bZ8Fk6GEM%3D&country=us&postalCode=10292&platform=ANDROID";
 
         Toast.makeText(getApplicationContext(), "Opening: " + url, Toast.LENGTH_LONG).show();
@@ -213 +218 @@
             }
 
-            final String path = "rtsp://127.0.0.1:55544/" + msgInfoListStreams.getStreamName(0);
+            final String path = "rtsp://127.0.0.1:5544/" + msgInfoListStreams.getStreamName(0);
             Log.v(TAG, "path: " + path);
             if (path == null || path.length() == 0) {

trunk/builders/cmake/run

@@ -25 +25 @@
 #./tssplitter/tssplitter ./tssplitter/tssplitter.lua 
 #./vmtests/vmtests ./vmtests/vmtests.lua ./vmtests/utils.lua
-./rtmpserver/rtmpserver ./rtmpserver/rtmpserver.lua
-#./androidapplestreaming/androidapplestreaming
+#./rtmpserver/rtmpserver ./rtmpserver/rtmpserver.lua
+./androidapplestreaming/androidapplestreaming
 #./tests/tests
 #./vmtests/vmtests

trunk/sources/androidapplestreaming/include/api.h

@@ -29 +29 @@
 void EnvRun(string ip, uint16_t port);
 #endif /* ANDROID */
+void WaitEnvReady();
 void EnvStop();
 

trunk/sources/androidapplestreaming/include/jniwrapper.h

@@ -32 +32 @@
                 jstring ip,
                 jint port);
+extern "C" void Java_com_rtmpd_CommandsInterface_WaitEnvReady(
+                JNIEnv* pEnv,
+                jobject thiz);
 extern "C" void Java_com_rtmpd_CommandsInterface_EnvStop(
                 JNIEnv* pEnv, jobject thiz);

trunk/sources/androidapplestreaming/src/api.cpp

@@ -183 +183 @@
 }
 
+void WaitEnvReady() {
+        //      VariantConnection vc;
+        //      while (!vc.Connect(gAddress)) {
+        //              sleep(1);
+        //      }
+        sleep(4);
+}
+
 void EnvStop() {
         IOHandlerManager::SignalShutdown();

trunk/sources/androidapplestreaming/src/jniwrapper.cpp

@@ -35 +35 @@
         ci.callbackMethodName = env->GetStringUTFChars(callbackMethodName, NULL);
         EnvRun(env->GetStringUTFChars(ip, NULL), (uint16_t) port, ci);
+}
+
+extern "C" void Java_com_rtmpd_CommandsInterface_WaitEnvReady(
+                JNIEnv* pEnv,
+                jobject thiz) {
+        WaitEnvReady();
 }