Changeset 75

Timestamp:

08/16/10 21:48:02 (18 months ago)

Author:

shiretu

Message:

-- work on apple streaming

Location:

trunk

Files:

• builders/androidapplestreaming/src/com/rtmpd/CommandsInterface.java (modified) (1 diff)
• sources/androidapplestreaming/include/api.h (modified) (1 diff)
• sources/androidapplestreaming/src/api.cpp (modified) (1 diff)
• sources/androidapplestreaming/src/main.cpp (modified) (2 diffs)
• sources/tests/src/main.cpp (modified) (1 diff)

trunk/builders/androidapplestreaming/src/com/rtmpd/CommandsInterface.java

@@ -35 +35 @@
         public native HashMap<Object, Object> ContextCloseAll();
 
+        public native HashMap<Object, Object> CommandPlay(int contextId, String connectingString);
+
         public native HashMap<Object, Object> CommandPlay(int contextId, String m3u8Uri, String httpSessionId, String keyPassword);
 

trunk/sources/androidapplestreaming/include/api.h

@@ -31 +31 @@
 Variant ContextCloseAll();
 
+Variant CommandPlay(uint32_t contextId, string connectingString);
 Variant CommandPlay(uint32_t contextId, string m3u8Uri, string httpSessionId,
                 string keyPassword);

trunk/sources/androidapplestreaming/src/api.cpp

@@ -193 +193 @@
 }
 
+Variant CommandPlay(uint32_t contextId, string connectingString) {
+        vector<string> parts;
+        split(connectingString, ":", parts);
+        if ((parts.size() != 1) && (parts.size() != 2)) {
+                ASSERT("Invalid connecting string %s", STR(connectingString));
+        }
+        string b64encoded;
+        if (parts.size() == 1)
+                b64encoded = parts[0];
+        else
+                b64encoded = parts[1];
+        string all = unb64(b64encoded);
+        split(all, "|", parts);
+        if ((parts.size() != 1) && (parts.size() != 3)) {
+                ASSERT("Invalid connecting string %s", STR(all));
+        }
+        string uri = parts[0];
+        string keyPassword = "";
+        string httpSessionId = "";
+        if (parts.size() == 3) {
+                keyPassword = parts[1];
+                httpSessionId = parts[2];
+        }
+        FINEST("uri: `%s`\nkeyPassword: `%s`\nhttpSessionId: `%s`", STR(uri),
+                        STR(keyPassword), STR(httpSessionId));
+        if (uri == "") {
+                ASSERT("Invalid connecting string: %s", STR(connectingString));
+        }
+        return CommandPlay(contextId, uri, httpSessionId, keyPassword);
+}
+
 Variant CommandPlay(uint32_t contextId, string m3u8Uri, string httpSessionId,
                 string keyPassword) {

trunk/sources/androidapplestreaming/src/main.cpp

@@ -83 +83 @@
 
 
-#define MY_URL "http://mlbvod-akc.mlb.com/mlbam/2010/04/08/MLB_GAME_VIDEO_LANPIT_HOME_20100408/master_wired.m3u8"
-#define MY_SESSION_ID "playback=HTTP_CLOUD_WIRED&contentId=7320085&appAccountName=mlb&eventId=14-263849-2010-04-08&ipid=11627706&sessionKey=3HJ3abDj%2BPBkmIn8cprQTgkYIa8%3D"
-#define MY_KEY "ugkuOk9Qy4HNS5uRxQcQXHfLuAI="
+//#define MY_URL "http://mlbvod-akc.mlb.com/mlbam/2010/04/08/MLB_GAME_VIDEO_LANPIT_HOME_20100408/master_wired.m3u8"
+//#define MY_SESSION_ID "playback=HTTP_CLOUD_WIRED&contentId=7320085&appAccountName=mlb&eventId=14-263849-2010-04-08&ipid=11627706&sessionKey=3HJ3abDj%2BPBkmIn8cprQTgkYIa8%3D"
+//#define MY_KEY "ugkuOk9Qy4HNS5uRxQcQXHfLuAI="
+
+#define CONDENSED_CONN_STRING "base64:aHR0cDovL21sYnZvZC1ha2MubWxiLmNvbS9tbGJhbS8yMDEwLzA0LzA4L01MQl9HQU1FX1ZJREVPX0xBTlBJVF9IT01FXzIwMTAwNDA4L21hc3Rlcl93aXJlZC5tM3U4fHlNQmVFcEl6OEJEaUFYV0k0dUdIUm1UaHdIRT18cGxheWJhY2s9SFRUUF9DTE9VRF9XSVJFRCZjb250ZW50SWQ9NzMyMDA4NSZhcHBBY2NvdW50TmFtZT1tbGImZXZlbnRJZD0xNC0yNjM4NDktMjAxMC0wNC0wOCZpcGlkPTExNjI3NzA2JnNlc3Npb25LZXk9cUNveGRIaUlOY3FDbHlEcEZoU2dma3dJSWc0JTNE"
 
 void testCommands() {
@@ -92 +94 @@
 
         uint32_t contextId = (uint32_t) ASC_RES_PARAM(result, "contextId");
-        result = CommandPlay(contextId, MY_URL, MY_SESSION_ID, MY_KEY);
+        //      result = CommandPlay(contextId, MY_URL, MY_SESSION_ID, MY_KEY);
+        //      FINEST("result:\n%s", STR(result.ToString()));
+        result = CommandPlay(contextId, CONDENSED_CONN_STRING);
         FINEST("result:\n%s", STR(result.ToString()));
 

trunk/sources/tests/src/main.cpp

@@ -25 +25 @@
 int main(int argc, char **argv) {
         TS_PRINT("Begin tests...\n");
+        printf("sizeof(Variant): %lu\n",sizeof(Variant));
         EXECUTE_SUITE(CommonTestsSuite);
         EXECUTE_SUITE(VariantTestsSuite);