Changeset 104

Timestamp:

08/24/10 23:20:41 (18 months ago)

Author:

shiretu

Message:

-- fixed rolling file appender

Location:

trunk/sources/applications/applestreamingclient

Files:

• include/clientcontext.h (modified) (3 diffs)
• include/playlist.h (modified) (1 diff)
• src/clientcontext.cpp (modified) (5 diffs)
• src/playlist.cpp (modified) (6 diffs)

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

@@ -59 +59 @@
         uint32_t _tsId;
         uint32_t _parsedChildPlaylistsCount;
-        uint32_t _currentItemIndex;
+        uint32_t _currentSequence;
         uint32_t _optimalBw;
         uint32_t _lastUsedBw;
@@ -71 +71 @@
         double _lastWallClock;
         map<uint32_t, uint32_t> _allowedBitrates;
-        map<uint32_t, uint32_t> _mediaSequences;
 private:
         ClientContext();
@@ -125 +124 @@
         bool ConsumeAVBuffer();
 private:
-        bool ReloadPlaylist(uint32_t bw);
         uint32_t GetOptimalBw();
         bool ParseConnectingString();

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

@@ -54 +54 @@
         Variant & GetCustomData();
         uint32_t GetItemsCount();
-        string GetItemUri(uint32_t index);
-        string GetItemKeyUri(uint32_t index);
-        uint32_t GetItemMediaSequence(uint32_t index);
-        uint32_t GetItemBandwidth(uint32_t index);
-        Variant GetItemVariant(uint32_t index);
-        void ApproximateStartEndTimes(uint32_t index, double start, double end);
-        void GetSeekRange(double &min, double &max);
-        uint32_t GetItemIndex(double seekPoint);
-        uint32_t GetLastMediaSequence();
+        string GetItemUri(uint32_t &sequence);
+        string GetItemKeyUri(uint32_t &sequence);
+        uint32_t GetItemBandwidth(uint32_t &sequence);
+        Variant GetItemVariant(uint32_t &sequence);
+private:
+        uint32_t GetIndex(uint32_t &sequence);
 };
 

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

@@ -44 +44 @@
         _pMasterPlaylist = NULL;
         _parsedChildPlaylistsCount = 0;
-        _currentItemIndex = 0;
+        _currentSequence = 0;
         _optimalBw = 0;
         _lastUsedBw = 0;
@@ -291 +291 @@
 
         //4. Is this the last item in the playlis?
-        FINEST("---------------------------------------------------");
-        if (_currentItemIndex >= pPlaylist->GetItemsCount()) {
-                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("---------------------------------------------------");
+        string uri = pPlaylist->GetItemUri(_currentSequence);
+        if (uri == "") {
+                FINEST("---------------------------------------------------");
+                WARN("End of list. Wait one sec and try again");
+                FINEST("---------------------------------------------------");
+                return EnqueueFetchChildPlaylist(_childPlaylists[optimalBw]->GetPlaylistUri(), optimalBw);
+        }
 
         //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);
+        string keyUri = pPlaylist->GetItemKeyUri(_currentSequence);
         if (keyUri != "")
                 keyUri += "&" + _connectingString.sessionId;
@@ -402 +394 @@
         //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;
 }
 
@@ -547 +521 @@
         string itemUri = parameters["payload"]["itemUri"];
         uint32_t bw = parameters["payload"]["bw"];
-        uint64_t iv = _childPlaylists[bw]->GetItemMediaSequence(_currentItemIndex);
+        uint64_t iv = _currentSequence;
         //FINEST("itemUri: %s; bw: %d; key: %s", STR(itemUri), bw, STR(key));
 
@@ -563 +537 @@
 
 bool ClientContext::SignalTSChunkComplete(uint32_t bw) {
-        _currentItemIndex++;
+        _currentSequence++;
         return StartFeeding();
 }

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

@@ -128 +128 @@
                                 //that means the item is finished. Save it
                                 _items[itemIndex] = item;
-                                _itemMediaSequences[itemIndex] = _lastMediaSequence;
+                                _itemMediaSequences[_lastMediaSequence] = itemIndex;
                                 _itemKeyUris[itemIndex] = _pLastKeyUri;
                                 _itemUris[itemIndex] = pLine;
@@ -189 +189 @@
 }
 
