Changeset 80

Timestamp:

08/17/10 12:54:17 (18 months ago)

Author:

shiretu

Message:

-- work on applestreamingclient

Location:

trunk/sources/applications/applestreamingclient

Files:

• flex/src/applestreamingclient.mxml (modified) (5 diffs)
• include/clientcontext.h (modified) (1 diff)
• include/protocols/rtmp/rtmpappprotocolhandler.h (modified) (1 diff)
• include/protocols/variant/messagestructure.h (modified) (2 diffs)
• src/clientcontext.cpp (modified) (3 diffs)
• src/protocols/rtmp/rtmpappprotocolhandler.cpp (modified) (3 diffs)
• src/protocols/variant/variantappprotocolhandler.cpp (modified) (1 diff)

trunk/sources/applications/applestreamingclient/flex/src/applestreamingclient.mxml

@@ -11 +11 @@
                         
                         import mx.controls.Alert;
+                        import mx.utils.ObjectUtil;
+                        
+                        import org.osmf.net.dynamicstreaming.SufficientBandwidthRule;
                         
                         private var _connectData:Object;
                         [Bindable]
                         private var _connection:Engine;
+                        private var _bwInfoTimer:Timer;
                         
                         private function Init():void{
@@ -27 +31 @@
                                 player.Initialize();
                                 ConnectDisconnect();
+                                pnlInfo.x=player.x;
+                                pnlInfo.y=player.y+player.height-pnlInfo.height;
+                                _bwInfoTimer = new Timer(1000);
+                                _bwInfoTimer.addEventListener(TimerEvent.TIMER,ShowBwInfo);
+                                txtAppleConnectingString.text="http://mlbvod-akc.mlb.com/mlbam/2010/04/08/MLB_GAME_VIDEO_LANPIT_HOME_20100408/master_wired.m3u8|bl8D2EASEF8WUrzZ+y3o0NiQyAk=|playback=HTTP_CLOUD_WIRED&contentId=7320085&appAccountName=mlb&eventId=14-263849-2010-04-08&ipid=11627706&sessionKey=GBncPsxRBV02IC9n80RP1Sdr9ew%3D";
+                        }
+                        
+                        private function ShowBwInfo(event:TimerEvent):void {
+                                _connection.Call("getBWInfo",BWInfoAvaliable);
+                        }
+                        
+                        private function BWInfoAvaliable(info:Object):void{
+                                if(info==null)
+                                        return;
+                                lblAvalivaleBws.text="";
+                                for(var i:int=0;i<info.response.parameters.availableBws.length;i++){
+                                        lblAvalivaleBws.text+=prettyPrint(info.response.parameters.availableBws[i]/8,"/s")+", ";
+                                }
+                                lblDetectedBw.text=prettyPrint(info.response.parameters.detectedBw/8,"/s");
+                                lblSelectedBw.text=prettyPrint(info.response.parameters.selectedBw/8,"/s");;
+                                lblBufferLevel.text=prettyPrint(info.response.parameters.bufferLevel);
+                                lblMaxBufferLevel.text=prettyPrint(info.response.parameters.bufferMaxLevel);
+                                lblBufferLevelPercent.text=info.response.parameters.bufferLevelPercent.toPrecision(3)+"%";
+                                lblBufferLevelSeconds.text=(info.response.parameters.bufferLevel/info.response.parameters.selectedBw*8).toPrecision(3)+" s";
+                        }
+                        
+                        private function prettyPrint(val:Number, suffix:String=""):String{
+                                var result:String="";
+                                var um:String="B"+suffix;
+                                if(val>1024){
+                                        val=val/1024;
+                                        um="KB"+suffix;
+                                }
+                                if(val>1024){
+                                        val=val/1024;
+                                        um="MB"+suffix;
+                                }
+                                result=val.toPrecision(4)+" "+um;
+                                return result;
                         }
                         
@@ -39 +82 @@
                                 } else {
                                         _connection.Disconnect();
+                                        if(_bwInfoTimer!=null)
+                                                _bwInfoTimer.stop();
                                 }
                         }
@@ -53 +98 @@
                                 //                              player.Play(_connection,_connection.TSStreams[dgFlvs.selectedIndex].data);
                                 _connection.Call("setupStream",null,txtAppleConnectingString.text);
+                                _bwInfoTimer.start();
                         }
                 ]]>
         </mx:Script>
-        <mx:VBox paddingLeft="10" paddingTop="10" paddingRight="10" paddingBottom="10" borderStyle="solid" width="100%" height="100%">
+        <mx:VBox id="vBox" paddingLeft="10" paddingTop="10" paddingRight="10" paddingBottom="10" borderStyle="solid" width="100%" height="100%">
                 <mx:HBox width="100%">
                         <mx:Button label="Show logs..." id="btnLogs" click="LogsWindow.Show(this);"/>
