Changeset 109 for trunk/sources/applications/applestreamingclient/src/clientcontext.cpp

Timestamp:

08/27/10 04:10:58 (21 months ago)

Author:

shiretu

Message:

-- android stuff

File:

• trunk/sources/applications/applestreamingclient/src/clientcontext.cpp (modified) (3 diffs)

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)) {