-string Playlist::GetItemUri(uint32_t index) {
+string Playlist::GetItemUri(uint32_t &sequence) {
+        uint32_t index = GetIndex(sequence);
         if (index >= _itemUris.size())
                 return "";
@@ -203 +204 @@
 }
 
-string Playlist::GetItemKeyUri(uint32_t index) {
+string Playlist::GetItemKeyUri(uint32_t &sequence) {
+        uint32_t index = GetIndex(sequence);
         if (index >= _itemKeyUris.size())
                 return "";
@@ -211 +213 @@
 }
 
-uint32_t Playlist::GetItemMediaSequence(uint32_t index) {
-        if (index >= _itemMediaSequences.size())
-                return 0;
-        return _itemMediaSequences[index];
-}
-
-uint32_t Playlist::GetItemBandwidth(uint32_t index) {
+uint32_t Playlist::GetItemBandwidth(uint32_t &sequence) {
+        uint32_t index = GetIndex(sequence);
         if (index >= _itemBandwidths.size())
                 return 0;
@@ -223 +220 @@
 }
 
-Variant Playlist::GetItemVariant(uint32_t index) {
-        if (index >= _items.size())
-                return Variant();
+Variant Playlist::GetItemVariant(uint32_t &sequence) {
+        uint32_t index = GetIndex(sequence);
         Variant result;
         result["encryptionKeyUri"] = GetItemKeyUri(index);
@@ -233 +229 @@
 }
 
-void Playlist::ApproximateStartEndTimes(uint32_t index, double start, double end) {
-        _meanDuration = _meanDuration * (double) _meanDurationCount + end - start;
-        _meanDurationCount++;
-        _meanDuration /= (double) _meanDurationCount;
-}
-
-void Playlist::GetSeekRange(double &min, double &max) {
-        min = 0;
-        max = (double) _items.size() * _meanDuration;
-}
-
-uint32_t Playlist::GetItemIndex(double seekPoint) {
-        if (_meanDuration == 0)
-                return 0;
-        uint32_t index = (uint32_t) (seekPoint / _meanDuration);
-        if (_items.size() <= index)
-                return 0;
-        return index;
-}
-
-uint32_t Playlist::GetLastMediaSequence() {
-        if (_itemMediaSequences.size() == 0)
-                return 0;
-        return _itemMediaSequences[_itemMediaSequences.size() - 1];
-}
+uint32_t Playlist::GetIndex(uint32_t &sequence) {
+        FINEST("---------------------");
+        FINEST("sequence requested: %d", sequence);
+        //1. We have it, we return it
+        if (MAP_HAS1(_itemMediaSequences, sequence)) {
+                FINEST("WE have it");
+                FINEST("---------------------");
+                return _itemMediaSequences[sequence];
+        }
+
+        //2. We don't have it, and is a 0 value, that means it was never initialized
+        if (sequence == 0) {
+                FINEST("sequence is 0");
+                FINEST("_itemMediaSequences.size(): %d", _itemMediaSequences.size());
+                if (_itemMediaSequences.size() != 0) {
+                        //3. We have stuff. Init and return
+                        FINEST("Return the first entry");
+                        sequence = MAP_KEY(_itemMediaSequences.begin());
+                        FINEST("---------------------");
+                        return MAP_VAL(_itemMediaSequences.begin());
+                } else {
+                        //4. We don't have stuff. Don't do nothing and return
+                        FINEST("empty sequences");
+                        FINEST("---------------------");
+                        return 0xffffffff;
+                }
+        }
+
+        //5. Ok, sequence is initialized but we don't have that value.
+        //So, we search the next one, init and return;
+        FINEST("DISC????");
+        if (_itemMediaSequences.size() > 0) {
+                FINEST("So, we have some items");
+                if (MAP_KEY(_itemMediaSequences.end()) >= sequence) {
+                        FINEST("Our sequence is somewhere there...");
+
+                        FOR_MAP(_itemMediaSequences, uint32_t, uint32_t, i) {
+                                FINEST("sequence: %d; MAP_KEY(i): %d", sequence, MAP_KEY(i));
+                                if (MAP_KEY(i) >= sequence) {
+                                        sequence = MAP_KEY(i);
+                                        FINEST("JACKPOT");
+                                        FINEST("---------------------");
+                                        return MAP_VAL(i);
+                                }
+                        }
+                } else {
+                        FINEST("sequence is bigger than the last item");
+                }
+        }
+
+        //6. Nada. This is the bottom
+        FINEST("Nothing left to do....");
+        FINEST("---------------------");
+        return 0xffffffff;
+}