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

Timestamp:

08/13/10 21:05:31 (22 months ago)

Author:

shiretu

Message:

-- work on apple streaming

File:

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

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

@@ -151 +151 @@
 }
 
+vector<double> ClientContext::GetAvailableBandwidths() {
+        vector<double> result;
+
+        FOR_MAP(_childPlaylists, uint32_t, Playlist *, i) {
+                ADD_VECTOR_END(result, MAP_KEY(i));
+        }
+        return result;
+}
+
+double ClientContext::GetDetectedBandwidth() {
+        return (uint32_t) _pSpeedComputer->GetMeanSpeed()*8.0;
+}
+
+double ClientContext::GetSelectedBandwidth() {
+        return _optimalBw;
+}
+
+uint32_t ClientContext::GetBufferLevel() {
+        return GETAVAILABLEBYTESCOUNT(_avData);
+}
+
+uint32_t ClientContext::GetMaxBufferLevel() {
+        return _maxAVBufferSize;
+}
+
+double ClientContext::GetBufferLevelPercent() {
+        return ((double) GetBufferLevel() / (double) GetMaxBufferLevel())*100.00;
+}
+
 bool ClientContext::StartProcessing() {
         //1. Parse the connecting string and split it into usable pieces
@@ -255 +284 @@
 
         //4. Get the inbound TS stream
+        if (_pStreamsManager == NULL) {
+                WARN("No stream manager yet");
+                return true;
+        }
         InNetTSStream *pStream = (InNetTSStream *) _pStreamsManager->FindByUniqueId(
                         _streamId);
@@ -425 +458 @@
 }
 
-static int aaa = 0;
-
 bool ClientContext::SignalSpeedDetected(double instantAmount, double instantTime) {
         //      FINEST("instantAmount: %.2f; instantTime: %.8f; Speed: %.2f KB/s",
@@ -435 +466 @@
         uint32_t before = _optimalBw;
         meanSpeed *= 8.0;
-        if (((aaa++) % 200) == 0) {
-                double ms = meanSpeed / 1024.00 / 8;
-                string um = "KB/s";
-                if (ms > 1024) {
-                        ms = ms / 1024.00;
-                        um = "MB/s";
-                }
-                //FINEST("Speed: %.2f %s", ms, STR(um));
-        }
+        //      if (((aaa++) % 200) == 0) {
+        //              double ms = meanSpeed / 1024.00 / 8;
+        //              string um = "KB/s";
+        //              if (ms > 1024) {
+        //                      ms = ms / 1024.00;
+        //                      um = "MB/s";
+        //              }
+        //              //FINEST("Speed: %.2f %s", ms, STR(um));
+        //      }
 
         _optimalBw = MAP_KEY(_childPlaylists.begin());