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

Timestamp:

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

Author:

shiretu

Message:

-- android related

File:

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

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

@@ -33 +33 @@
 #include "streaming/streamsmanager.h"
 #include "protocols/ts/innettsstream.h"
+#include "applestreamingclientapplication.h"
+#include "protocols/timer/finetimer.h"
 
 uint32_t ClientContext::_idGenerator = 0;
@@ -86 +88 @@
                 _pEventSink = NULL;
         }
+#ifdef HAS_MS_TIMER
+        AppleStreamingClientApplication *pApp = GetApplication();
+        if (pApp != NULL) {
+                FineTimer *pFineTimer = pApp->GetFineTimer();
+                if (pFineTimer != NULL) {
+                        pFineTimer->UnRegisterContextId(_id);
+                }
+        }
+#endif /* HAS_MS_TIMER */
 }
 
@@ -227 +238 @@
 
         //5. Add the recurring job for consuming the A/V data buffer
+#ifdef HAS_MS_TIMER
+        AppleStreamingClientApplication *pApp = GetApplication();
+        if (pApp != NULL) {
+                FineTimer *pFineTimer = pApp->GetFineTimer();
+                if (pFineTimer != NULL) {
+                        pFineTimer->RegisterContextId(_id);
+                } else {
+                        ASSERT("Unable to find fine timer");
+                }
+        } else {
+                ASSERT("Unable to find application");
+        }
+#else
         Variant job;
         job["type"] = "consumeAVBuffer";
         pScheduleTimer->AddJob(job, true);
+#endif /* HAS_MS_TIMER */
 
         //      job["type"] = "testJNICallback";
@@ -339 +364 @@
         }
 
-        //5. Does it have any registered consumers AND sps/pps? Return if not
+        //5. Does it have any registered consumers?
         if (pStream->GetOutStreams().size() <= 0) {
                 WARN("No registered consumers or stream capabilities not yet known. Take a break...");
@@ -349 +374 @@
 
         //6. Feed
-        while ((wallClockDelta + 2000 > pStream->GetFeedTime()) &&
+        //      FINEST("BEFORE: wallClockDelta: %.2f; GetFeedTime: %.2f",
+        //                      wallClockDelta, pStream->GetFeedTime());
+        while ((wallClockDelta > (pStream->GetFeedTime())) &&
                         (GETAVAILABLEBYTESCOUNT(_avData) > 8192)) {
                 if (!pTS->SignalInputData(_avData)) {
@@ -356 +383 @@
                 }
         }
+        //      FINEST(" AFTER: wallClockDelta: %.2f; GetFeedTime: %.2f",
+        //                      wallClockDelta, pStream->GetFeedTime());
 
         //7. Done
@@ -462 +491 @@
 bool ClientContext::SignalChildPlaylistAvailable(uint32_t bw) {
         _parsedChildPlaylistsCount++;
+        return StartFeeding();
+}
+
+bool ClientContext::SignalChildPlaylistNotAvailable(uint32_t bw) {
+        if (!MAP_HAS1(_childPlaylists, bw))
+                return true;
+        Playlist *pPl = _childPlaylists[bw];
+        delete pPl;
+        _childPlaylists.erase(bw);
+        WARN("bw %d removed", bw);
         return StartFeeding();
 }
@@ -614 +653 @@
                 if (_pEventSink->GetType() == EVENT_SYNC_VARIANT) {
                         _avData.IgnoreAll();
+                        InNetTSStream *pStream = (InNetTSStream *) _pStreamsManager->FindByUniqueId(
+                                        _streamId);
+                        if (pStream == NULL) {
+                                FATAL("Unable to get the inbound stream");
+                                return false;
+                        }
+                        StreamCapabilities *pSC = pStream->GetCapabilities();
+                        pSC->Clear();
+                        _pEventSink->SignalStreamUnRegistered(_streamName);
                 }
                 if (_lastUsedBw < bw) {