Changeset 109

Timestamp:

08/27/10 03:10:58 (18 months ago)

Author:

shiretu

Message:

-- android stuff

Location:

trunk/sources

Files:

• androidapplestreaming/src/api.cpp (modified) (2 diffs)
• androidapplestreaming/src/main.cpp (modified) (2 diffs)
• applications/applestreamingclient/include/clientcontext.h (modified) (1 diff)
• applications/applestreamingclient/src/clientcontext.cpp (modified) (3 diffs)
• thelib/include/protocols/rtp/connectivity/baseconnectivity.h (modified) (1 diff)
• thelib/src/protocols/rtp/connectivity/baseconnectivity.cpp (modified) (2 diffs)
• thelib/src/protocols/rtp/connectivity/outboundconnectivity.cpp (modified) (1 diff)
• thelib/src/protocols/rtp/streaming/outnetrtpudph264stream.cpp (modified) (2 diffs)

trunk/sources/androidapplestreaming/src/api.cpp

@@ -139 +139 @@
         }
 
+#ifdef HAS_PROTOCOL_RTMP
         //9. Create the RTMP acceptor
         acceptorConfig[CONF_PORT] = (uint16_t) (1935);
@@ -151 +152 @@
                 ASSERT("Unable to fire up acceptor");
         }
+#endif /* HAS_PROTOCOL_RTMP */
 
         //10. Create the timer UDP protocol

trunk/sources/androidapplestreaming/src/main.cpp

@@ -136 +136 @@
 //#define MY_SESSION_ID "playback=HTTP_CLOUD_MOBILE&contentId=11090061&appAccountName=mlb&eventId=14-265698-2010-08-25&ipid=11627706&sessionKey=Pff4k8IQCTNjs46Plh6%2BBOvMEBw%3D&deviceId=ANDROID_A0000022419B22&country=us&postalCode=10011&platform=ANDROID"
 
-#define MY_URL "http://localhost/~shiretu/ts10/200/prog_index.m3u8"
-#define MY_KEY ""
-#define MY_SESSION_ID ""
+//#define MY_URL "http://localhost/~shiretu/ts10/200/prog_index.m3u8"
+//#define MY_KEY ""
+//#define MY_SESSION_ID ""
+
+#define MY_URL "http://mlblive-akc.mlb.com/mlbam/2010/08/26/MLB_GAME_VIDEO_ARISDN_HOME_20100826/master_mobile.m3u8"
+#define MY_KEY "Ey5xHlceWWeYwHOlMRuYMm/DZqE="
+#define MY_SESSION_ID "playback=HTTP_CLOUD_MOBILE&contentId=11131241&appAccountName=mlb&eventId=14-265710-2010-08-26&ipid=11627706&sessionKey=8EcVAKWRJQVyLjuxvLCJXgz6aSI%3D&deviceId=ANDROID_null&country=us&postalCode=10011&platform=ANDROID"
 
 //#define CONDENSED_CONN_STRING "base64:aHR0cDovL21sYnZvZC1ha2MubWxiLmNvbS9tbGJhbS8yMDEwLzA0LzA4L01MQl9HQU1FX1ZJREVPX0xBTlBJVF9IT01FXzIwMTAwNDA4L21hc3Rlcl93aXJlZC5tM3U4fHlNQmVFcEl6OEJEaUFYV0k0dUdIUm1UaHdIRT18cGxheWJhY2s9SFRUUF9DTE9VRF9XSVJFRCZjb250ZW50SWQ9NzMyMDA4NSZhcHBBY2NvdW50TmFtZT1tbGImZXZlbnRJZD0xNC0yNjM4NDktMjAxMC0wNC0wOCZpcGlkPTExNjI3NzA2JnNlc3Npb25LZXk9cUNveGRIaUlOY3FDbHlEcEZoU2dma3dJSWc0JTNE"
@@ -148 +152 @@
 
         uint32_t contextId = (uint32_t) ASC_RES_PARAM(result, "contextId");
-        result = CommandSetBitrates(contextId, " []");
+        result = CommandSetBitrates(contextId, " [800000]");
         FINEST("result:\n%s", STR(result.ToString()));
 

trunk/sources/applications/applestreamingclient/include/clientcontext.h

@@ -70 +70 @@
         StreamsManager *_pStreamsManager;
         double _lastWallClock;
+        double _firstFeedTime;
         map<uint32_t, uint32_t> _allowedBitrates;
 private:

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

@@ -56 +56 @@
         _lastWallClock = 0;
         _avData.EnsureSize(_maxAVBufferSize * 3);
+        _firstFeedTime = 0;
         INFO("Context created: %d (%p)", _id, this);
 }
