Changeset 88 for trunk/sources/androidapplestreaming/src/api.cpp

Timestamp:

08/22/10 20:05:34 (21 months ago)

Author:

shiretu

Message:

-- android related stuff

File:

• trunk/sources/androidapplestreaming/src/api.cpp (modified) (5 diffs)

trunk/sources/androidapplestreaming/src/api.cpp

@@ -76 +76 @@
         configuration[CONF_APPLICATION_ALIASES].PushToArray("asc");
         configuration[CONF_APPLICATION_DEFAULT] = (bool)true;
-        configuration[CONF_APPLICATION_VALIDATEHANDSHAKE] = (bool)false;
+        configuration[CONF_APPLICATION_VALIDATEHANDSHAKE] = (bool)true;
         configuration[CONF_APPLICATION_KEYFRAMESEEK] = (bool)true;
         configuration[CONF_APPLICATION_CLIENTSIDEBUFFER] = (int32_t) 15;
@@ -82 +82 @@
         configuration[CONF_APPLICATION_MEDIAFOLDER] = "./";
         configuration[CONF_APPLICATION_GENERATE_META_FILES] = (bool)false;
+        configuration["rtspHost"] = format("rtsp://127.0.0.1:%d/", port);
         AppleStreamingClientApplication *pApp = new AppleStreamingClientApplication(
                         configuration);
@@ -106 +107 @@
                 ASSERT("Invalid protocol chain: %s", CONF_PROTOCOL_INBOUND_RTSP);
         }
-        TCPAcceptor *pAcceptor = new TCPAcceptor(ip, port, acceptorConfig, chain);
+        TCPAcceptor *pAcceptor = new TCPAcceptor(ip,
+                        (uint16_t) acceptorConfig[CONF_PORT], acceptorConfig, chain);
         if (!pAcceptor->StartAccept(pApp)) {
                 ASSERT("Unable to fire up acceptor");
@@ -118 +120 @@
                 ASSERT("Invalid protocol chain: %s", CONF_PROTOCOL_INBOUND_BIN_VARIANT);
         }
-        pAcceptor = new TCPAcceptor(ip, port + 1, acceptorConfig, chain);
+        pAcceptor = new TCPAcceptor(ip, (uint16_t) acceptorConfig[CONF_PORT],
+                        acceptorConfig, chain);
         if (!pAcceptor->StartAccept(pApp)) {
                 ASSERT("Unable to fire up acceptor");
@@ -130 +133 @@
                 ASSERT("Invalid protocol chain: %s", CONF_PROTOCOL_INBOUND_XML_VARIANT);
         }
-        pAcceptor = new TCPAcceptor(ip, port + 2, acceptorConfig, chain);
+        pAcceptor = new TCPAcceptor(ip, (uint16_t) acceptorConfig[CONF_PORT],
+                        acceptorConfig, chain);
+        if (!pAcceptor->StartAccept(pApp)) {
+                ASSERT("Unable to fire up acceptor");
+        }
+
+        //9. Create the RTMP acceptor
+        acceptorConfig[CONF_PORT] = (uint16_t) (1935);
+        acceptorConfig[CONF_PROTOCOL] = CONF_PROTOCOL_INBOUND_RTMP;
+        chain = ProtocolFactoryManager::ResolveProtocolChain(CONF_PROTOCOL_INBOUND_RTMP);
+        if (chain.size() == 0) {
+                ASSERT("Invalid protocol chain: %s", CONF_PROTOCOL_INBOUND_RTMP);
+        }
+        pAcceptor = new TCPAcceptor(ip, (uint16_t) acceptorConfig[CONF_PORT],
+                        acceptorConfig, chain);
         if (!pAcceptor->StartAccept(pApp)) {
                 ASSERT("Unable to fire up acceptor");