@@ -65 +111 @@
                         <mx:TextInput text="" id="txtAppleConnectingString" width="100%"/>
                 </mx:HBox>
-                <ns1:VideoPlayer width="100%" height="100%" id="player"/>
+                <ns1:VideoPlayer width="100%" height="100%" id="player" enabled="{_connection.IsConnected}" />
         </mx:VBox>
+        <mx:Panel id="pnlInfo" width="500" x="10" y="267" title="Bandwidth info">
+                <mx:VBox width="100%" height="100%">
+                        <mx:HBox width="100%" borderStyle="solid">
+                                <mx:Label text="Available bws:" width="50%"/>
+                                <mx:Label id="lblAvalivaleBws" width="50%"/>
+                        </mx:HBox>
+                        <mx:HBox width="100%" borderStyle="solid">
+                                <mx:Label text="Detected bw:" width="50%"/>
+                                <mx:Label id="lblDetectedBw" width="50%"/>
+                        </mx:HBox>
+                        <mx:HBox width="100%" borderStyle="solid">
+                                <mx:Label text="Selected bw:" width="50%"/>
+                                <mx:Label id="lblSelectedBw" width="50%"/>
+                        </mx:HBox>
+                        <mx:HBox width="100%" borderStyle="solid">
+                                <mx:Label text="Buffer level:" width="50%"/>
+                                <mx:Label id="lblBufferLevel" width="50%"/>
+                        </mx:HBox>
+                        <mx:HBox width="100%" borderStyle="solid">
+                                <mx:Label text="Max buffer level:" width="50%"/>
+                                <mx:Label id="lblMaxBufferLevel" width="50%"/>
+                        </mx:HBox>
+                        <mx:HBox width="100%" borderStyle="solid">
+                                <mx:Label text="Buffer level percent:" width="50%"/>
+                                <mx:Label id="lblBufferLevelPercent" width="50%"/>
+                        </mx:HBox>
+                        <mx:HBox width="100%" borderStyle="solid">
+                                <mx:Label text="Buffer level seconds:" width="50%"/>
+                                <mx:Label id="lblBufferLevelSeconds" width="50%"/>
+                        </mx:HBox>
+                </mx:VBox>
+        </mx:Panel>
 </mx:Application>

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

@@ -94 +94 @@
         uint32_t GetMaxBufferLevel();
         double GetBufferLevelPercent();
+        double GetMinTimestamp();
+        double GetMaxTimestamp();
+        uint32_t GetChunksCount();
+        double GetCurrentTimestamp();
+        uint32_t GetCurrentChunkIndex();
 
         //processing

trunk/sources/applications/applestreamingclient/include/protocols/rtmp/rtmpappprotocolhandler.h

@@ -41 +41 @@
         bool ProcessSetupStream(BaseRTMPProtocol *pFrom,
                         Variant &request);
+        bool ProcessGetBWInfo(BaseRTMPProtocol *pFrom,
+                        Variant &request);
 };
 

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

@@ -55 +55 @@
 #define ASC_RES_INFO_BANDWIDTH_MAX_BUFFER_LEVEL                 "bufferMaxLevel"
 #define ASC_RES_INFO_BANDWIDTH_MAX_BUFFER_LEVEL_PERCENT "bufferLevelPercent"
+#define ASC_RES_INFO_PLAYBACK_MIN_TS                                    "minTs"
+#define ASC_RES_INFO_PLAYBACK_MAX_TS                                    "maxTs"
+#define ASC_RES_INFO_PLAYBACK_CHUNKS_COUNT                              "chunksCount"
+#define ASC_RES_INFO_PLAYBACK_CURRENT_CHUNK                             "currentChunk"
+#define ASC_RES_INFO_PLAYBACK_CURRENT_TS                                "currentTs"
 
 #define ASC_RES_STATUS_OK                                                       0
@@ -276 +281 @@
 } while(0)
 
+#define ASC_RES_BUILD_OK_INFO_PLAYBACK(r,minTs, maxTs, chunksCount, currentTs, currentChunk) \
+do { \
+        Variant params; \
+        params[ASC_RES_INFO_PLAYBACK_MIN_TS]=(double)(minTs); \
+        params[ASC_RES_INFO_PLAYBACK_MAX_TS]=(double)(maxTs); \
+        params[ASC_RES_INFO_PLAYBACK_CHUNKS_COUNT]=(uint32_t)(chunksCount); \
+        params[ASC_RES_INFO_PLAYBACK_CURRENT_CHUNK]=(uint32_t)(currentChunk); \
+        params[ASC_RES_INFO_PLAYBACK_CURRENT_TS]=(double)(currentTs); \
+        ASC_RES_BUILD(r,ASC_RES_STATUS_OK,params); \
+} while(0)
+
 #endif  /* _MESSAGESTRUCTURE_H */
 

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