@@ -323 +324 @@
         //1. initialize _lastFeedTime
         if (_lastWallClock == 0) {
+#ifdef HAS_MS_TIMER
+                GETCLOCKS(_lastWallClock);
+#else
                 _lastWallClock = time(NULL)*1000.0;
+#endif /* HAS_MS_TIMER */
                 return true;
         }
@@ -385 +390 @@
 
         //5. How much seconds do we have to feed?
+#ifdef HAS_MS_TIMER
+        double currentTime;
+        GETCLOCKS(currentTime);
+        double wallClockDelta = ((currentTime - _lastWallClock) / (double) CLOCKS_PER_SECOND)*1000.00;
+#else
         double wallClockDelta = time(NULL)*1000.00 - _lastWallClock;
+#endif /* HAS_MS_TIMER */
+
+        if (_firstFeedTime == 0) {
+                _firstFeedTime = pStream->GetFeedTime();
+        }
 
         //6. Feed
         //      FINEST("BEFORE: wallClockDelta: %.2f; GetFeedTime: %.2f",
         //                      wallClockDelta, pStream->GetFeedTime());
-        while ((wallClockDelta > (pStream->GetFeedTime())) &&
+        while ((wallClockDelta + 1000 > (pStream->GetFeedTime() - _firstFeedTime)) &&
                         (GETAVAILABLEBYTESCOUNT(_avData) > 8192)) {
                 if (!pTS->SignalInputData(_avData)) {

trunk/sources/thelib/include/protocols/rtp/connectivity/baseconnectivity.h

@@ -28 +28 @@
         BaseConnectivity();
         virtual ~BaseConnectivity();
+
+        static uint32_t ToRTPTS(struct timeval &tv, uint32_t rate);
+        static uint32_t ToRTPTS(double milliseconds, uint32_t rate);
 };
 

trunk/sources/thelib/src/protocols/rtp/connectivity/baseconnectivity.cpp

@@ -21 +21 @@
 #include "protocols/rtp/connectivity/baseconnectivity.h"
 
+//#define LIVE555WAY
+
 BaseConnectivity::BaseConnectivity() {
 
@@ -27 +29 @@
 BaseConnectivity::~BaseConnectivity() {
 }
+
+uint32_t BaseConnectivity::ToRTPTS(struct timeval &tv, uint32_t rate) {
+#ifdef LIVE555WAY
+        u_int32_t timestampIncrement = (rate * tv.tv_sec);
+        timestampIncrement += (u_int32_t) ((2.0 * rate * tv.tv_usec + 1000000.0) / 2000000);
+        return timestampIncrement;
+#else
+        return (uint32_t) ((((double) tv.tv_sec * 1000000.00 + (double) tv.tv_usec) / 1000000.00)*(double) rate);
+#endif
+}
+
+uint32_t BaseConnectivity::ToRTPTS(double milliseconds, uint32_t rate) {
+#ifdef LIVE555WAY
+        struct timeval tv;
+        tv.tv_sec = (milliseconds / 1000.00);
+        tv.tv_usec = (((uint32_t) milliseconds) % 1000)*1000;
+        return ToRTPTS(tv, rate);
+#else
+        return (uint32_t) ((milliseconds / 1000.00)*(double) rate);
+#endif
+}
+
 #endif /* HAS_PROTOCOL_RTP */

trunk/sources/thelib/src/protocols/rtp/connectivity/outboundconnectivity.cpp

@@ -529 +529 @@
 
         //6. RTP
-        uint32_t timestampIncrement = (rate * timeNow.tv_sec);
-        timestampIncrement += (uint32_t) ((2.0 * rate * timeNow.tv_usec + 1000000.0) / 2000000);
-        uint32_t rtpTimestamp = 0 + timestampIncrement;
-        put_htonl(pDest + 16, rtpTimestamp);
+        put_htonl(pDest + 16, ToRTPTS(timeNow, rate));
 
         //7. sender's packet count

trunk/sources/thelib/src/protocols/rtp/streaming/outnetrtpudph264stream.cpp

@@ -228 +228 @@
                 //3. Timestamp
                 put_htonl(((uint8_t *) _videoData.msg_iov[0].iov_base) + 4,
-                                (uint32_t) (absoluteTimestamp * 90.0));
+                                BaseConnectivity::ToRTPTS(absoluteTimestamp, 90000));
 
                 if (chunkSize == totalLength) {
@@ -316 +316 @@
                 //4. Timestamp
                 put_htonl(((uint8_t *) _audioData.msg_iov[0].iov_base) + 4,
-                                (uint32_t) (absoluteTimestamp
-                                * (double) GetCapabilities()->audioCodecInfo.aac.sampleRate / 1000.000));
+                                BaseConnectivity::ToRTPTS(absoluteTimestamp,
+                                GetCapabilities()->audioCodecInfo.aac.sampleRate));
 
                 //6. put the actual buffer