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

Timestamp:

08/24/10 07:51:02 (21 months ago)

Author:

shiretu

Message:

-- android related

File:

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

trunk/sources/androidapplestreaming/src/api.cpp

@@ -99 +99 @@
         //7. Create the RTSP acceptor
         Variant acceptorConfig;
-        acceptorConfig[CONF_IP] = "127.0.0.1";
+        acceptorConfig[CONF_IP] = ip;
         acceptorConfig[CONF_PORT] = (uint16_t) port;
         acceptorConfig[CONF_PROTOCOL] = CONF_PROTOCOL_INBOUND_RTSP;
         vector<uint64_t> chain;
-        chain = ProtocolFactoryManager::ResolveProtocolChain(CONF_PROTOCOL_INBOUND_RTSP);
-        if (chain.size() == 0) {
-                ASSERT("Invalid protocol chain: %s", CONF_PROTOCOL_INBOUND_RTSP);
-        }
-        TCPAcceptor *pAcceptor = new TCPAcceptor(ip,
+        chain = ProtocolFactoryManager::ResolveProtocolChain(acceptorConfig[CONF_PROTOCOL]);
+        if (chain.size() == 0) {
+                ASSERT("Invalid protocol chain: %s", STR(acceptorConfig[CONF_PROTOCOL]));
+        }
+        TCPAcceptor *pAcceptor = new TCPAcceptor(acceptorConfig[CONF_IP],
                         (uint16_t) acceptorConfig[CONF_PORT], acceptorConfig, chain);
         if (!pAcceptor->StartAccept(pApp)) {
@@ -116 +116 @@
         acceptorConfig[CONF_PORT] = (uint16_t) (port + 1);
         acceptorConfig[CONF_PROTOCOL] = CONF_PROTOCOL_INBOUND_BIN_VARIANT;
-        chain = ProtocolFactoryManager::ResolveProtocolChain(CONF_PROTOCOL_INBOUND_BIN_VARIANT);
-        if (chain.size() == 0) {
-                ASSERT("Invalid protocol chain: %s", CONF_PROTOCOL_INBOUND_BIN_VARIANT);
-        }
-        pAcceptor = new TCPAcceptor(ip, (uint16_t) acceptorConfig[CONF_PORT],
+        chain = ProtocolFactoryManager::ResolveProtocolChain(acceptorConfig[CONF_PROTOCOL]);
+        if (chain.size() == 0) {
+                ASSERT("Invalid protocol chain: %s", STR(acceptorConfig[CONF_PROTOCOL]));
+        }
+        pAcceptor = new TCPAcceptor(acceptorConfig[CONF_IP], (uint16_t) acceptorConfig[CONF_PORT],
                         acceptorConfig, chain);
         if (!pAcceptor->StartAccept(pApp)) {
@@ -129 +129 @@
         acceptorConfig[CONF_PORT] = (uint16_t) (port + 2);
         acceptorConfig[CONF_PROTOCOL] = CONF_PROTOCOL_INBOUND_XML_VARIANT;
-        chain = ProtocolFactoryManager::ResolveProtocolChain(CONF_PROTOCOL_INBOUND_XML_VARIANT);
-        if (chain.size() == 0) {
-                ASSERT("Invalid protocol chain: %s", CONF_PROTOCOL_INBOUND_XML_VARIANT);
-        }
-        pAcceptor = new TCPAcceptor(ip, (uint16_t) acceptorConfig[CONF_PORT],
+        chain = ProtocolFactoryManager::ResolveProtocolChain(acceptorConfig[CONF_PROTOCOL]);
+        if (chain.size() == 0) {
+                ASSERT("Invalid protocol chain: %s", STR(acceptorConfig[CONF_PROTOCOL]));
+        }
+        pAcceptor = new TCPAcceptor(acceptorConfig[CONF_IP], (uint16_t) acceptorConfig[CONF_PORT],
                         acceptorConfig, chain);
         if (!pAcceptor->StartAccept(pApp)) {
@@ -142 +142 @@
         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],
+        chain = ProtocolFactoryManager::ResolveProtocolChain(acceptorConfig[CONF_PROTOCOL]);
+        if (chain.size() == 0) {
+                ASSERT("Invalid protocol chain: %s", STR(acceptorConfig[CONF_PROTOCOL]));
+        }
+        pAcceptor = new TCPAcceptor(acceptorConfig[CONF_IP], (uint16_t) acceptorConfig[CONF_PORT],
                         acceptorConfig, chain);
         if (!pAcceptor->StartAccept(pApp)) {
                 ASSERT("Unable to fire up acceptor");
         }
+
+        //10. Create the timer UDP protocol
+#ifdef HAS_MS_TIMER
+        acceptorConfig[CONF_PORT] = (uint16_t) (port + 3);
+        acceptorConfig[CONF_PROTOCOL] = "fineTimer";
+        acceptorConfig["FineTimerPeriod"] = 0.2;
+        chain = ProtocolFactoryManager::ResolveProtocolChain(acceptorConfig[CONF_PROTOCOL]);
+        if (chain.size() == 0) {
+                ASSERT("Invalid protocol chain: %s", STR(acceptorConfig[CONF_PROTOCOL]));
+        }
+        UDPCarrier *pUDPCarrier = UDPCarrier::Create(acceptorConfig[CONF_IP], (uint16_t) acceptorConfig[CONF_PORT]);
+        if (pUDPCarrier == NULL) {
+                ASSERT("Unable to bind on udp://%s:%d", STR(acceptorConfig[CONF_IP]), (uint16_t) acceptorConfig[CONF_PORT]);
+        }
+        BaseProtocol *pTimer = ProtocolFactoryManager::CreateProtocolChain(chain, acceptorConfig);
+        pTimer->GetFarEndpoint()->SetIOHandler(pUDPCarrier);
+        pUDPCarrier->SetProtocol(pTimer->GetFarEndpoint());
+        pApp->SetFineTimerId(pTimer->GetId());
+#endif /* HAS_MS_TIMER */
 
         inet_aton("127.0.0.1", &gAddress.sin_addr);