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

Timestamp:

08/24/10 23:22:35 (21 months ago)

Author:

shiretu

Message:

-- added rolling playlists support

File:

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

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

@@ -291 +291 @@
 
         //4. Is this the last item in the playlis?
+        FINEST("---------------------------------------------------");
         if (_currentItemIndex >= pPlaylist->GetItemsCount()) {
-                FINEST("End of list. Wait one sec and try again");
-                return EnqueueFetchChildPlaylist(_childPlaylists[optimalBw]->GetPlaylistUri(), optimalBw);
-        }
+                if (ReloadPlaylist(optimalBw)) {
+                        WARN("End of list. Wait one sec and try again");
+                        FINEST("---------------------------------------------------");
+                        return EnqueueFetchChildPlaylist(_childPlaylists[optimalBw]->GetPlaylistUri(), optimalBw);
+                } else {
+                        WARN("No playlist reload");
+                        _currentItemIndex--;
+                }
+        }
+        FINEST("_currentItemIndex: %d", _currentItemIndex);
+        FINEST("---------------------------------------------------");
 
         //4. Get the item URI and the key URI if available
         string uri = pPlaylist->GetItemUri(_currentItemIndex);
         string keyUri = pPlaylist->GetItemKeyUri(_currentItemIndex);
+        _mediaSequences[optimalBw] = pPlaylist->GetItemMediaSequence(_currentItemIndex);
         if (keyUri != "")
                 keyUri += "&" + _connectingString.sessionId;
@@ -392 +402 @@
         //7. Done
         return true;
+}
+
+bool ClientContext::ReloadPlaylist(uint32_t bw) {
+        if (!MAP_HAS1(_mediaSequences, bw)) {
+                FINEST("bw %d not in _mediaSequences", bw);
+                return true;
+        }
+        if (!MAP_HAS1(_childPlaylists, bw)) {
+                FINEST("bw %d not in playlists", bw);
+                return true;
+        }
+
+        uint32_t lastSequence = _mediaSequences[bw];
+        FINEST("lastSequence: %d", lastSequence);
+        uint32_t playlistSequnece = _childPlaylists[bw]->GetLastMediaSequence();
+        FINEST("playlistSequnece: %d", playlistSequnece);
+
+        return lastSequence == playlistSequnece;
 }