@@ -53 +53 @@
         _lastWallClock = 0;
         _lastStreamClock = 0;
+        _avData.EnsureSize(_maxAVBufferSize * 3);
         INFO("Context created: %d (%p)", _id, this);
 }
@@ -180 +181 @@
 }
 
+double ClientContext::GetMinTimestamp() {
+        return 0;
+}
+
+double ClientContext::GetMaxTimestamp() {
+        return 0;
+}
+
+uint32_t ClientContext::GetChunksCount() {
+        return 0;
+}
+
+double ClientContext::GetCurrentTimestamp() {
+        return 0;
+}
+
+uint32_t ClientContext::GetCurrentChunkIndex() {
+        return 0;
+}
+
 bool ClientContext::StartProcessing() {
         //1. Parse the connecting string and split it into usable pieces
@@ -486 +507 @@
         }
         if (before != _optimalBw) {
-                INFO("BW changed: before: %d; after: %d; speed: %.3f",
-                                before, _optimalBw, meanSpeed);
-                //, STR(Bandwidths().ToString()))
+                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);
+                }
         }
 

trunk/sources/applications/applestreamingclient/src/protocols/rtmp/rtmpappprotocolhandler.cpp

@@ -26 +26 @@
 #include "application/baseclientapplication.h"
 #include "eventsink/rtmpeventsink.h"
+#include "protocols/variant/messagestructure.h"
+#include "protocols/rtmp/messagefactories/genericmessagefactory.h"
 
 RTMPAppProtocolHandler::RTMPAppProtocolHandler(Variant &configuration)
@@ -45 +47 @@
         if (functionName == "setupStream") {
                 return ProcessSetupStream(pFrom, request);
+        } else if (functionName == "getBWInfo") {
+                return ProcessGetBWInfo(pFrom, request);
         } else {
                 WARN("Invalid function name");
@@ -88 +92 @@
         return pContext->StartProcessing();
 }
+
+bool RTMPAppProtocolHandler::ProcessGetBWInfo(BaseRTMPProtocol *pFrom,
+                Variant &request) {
+        uint32_t contextId = pFrom->GetCustomParameters()["contextId"];
+        Variant response;
+        Variant parameters;
+        parameters.PushToArray(Variant());
+        parameters.PushToArray(Variant());
+        if (contextId == 0) {
+                WARN("No context available yet");
+                response = GenericMessageFactory::GetInvokeResult(request, parameters);
+                return SendRTMPMessage(pFrom, response);
+        }
+        ClientContext *pContext = ClientContext::GetContext(contextId,
+                        GetApplication()->GetId(), pFrom->GetType());
+        if (pContext == NULL) {
+                FATAL("Unable to get context");
+                return false;
+        }
+
+
+        ASC_RES_BUILD_OK_INFO_BANDWIDTH(parameters[(uint32_t) 1],
+                        pContext->GetAvailableBandwidths(),
+                        pContext->GetDetectedBandwidth(),
+                        pContext->GetSelectedBandwidth(),
+                        pContext->GetBufferLevel(),
+                        pContext->GetMaxBufferLevel(),
+                        pContext->GetBufferLevelPercent());
+        response = GenericMessageFactory::GetInvokeResult(request, parameters);
+        return SendRTMPMessage(pFrom, response);
+}
+
 #endif /* HAS_PROTOCOL_RTMP */

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

@@ -200 +200 @@
                 BaseVariantProtocol *pProtocol, Variant &request) {
         GET_CONTEXT(pProtocol, request);
-        /*
-         * seek range
-         * current position
-         */
-        //      ASC_RES_BUILD_OK_INFO_PLAYBACK(request,
-        //                      pContext->GetMinTimestamp(),
-        //                      pContext->GetMaxTimestamp(),
-        //                      pContext->GetChunksCount(),
-        //                      pContext->GetCurrentTimestamp(),
-        //                      pContext->GetCurrentChunkIndex());
-        ASC_RES_BUILD_NYI(request);
-}
+        ASC_RES_BUILD_OK_INFO_PLAYBACK(request,
+                        pContext->GetMinTimestamp(),
+                        pContext->GetMaxTimestamp(),
+                        pContext->GetChunksCount(),
+                        pContext->GetCurrentTimestamp(),
+                        pContext->GetCurrentChunkIndex());
+}