Changeset 102

Timestamp:

08/24/10 19:27:38 (18 months ago)

Author:

shiretu

Message:

-- added bandwidth filter

Location:

trunk/sources

Files:

• androidapplestreaming/include/api.h (modified) (1 diff)
• androidapplestreaming/include/jniwrapper.h (modified) (1 diff)
• androidapplestreaming/src/api.cpp (modified) (1 diff)
• androidapplestreaming/src/jniwrapper.cpp (modified) (1 diff)
• androidapplestreaming/src/main.cpp (modified) (1 diff)
• applications/applestreamingclient/include/clientcontext.h (modified) (2 diffs)
• applications/applestreamingclient/include/protocols/variant/messagestructure.h (modified) (4 diffs)
• applications/applestreamingclient/include/protocols/variant/variantappprotocolhandler.h (modified) (1 diff)
• applications/applestreamingclient/src/clientcontext.cpp (modified) (5 diffs)
• applications/applestreamingclient/src/protocols/variant/variantappprotocolhandler.cpp (modified) (2 diffs)
• thelib/src/protocols/rtp/connectivity/outboundconnectivity.cpp (modified) (1 diff)

trunk/sources/androidapplestreaming/include/api.h

@@ -37 +37 @@
 Variant ContextCloseAll();
 
+Variant CommandSetBitrates(uint32_t contextId, string bitRates);
 Variant CommandPlay(uint32_t contextId, string connectingString);
 Variant CommandPlay(uint32_t contextId, string m3u8Uri, string httpSessionId,

trunk/sources/androidapplestreaming/include/jniwrapper.h

@@ -45 +45 @@
 extern "C" jobject Java_com_rtmpd_CommandsInterface_ContextCloseAll(
                 JNIEnv* pEnv, jobject thiz);
+extern "C" jobject Java_com_rtmpd_CommandsInterface_CommandSetBitrates(
+                JNIEnv* pEnv, jobject thiz, jint contextId, jstring bitrates);
 extern "C" jobject Java_com_rtmpd_CommandsInterface_CommandPlay(
                 JNIEnv* pEnv, jobject thiz, jint contextId, jstring m3u8Uri,

trunk/sources/androidapplestreaming/src/api.cpp

@@ -253 +253 @@
 }
 
+Variant CommandSetBitrates(uint32_t contextId, string bitRates) {
+        replace(bitRates, "[", "");
+        replace(bitRates, "]", "");
+        vector<string> parts;
+        split(bitRates, ",", parts);
+
+        vector<uint32_t> bws;
+        for (uint32_t i = 0; i < parts.size(); i++) {
+                string strBw = parts[i];
+                trim(strBw);
+                if (strBw == "")
+                        continue;
+                uint32_t bw = (uint32_t) atol(STR(strBw));
+                ADD_VECTOR_END(bws, bw);
+        }
+
+        Variant request;
+        ASC_REQ_BUILD_COMMAND_SET_BITRATES(request, contextId, bws);
+        Variant response;
+        SEND_VARIANT_REQUEST(request, response);
+        return response;
+}
+
 Variant CommandPlay(uint32_t contextId, string connectingString) {
         vector<string> parts;

trunk/sources/androidapplestreaming/src/jniwrapper.cpp

@@ -80 +80 @@
 }
 
+extern "C" jobject Java_com_rtmpd_CommandsInterface_CommandSetBitrates(
+                JNIEnv* pEnv, jobject thiz, jint contextId, jstring bitrates) {
+        Variant result = CommandSetBitrates(
+                        (uint32_t) contextId,
+                        pEnv->GetStringUTFChars(bitrates, NULL));
+        return VariantToJObject(result, pEnv);
+}
+
 extern "C" jobject Java_com_rtmpd_CommandsInterface_CommandPlay(
                 JNIEnv* pEnv, jobject thiz, jint contextId, jstring m3u8Uri,

trunk/sources/androidapplestreaming/src/main.cpp

@@ -124 +124 @@
 
         uint32_t contextId = (uint32_t) ASC_RES_PARAM(result, "contextId");
+        result = CommandSetBitrates(contextId, " [800000]");
+        FINEST("result:\n%s", STR(result.ToString()));
+
         result = CommandPlay(contextId, MY_URL, MY_SESSION_ID, MY_KEY);
         FINEST("result:\n%s", STR(result.ToString()));

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

@@ -70 +70 @@
         StreamsManager *_pStreamsManager;
         double _lastWallClock;
+        map<uint32_t, uint32_t> _allowedBitrates;
 private:
         ClientContext();
@@ -101 +102 @@
         uint32_t GetCurrentChunkIndex();
         AppleStreamingClientApplication *GetApplication();
+        void SetAllowedBitrates(map<uint32_t, uint32_t> allowedBitrates);
 
         //processing

trunk/sources/applications/applestreamingclient/include/protocols/variant/messagestructure.h

@@ -29 +29 @@
 
 #define ASC_REQ_TYPE_COMMAND_PLAY                               "commandPlay"
+#define ASC_REQ_TYPE_COMMAND_SET_BITRATES               "commandSetBitrates"
 #define ASC_REQ_TYPE_COMMAND_PAUSE                              "commandPause"
 #define ASC_REQ_TYPE_COMMAND_RESUME                             "commandResume"
@@ -40 +41 @@
 #define ASC_REQ_TYPE_INFO_PLAYBACK                              "infoPlayback"
 
+#define ASC_REQ_COMMAND_SET_BITRATES_BITRATES           "bitrates"
 #define ASC_REQ_COMMAND_PLAY_URI_KEY                            "uri"
 #define ASC_REQ_COMMAND_PLAY_SESSION_ID_KEY                     "sessionId"
@@ -88 +90 @@
 #define ASC_REQ_PARAMS(v)                                       ASC_REQ(v)["parameters"]
 #define ASC_REQ_PARAM(v,key)                            ASC_REQ_PARAMS(v)[(key)]
+#define ASC_REQ_COMMAND_SET_BITRATES_BWS(v)     ASC_REQ_PARAM(v,ASC_REQ_COMMAND_SET_BITRATES_BITRATES)
 #define ASC_REQ_COMMAND_PLAY_URI(v)                     ASC_REQ_PARAM(v,ASC_REQ_COMMAND_PLAY_URI_KEY)
 #define ASC_REQ_COMMAND_PLAY_SESSION_ID(v)      ASC_REQ_PARAM(v,ASC_REQ_COMMAND_PLAY_SESSION_ID_KEY)
@@ -126 +129 @@
         ASC_REQ_BUILD(v,ASC_REQ_TYPE_CONTEXT_CLOSE_ALL,0,Variant())
 
+#define ASC_REQ_BUILD_COMMAND_SET_BITRATES(v,contextId,bws) \
+do { \
+        Variant parameters; \
+        parameters[ASC_REQ_COMMAND_SET_BITRATES_BITRATES].IsArray(true); \
+        for(uint32_t i=0;i<bws.size();i++) { \
+                parameters[ASC_REQ_COMMAND_SET_BITRATES_BITRATES].PushToArray((uint32_t)bws[i]); \
+        } \
+        ASC_REQ_BUILD(v,ASC_REQ_TYPE_COMMAND_SET_BITRATES,contextId,parameters); \
+} while(0)
+
 #define ASC_REQ_BUILD_COMMAND_PLAY(v,contextId,uri,sessionId,keyPassword) \
 do { \

trunk/sources/applications/applestreamingclient/include/protocols/variant/variantappprotocolhandler.h

@@ -39 +39 @@
         void ProcessContextClose(BaseVariantProtocol *pProtocol, Variant &request);
         void ProcessContextCloseAll(BaseVariantProtocol *pProtocol, Variant &request);
+        void ProcessCommandSetBitrates(BaseVariantProtocol *pProtocol, Variant &request);
         void ProcessCommandPlay(BaseVariantProtocol *pProtocol, Variant &request);
         void ProcessCommandPause(BaseVariantProtocol *pProtocol, Variant &request);

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

@@ -219 +219 @@
 }
 
+void ClientContext::SetAllowedBitrates(map<uint32_t, uint32_t> allowedBitrates) {
+        _allowedBitrates = allowedBitrates;
+}
+
 bool ClientContext::StartProcessing() {
         //1. Parse the connecting string and split it into usable pieces
@@ -283 +287 @@
         Playlist *pPlaylist = _childPlaylists[optimalBw];
 
-        if (_currentItemIndex == 0)
-                _currentItemIndex = pPlaylist->GetItemsCount() / 2 + 10;
+        //      if (_currentItemIndex == 0)
+        //              _currentItemIndex = pPlaylist->GetItemsCount() / 2 + 10;
 
         //4. Is this the last item in the playlis?
@@ -391 +395 @@
 
 uint32_t ClientContext::GetOptimalBw() {
-        //      if (_optimalBw == 0) {
-        //              _optimalBw = MAP_KEY(_childPlaylists.begin());
-        //      }
-        _optimalBw = 800000;
+        if (_optimalBw == 0) {
+                _optimalBw = MAP_KEY(_childPlaylists.begin());
+        }
+        //_optimalBw = 800000;
         return _optimalBw;
 }
@@ -467 +471 @@
                 if (bw < 10000)
                         bw *= 1024;
+                if (_allowedBitrates.size() > 0) {
+                        if (!MAP_HAS1(_allowedBitrates, bw)) {
+                                WARN("Skipping bitrate %d", bw);
+                                continue;
+                        }
+                }
                 string uri = _pMasterPlaylist->GetItemUri(i);
 
@@ -530 +540 @@
 
 bool ClientContext::SignalSpeedDetected(double instantAmount, double instantTime) {
-        //      FINEST("instantAmount: %.2f; instantTime: %.8f; Speed: %.2f KB/s",
-        //                      instantAmount, instantTime, instantAmount / instantTime / 1024);
-        _pSpeedComputer->PushAmount(instantAmount, instantTime);
-        double meanSpeed = _pSpeedComputer->GetMeanSpeed();
-
-        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("instantAmount: %.2f; instantTime: %.8f; Speed: %.2f KB/s",
+        //      //                      instantAmount, instantTime, instantAmount / instantTime / 1024);
+        //      _pSpeedComputer->PushAmount(instantAmount, instantTime);
+        //      double meanSpeed = _pSpeedComputer->GetMeanSpeed();
+        //
+        //      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));
+        //      //      }
+        //
+        //      _optimalBw = MAP_KEY(_childPlaylists.begin());
+        //
+        //      FOR_MAP(_childPlaylists, uint32_t, Playlist *, i) {
+        //              uint32_t testBandwidth = MAP_KEY(i);
+        //              //FINEST("meanSpeed: %.2f; testBandwidth: %.2f", meanSpeed, testBandwidth);
+        //              if (meanSpeed > testBandwidth) {
+        //                      _optimalBw = testBandwidth;
         //              }
-        //              //FINEST("Speed: %.2f %s", ms, STR(um));
         //      }
-
-        _optimalBw = MAP_KEY(_childPlaylists.begin());
-
-        FOR_MAP(_childPlaylists, uint32_t, Playlist *, i) {
-                uint32_t testBandwidth = MAP_KEY(i);
-                //FINEST("meanSpeed: %.2f; testBandwidth: %.2f", meanSpeed, testBandwidth);
-                if (meanSpeed > testBandwidth) {
-                        _optimalBw = testBandwidth;
-                }
-        }
-        if (before != _optimalBw) {
-                if (before < _optimalBw) {
-                        if (GETAVAILABLEBYTESCOUNT(_avData) < _maxAVBufferSize / 3) {
-                                _optimalBw = before;
-                        } else {
-                                INFO("BW changed: before: %d; after: %d; speed: %.3f",
-                                                before, _optimalBw, meanSpeed);
-                        }
-                } else {
-                        INFO("BW changed: before: %d; after: %d; speed: %.3f",
-                                        before, _optimalBw, meanSpeed);
-                }
-        }
+        //      if (before != _optimalBw) {
+        //              if (before < _optimalBw) {
+        //                      if (GETAVAILABLEBYTESCOUNT(_avData) < _maxAVBufferSize / 3) {
+        //                              _optimalBw = before;
+        //                      } else {
+        //                              INFO("BW changed: before: %d; after: %d; speed: %.3f",
+        //                                              before, _optimalBw, meanSpeed);
+        //                      }
+        //              } else {
+        //                      INFO("BW changed: before: %d; after: %d; speed: %.3f",
+        //                                      before, _optimalBw, meanSpeed);
+        //              }
+        //      }
 
         return true;

trunk/sources/applications/applestreamingclient/src/protocols/variant/variantappprotocolhandler.cpp

@@ -70 +70 @@
         } else if (type == ASC_REQ_TYPE_COMMAND_PLAY) {
                 ProcessCommandPlay(pProtocol, lastReceived);
+        } else if (type == ASC_REQ_TYPE_COMMAND_SET_BITRATES) {
+                ProcessCommandSetBitrates(pProtocol, lastReceived);
         } else if (type == ASC_REQ_TYPE_COMMAND_PAUSE) {
                 ProcessCommandPause(pProtocol, lastReceived);
@@ -116 +118 @@
                 BaseVariantProtocol *pProtocol, Variant &request) {
         ((AppleStreamingClientApplication *) GetApplication())->CloseAllContexts();
+        ASC_RES_BUILD_OK(request, Variant());
+}
+
+void VariantAppProtocolHandler::ProcessCommandSetBitrates(
+                BaseVariantProtocol *pProtocol, Variant &request) {
+        GET_CONTEXT(pProtocol, request);
+        map<uint32_t, uint32_t> bws;
+
+        FOR_MAP(ASC_REQ_COMMAND_SET_BITRATES_BWS(request), string, Variant, i) {
+                FINEST("(uint32_t)MAP_VAL(i): %d", (uint32_t) MAP_VAL(i));
+                bws[(uint32_t) MAP_VAL(i)] = (uint32_t) MAP_VAL(i);
+        }
+        pContext->SetAllowedBitrates(bws);
         ASC_RES_BUILD_OK(request, Variant());
 }

trunk/sources/thelib/src/protocols/rtp/connectivity/outboundconnectivity.cpp

@@ -423 +423 @@
 
         //6. RTP
-        FINEST("rate: %d", rate);
+        //FINEST("rate: %d", rate);
         double rtpDouble = ((currentTime - _startupTime) / (double) CLOCKS_PER_SEC) * rate;
-        FINEST("rtpDouble: %.2f", rtpDouble);
+        //FINEST("rtpDouble: %.2f", rtpDouble);
         uint32_t rtp = (uint32_t) rtpDouble;
-        FINEST("rtp: %d", rtp);
+        //FINEST("rtp: %d", rtp);
+        //uint32_t packetRtp = ntohlp(pSrc + 4);
+        //FINEST("packetRtp: %d", packetRtp);
+        //FINEST("diff: %.0f", (double) packetRtp - (double) rtp);
         put_htonl(pDest + 16, rtp);
         //memcpy(pDest + 16, pSrc + 4, 4);