Changeset 81

Timestamp:

08/19/10 16:17:19 (18 months ago)

Author:

shiretu

Message:

-- minor stuff for android apple streaming

Location:

trunk

Files:

• builders/androidapplestreaming/src/org/apache/android/media/VideoViewDemo.java (modified) (1 diff)
• constants/constants.lua (modified) (1 diff)
• sources/androidapplestreaming/src/main.cpp (modified) (1 diff)
• sources/applications/applestreamingclient/src/playlist.cpp (modified) (1 diff)
• sources/applications/applestreamingclient/src/protocols/m3u8/basem3u8protocol.cpp (modified) (1 diff)
• sources/common/include/defines.h (modified) (1 diff)
• sources/thelib/src/protocols/http/outboundhttpprotocol.cpp (modified) (1 diff)

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

@@ -142 +142 @@
             return;
 
+        url="http://10.0.2.7/~shiretu/jwp/m.m3u8";
+        String key="HdnAtffj8TSZvtTRryG5xcI78w8=";
+        String sessId="playback=HTTP_CLOUD_WIRED&contentId=10804941&appAccountName=mlb&eventId=14-265607-2010-08-18&ipid=24061847&sessionKey=jhNOkzFU%2FvMTvsyP4b5l16a47W8%3D&country=us&postalCode=10292&platform=WEB_MEDIAPLAYER";
+
+        //url="http://mlbvod-akc.mlb.com/mlbam/2010/04/08/MLB_GAME_VIDEO_LANPIT_HOME_20100408/master_mobile.m3u8";
+        //String key="bl8D2EASEF8WUrzZ+y3o0NiQyAk=";
+        //String sessId="playback=HTTP_CLOUD_WIRED&contentId=7320085&appAccountName=mlb&eventId=14-263849-2010-04-08&ipid=11627706&sessionKey=GBncPsxRBV02IC9n80RP1Sdr9ew%3D";
+ 
+
         Toast.makeText(getApplicationContext(), "Opening: " + url, Toast.LENGTH_LONG).show();
 
         MessageBase result;
         result=new MessageBase(_ci.CommandPlay( mContextId, 
-                                                url, "", ""));
+                                                url, sessId, key));
         Log.v(TAG, "CommandPlay: " + result.toString());
     }

trunk/constants/constants.lua

@@ -126 +126 @@
 HTTP_VERSION="version",
 HTTP_VERSION_1_1="HTTP/1.1",
+HTTP_VERSION_1_0="HTTP/1.0",
 HTTP_HEADERS="headers",
 HTTP_HEADERS_USER_AGENT="User-Agent",

trunk/sources/androidapplestreaming/src/main.cpp

@@ -87 +87 @@
 //#define MY_KEY "ugkuOk9Qy4HNS5uRxQcQXHfLuAI="
 
-#define CONDENSED_CONN_STRING "base64:aHR0cDovL21sYnZvZC1ha2MubWxiLmNvbS9tbGJhbS8yMDEwLzA0LzA4L01MQl9HQU1FX1ZJREVPX0xBTlBJVF9IT01FXzIwMTAwNDA4L21hc3Rlcl93aXJlZC5tM3U4fHlNQmVFcEl6OEJEaUFYV0k0dUdIUm1UaHdIRT18cGxheWJhY2s9SFRUUF9DTE9VRF9XSVJFRCZjb250ZW50SWQ9NzMyMDA4NSZhcHBBY2NvdW50TmFtZT1tbGImZXZlbnRJZD0xNC0yNjM4NDktMjAxMC0wNC0wOCZpcGlkPTExNjI3NzA2JnNlc3Npb25LZXk9cUNveGRIaUlOY3FDbHlEcEZoU2dma3dJSWc0JTNE"
-
+//#define CONDENSED_CONN_STRING "base64:aHR0cDovL21sYnZvZC1ha2MubWxiLmNvbS9tbGJhbS8yMDEwLzA0LzA4L01MQl9HQU1FX1ZJREVPX0xBTlBJVF9IT01FXzIwMTAwNDA4L21hc3Rlcl93aXJlZC5tM3U4fHlNQmVFcEl6OEJEaUFYV0k0dUdIUm1UaHdIRT18cGxheWJhY2s9SFRUUF9DTE9VRF9XSVJFRCZjb250ZW50SWQ9NzMyMDA4NSZhcHBBY2NvdW50TmFtZT1tbGImZXZlbnRJZD0xNC0yNjM4NDktMjAxMC0wNC0wOCZpcGlkPTExNjI3NzA2JnNlc3Npb25LZXk9cUNveGRIaUlOY3FDbHlEcEZoU2dma3dJSWc0JTNE"
+#define CONDENSED_CONN_STRING "aHR0cDovL21sYnZvZC1ha2MubWxiLmNvbS9tbGJhbS8yMDEwLzA0LzA4L01MQl9HQU1FX1ZJREVPX0xBTlBJVF9IT01FXzIwMTAwNDA4L21hc3Rlcl93aXJlZC5tM3U4fGJsOEQyRUFTRUY4V1VyeloreTNvME5pUXlBaz18cGxheWJhY2s9SFRUUF9DTE9VRF9XSVJFRCZjb250ZW50SWQ9NzMyMDA4NSZhcHBBY2NvdW50TmFtZT1tbGImZXZlbnRJZD0xNC0yNjM4NDktMjAxMC0wNC0wOCZpcGlkPTExNjI3NzA2JnNlc3Npb25LZXk9R0JuY1BzeFJCVjAySUM5bjgwUlAxU2RyOWV3JTNE"
+ 
 void testCommands() {
         Variant result = ContextCreate();

trunk/sources/applications/applestreamingclient/src/playlist.cpp

@@ -113 +113 @@
                                         if (strstr(pLine, "#EXT-X-KEY:") == pLine) {
                                                 //10. We have it
-                                                //printf("pLine: %s; ", pLine);
-                                                _pLastKeyUri = strstr(pLine, "URI=\"") + 5;
-                                                strstr(_pLastKeyUri, "\"")[0] = 0;
+                                                //printf("\n\n\npLine: %s; \n", pLine);
+                                                _pLastKeyUri = strstr(pLine, "URI=\"");
+                                                if (_pLastKeyUri != NULL) {
+                                                        _pLastKeyUri += 5;
+                                                        strstr(_pLastKeyUri, "\"")[0] = 0;
+                                                }
                                                 //printf("_pKeyUri: %s\n", _pKeyUri);
                                         }

trunk/sources/applications/applestreamingclient/src/protocols/m3u8/basem3u8protocol.cpp

@@ -57 +57 @@
                 FATAL("The HTTP request failed. Response headers\n%s",
                                 STR(pHttpProtocol->GetHeaders().ToString()));
+                FATAL("Additional data:\n%s", STR(GetCustomParameters().ToString()));
                 return false;
         }

trunk/sources/common/include/defines.h

@@ -357 +357 @@
 #define HTTP_VERSION "version"
 #define HTTP_VERSION_LEN 7
+#define HTTP_VERSION_1_0 "HTTP/1.0"
+#define HTTP_VERSION_1_0_LEN 8
 #define HTTP_VERSION_1_1 "HTTP/1.1"
 #define HTTP_VERSION_1_1_LEN 8

trunk/sources/thelib/src/protocols/http/outboundhttpprotocol.cpp

@@ -75 +75 @@
         }
 
-        if (parts[0] != HTTP_VERSION_1_1) {
+        if ((parts[0] != HTTP_VERSION_1_1)
+                &&(parts[0] != HTTP_VERSION_1_0)) {
                 FATAL("Http version not supported: %s", STR(parts[0]));
                 return false;