From 42ec5f19fc868adcc70877ae77c2c707d5bd69b1 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 20 Dec 2013 18:46:56 +0800
Subject: [PATCH] update the srs player, set the DAR.

---
 trunk/research/players/jwplayer6.html         |  29 ++---
 trunk/research/players/osmf.html              |  78 +++++------
 trunk/research/players/srs_player.html        | 122 +++++++++++++++---
 .../players/srs_player/release/srs_player.swf | Bin 2697 -> 3452 bytes
 .../players/srs_player/src/srs_player.as      | 114 ++++++++++++++--
 5 files changed, 258 insertions(+), 85 deletions(-)

diff --git a/trunk/research/players/jwplayer6.html b/trunk/research/players/jwplayer6.html
index 6eb420f73..bf4609ca7 100755
--- a/trunk/research/players/jwplayer6.html
+++ b/trunk/research/players/jwplayer6.html
@@ -15,8 +15,14 @@
     <script type="text/javascript" src="js/jwplayer.js" ></script>
     <script type='text/javascript'>jwplayer.key = 'N8zhkmYvvRwOhz4aTGkySoEri4x+9pQwR7GHIQ=='; </script>
     <script type="text/javascript">
-        function jwplayer_play(url) {
-            var _player = null;
+        var _player = null;
+        var _url = null;
+        $(function(){
+            // get the vhost and port to set the default url.
+            // for example: http://192.168.1.213/players/jwplayer6.html?port=1935&vhost=demo
+            // url set to: rtmp://demo:1935/live/livestream
+            srs_init("#txt_rtmp_url", "#txt_hls_url");
+            
             $("#main_modal").on("hide", function(){
                 $("#div_container").remove();
                 _player.stop();
@@ -35,7 +41,7 @@
                 $("#player").append(obj);
                 
                 var conf = {
-                    file: url,
+                    file: _url,
                     width: "530",
                     height: "300",
                     autostart: true,
@@ -44,23 +50,14 @@
                 _player = jwplayer('player_id').setup(conf);
             });
             
-            $("#main_modal").modal({show:true, keyboard:false});
-        }
-        
-        $(function(){
-            // get the vhost and port to set the default url.
-            // for example: http://192.168.1.213/players/jwplayer6.html?port=1935&vhost=demo
-            // url set to: rtmp://demo:1935/live/livestream
-            srs_init("#txt_rtmp_url", "#txt_hls_url");
-            
             $("#btn_play_rtmp").click(function(){
-                var url = $("#txt_rtmp_url").val();
-                jwplayer_play(url);
+                _url = $("#txt_rtmp_url").val();
+                $("#main_modal").modal({show:true, keyboard:false});
             });
             
             $("#btn_play_hls").click(function(){
-                var url = $("#txt_hls_url").val();
-                jwplayer_play(url);
+                _url = $("#txt_hls_url").val();
+                $("#main_modal").modal({show:true, keyboard:false});
             });
         });
     </script>
diff --git a/trunk/research/players/osmf.html b/trunk/research/players/osmf.html
index 77e59cb22..f69bcf393 100755
--- a/trunk/research/players/osmf.html
+++ b/trunk/research/players/osmf.html
@@ -14,50 +14,54 @@
         }
     </style>
     <script type="text/javascript">
+        function osmf_play(url) {
+            $("#div_container").remove();
+            
+            var obj = $("<div/>");
+            $(obj).attr("id", "div_container");
+            
+            var player = $("<div/>");
+            $(obj).append(player);
+            $(obj).attr("id", "player_id");
+            
+            $("#player").append(obj);
+            
+            var flashvars = {};
+            flashvars.src = url;
+            flashvars.streamType = "live"; // live or recorded
+            flashvars.autoPlay = true;
+            flashvars.controlBarAutoHide = false;
+            flashvars.scaleMode = "stretch";
+            flashvars.bufferTime = 0.8;
+            
+            var params = {};
+            params.allowFullScreen = true;
+            
+            var attributes = {};
+            
+            swfobject.embedSWF(
+                "js/StrobeMediaPlayback.swf", "player_id",
+                530, 300,
+                "11.1", "js/AdobeFlashPlayerInstall.swf",
+                flashvars, params, attributes
+            );
+        }
         $(function(){
             // get the vhost and port to set the default url.
             // for example: http://192.168.1.213/players/jwplayer6.html?port=1935&vhost=demo
             // url set to: rtmp://demo:1935/live/livestream
             srs_init($("#txt_url"));
             
+            $("#main_modal").on("hide", function(){
+                osmf_play("http://localhost");
+                $("#div_container").remove();
+            });
+            $("#main_modal").on("show", function(){
+                var url = $("#txt_url").val();
+                osmf_play(url);
+            });
+            
             $("#btn_play").click(function(){
-                $("#main_modal").on("hide", function(){
-                    $("#div_container").remove();
-                });
-                $("#main_modal").on("show", function(){
-                    $("#div_container").remove();
-                    
-                    var obj = $("<div/>");
-                    $(obj).attr("id", "div_container");
-                    
-                    var player = $("<div/>");
-                    $(obj).append(player);
-                    $(obj).attr("id", "player_id");
-                    
-                    $("#player").append(obj);
-                    
-                    var url = $("#txt_url").val();
-                    
-                    var flashvars = {};
-                    flashvars.src = url;
-                    flashvars.streamType = "live"; // live or recorded
-                    flashvars.autoPlay = true;
-                    flashvars.controlBarAutoHide = false;
-                    flashvars.scaleMode = "stretch";
-                    flashvars.bufferTime = 0.8;
-                    
-                    var params = {};
-                    params.allowFullScreen = true;
-                    
-                    var attributes = {};
-                    
-                    swfobject.embedSWF(
-                        "js/StrobeMediaPlayback.swf", "player_id",
-                        530, 300,
-                        "11.1", "js/AdobeFlashPlayerInstall.swf",
-                        flashvars, params, attributes
-                    );
-                });
                 $("#main_modal").modal({show:true, keyboard:false});
             });
         });
diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html
index 321535d25..56edf6e5a 100755
--- a/trunk/research/players/srs_player.html
+++ b/trunk/research/players/srs_player.html
@@ -14,26 +14,14 @@
         }
     </style>
     <script type="text/javascript">
-        var srs_player = null;
-        
         $(function(){
             // get the vhost and port to set the default url.
             // for example: http://192.168.1.213/players/jwplayer6.html?port=1935&vhost=demo
             // url set to: rtmp://demo:1935/live/livestream
             srs_init($("#txt_url"));
             
-            $("#btn_play").click(on_btn_play);
-            $("#btn_pause").click(function(){
-                if ($("#btn_pause").text() == "暂停") {
-                    $("#btn_pause").text("继续");
-                    srs_player.pause();
-                } else {
-                    $("#btn_pause").text("暂停");
-                    srs_player.resume();
-                }
-            });
-        });
-        function on_btn_play(){
+            var srs_player = null;
+        
             $("#main_modal").on("show", function(){
                 $("#div_container").remove();
                 
@@ -50,9 +38,12 @@
                 
                 srs_player = new SrsPlayer("player_id", url, 530, 300, 0.8);
                 srs_player.on_player_ready = function() {
-                    // hack the callback function, do something then play.
                     return srs_player.play();
                 }
+                srs_player.on_player_metadata = function(metadata) {
+                    $("#btn_dar_original").text("视频原始比例" + "(" + metadata.width + ":" + metadata.height + ")");
+                    return 0;
+                }
                 srs_player.start();
             });
             
@@ -60,10 +51,37 @@
                 srs_player.stop();
             });
             
-            $("#main_modal").modal({show:true, keyboard:false});
-        }
+            $("#btn_play").click(function(){
+                $("#main_modal").modal({show:true, keyboard:false});
+            });
+            
+            $("#btn_pause").click(function(){
+                if ($("#btn_pause").text() == "暂停") {
+                    $("#btn_pause").text("继续");
+                    srs_player.pause();
+                } else {
+                    $("#btn_pause").text("暂停");
+                    srs_player.resume();
+                }
+            });
+            
+            $("#btn_dar_original").click(function(){
+                srs_player.dar(0, 0);
+            });
+            $("#btn_dar_21_9").click(function(){
+                srs_player.dar(9, 21);
+            });
+            $("#btn_dar_16_9").click(function(){
+                srs_player.dar(9, 16);
+            });
+            $("#btn_dar_4_3").click(function(){
+                srs_player.dar(3, 4);
+            });
+        });
         
-        // the SrsPlayer object.
+        /*
+        * the SrsPlayer object.
+        */
         function SrsPlayer(container, stream_url, width, height, buffer_time) {
             if (!SrsPlayer.__id) {
                 SrsPlayer.__id = 100;
@@ -81,18 +99,27 @@
             this.buffer_time = buffer_time;
             this.id = SrsPlayer.__id++;
             this.callbackObj = null;
+            
+            // callback set the following values.
+            this.meatadata = {}; // for on_player_metadata
         }
-        // user can set some callback, then start the player.
-        // callbacks:
-        //      on_player_ready():int, when srs player ready, user can play.
+        /*
+        * user can set some callback, then start the player.
+        * callbacks:
+        *      on_player_ready():int, when srs player ready, user can play.
+        *      on_player_metadata(metadata:Object):int, when srs player get metadata.
+        */
         SrsPlayer.prototype.start = function() {
             // embed the flash.
             var flashvars = {};
             flashvars.id = this.id;
             flashvars.on_player_ready = "__srs_on_player_ready";
+            flashvars.on_player_metadata = "__srs_on_player_metadata";
             
             var params = {};
+            params.wmode = "opaque";
             params.allowFullScreen = true;
+            params.allowScriptAccess = "always";
             
             var attributes = {};
             
@@ -114,6 +141,16 @@
             return this.callbackObj.ref.__play(this.stream_url, this.width, this.height, this.buffer_time);
         }
         SrsPlayer.prototype.stop = function() {
+            for (var i = 0; i < SrsPlayer.__players.length; i++) {
+                var player = SrsPlayer.__players[i];
+                
+                if (player.id != this.id) {
+                    continue;
+                }
+                
+                SrsPlayer.__players.splice(i, 1);
+                break;
+            }
             return this.callbackObj.ref.__stop();
         }
         SrsPlayer.prototype.pause = function() {
@@ -122,9 +159,26 @@
         SrsPlayer.prototype.resume = function() {
             return this.callbackObj.ref.__resume();
         }
+        /*
+        * to set the DAR, for example, DAR=16:9
+        * @param num, for example, 9. use metadata height if 0.
+        * @param den, for example, 16. use metadata width if 0.
+        */
+        SrsPlayer.prototype.dar = function(num, den) {
+            if (num == 0 && this.metadata) {
+                num = this.metadata.height;
+            }
+            if (den == 0 && this.metadata) {
+                den = this.metadata.width;
+            }
+            return this.callbackObj.ref.__dar(num, den);
+        }
         SrsPlayer.prototype.on_player_ready = function() {
             return this.play();
         }
+        SrsPlayer.prototype.on_player_metadata = function(metadata) {
+            return 0;
+        }
         function __srs_on_player_ready(id) {
             for (var i = 0; i < SrsPlayer.__players.length; i++) {
                 var player = SrsPlayer.__players[i];
@@ -136,6 +190,23 @@
                 return player.on_player_ready();
             }
             
+            throw new Error("player not found. id=" + id);
+        }
+        function __srs_on_player_metadata(id, metadata) {
+            for (var i = 0; i < SrsPlayer.__players.length; i++) {
+                var player = SrsPlayer.__players[i];
+                
+                if (player.id != id) {
+                    continue;
+                }
+                
+                // user may override the on_player_metadata, 
+                // so set the data before invoke it.
+                player.metadata = metadata;
+                
+                return player.on_player_metadata(metadata);
+            }
+            
             throw new Error("player not found. id=" + id);
         }
     </script>
@@ -176,6 +247,15 @@
         <div class="modal-body" id="player">
         </div>
         <div class="modal-footer">
+            <div class="btn-group dropup">
+                <button class="btn dropdown-toggle" data-toggle="dropdown">宽高比 <span class="caret"></span></button>
+                <ul class="dropdown-menu">
+                    <li><a id="btn_dar_original" href="#">视频原始比例</a></li>
+                    <li><a id="btn_dar_21_9" href="#">宽屏影院(21:9)</a></li>
+                    <li><a id="btn_dar_16_9" href="#">宽屏电影(16:9)</a></li>
+                    <li><a id="btn_dar_4_3" href="#">窄屏(4:3)</a></li>
+                </ul>
+            </div>
             <button id="btn_pause" class="btn">暂停</button>
             <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">关闭</button>
         </div>
diff --git a/trunk/research/players/srs_player/release/srs_player.swf b/trunk/research/players/srs_player/release/srs_player.swf
index d79fafd00e2665a127d80b7060ca489f52e39722..c3de2e90e3bb5eee7e3a0bd7c033ee39162a85eb 100755
GIT binary patch
literal 3452
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

literal 2697
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
D=D8>H

diff --git a/trunk/research/players/srs_player/src/srs_player.as b/trunk/research/players/srs_player/src/srs_player.as
index a6ade0085..446be1987 100755
--- a/trunk/research/players/srs_player/src/srs_player.as
+++ b/trunk/research/players/srs_player/src/srs_player.as
@@ -15,14 +15,23 @@ package
     
     public class srs_player extends Sprite
     {
+        // user set id.
         private var id:String = null;
+        // user set callback
         private var on_player_ready:String = null;
+        private var on_player_metadata:String = null;
         
+        // play param url.
         private var url:String = null;
+        // play param, user set width
+        private var w:int = 0;
+        // play param, user set height.
+        private var h:int = 0;
         
         private var conn:NetConnection = null;
         private var stream:NetStream = null;
         private var video:Video = null;
+        private var metadata:Object = {};
         
         public function srs_player()
         {
@@ -51,6 +60,7 @@ package
             
             this.id = flashvars.id;
             this.on_player_ready = flashvars.on_player_ready;
+            this.on_player_metadata = flashvars.on_player_metadata;
             
             flash.utils.setTimeout(this.onJsReady, 0);
         }
@@ -66,6 +76,7 @@ package
             flash.external.ExternalInterface.addCallback("__stop", this.js_call_stop);
             flash.external.ExternalInterface.addCallback("__pause", this.js_call_pause);
             flash.external.ExternalInterface.addCallback("__resume", this.js_call_resume);
+            flash.external.ExternalInterface.addCallback("__dar", this.js_call_dar);
             
             var code:int = flash.external.ExternalInterface.call(this.on_player_ready, this.id);
             if (code != 0) {
@@ -87,6 +98,37 @@ package
             return 0;
         }
         
+        /**
+        * to set the DAR, for example, DAR=16:9
+        * @param num, for example, 9.
+        * @param den, for example, 16.
+        */
+        public function js_call_dar(num:int, den:int):int {
+            if (this.video && num > 0 && den > 0 && this.video.width > 0) {
+                // set DAR.
+                if (num < den) {
+                    // calc the height by DAR
+                    var _height:int = this.video.width * num / den;
+                    
+                    // height overflow, calc the width by DAR
+                    if (_height > this.h) {
+                        var _width:int = this.video.height * den / num;
+                        
+                        this.video.width = _width;
+                        this.video.height = this.h;
+                    } else {
+                        this.video.width = this.w;
+                        this.video.height = _height;
+                    }
+                }
+                
+                // align center.
+                this.video.y = (this.h - this.video.height) / 2;
+                this.video.x = (this.w - this.video.width) / 2;
+            }
+            return 0;
+        }
+        
         public function js_call_stop():int {
             if (this.stream) {
                 this.stream.close();
@@ -106,7 +148,14 @@ package
         
         public function js_call_play(url:String, _width:int, _height:int, _buffer_time:Number):int {
             this.url = url;
-            trace("start to play url: " + this.url);
+            this.w = _width;
+            this.h = _height;
+            trace("start to play url: " + this.url + ", w=" + this.w + ", h=" + this.h);
+            
+            // draw black bg.
+            this.graphics.beginFill(0x00, 1.0);
+            this.graphics.drawRect(0, 0, this.w, this.h);
+            this.graphics.endFill();
             
             js_call_stop();
             
@@ -122,18 +171,13 @@ package
                 stream = new NetStream(conn);
                 stream.bufferTime = _buffer_time;
                 stream.client = {};
-                stream.client.onMetaData = function(metadata:Object):void {
-                    var customItems:Array = [new ContextMenuItem("SrsPlayer")];
-                    if (metadata.hasOwnProperty("server")) {
-                        customItems.push(new ContextMenuItem("Server: " + metadata.server));
-                    }
-                    if (metadata.hasOwnProperty("contributor")) {
-                        customItems.push(new ContextMenuItem("Contributor: " + metadata.contributor));
-                    }
-                    contextMenu.customItems = customItems;
-                };
+                stream.client.onMetaData = on_metadata;
                 stream.addEventListener(NetStatusEvent.NET_STATUS, function(evt:NetStatusEvent):void {
                     trace ("NetStream: code=" + evt.info.code);
+                    
+                    if (evt.info.code == "NetStream.Video.DimensionChange") {
+                        on_metadata(metadata);
+                    }
                 });
                 stream.play(url.substr(url.lastIndexOf("/")));
                 
@@ -148,5 +192,53 @@ package
             
             return 0;
         }
+        
+        private function on_metadata(metadata:Object):void {
+            this.metadata = metadata;
+            
+            // for context menu
+            var customItems:Array = [new ContextMenuItem("SrsPlayer")];
+            if (metadata.hasOwnProperty("server")) {
+                customItems.push(new ContextMenuItem("Server: " + metadata.server));
+            }
+            if (metadata.hasOwnProperty("contributor")) {
+                customItems.push(new ContextMenuItem("Contributor: " + metadata.contributor));
+            }
+            contextMenu.customItems = customItems;
+            
+            // for js.
+            var obj:Object = {
+                width: video.width,
+                    height: video.height,
+                    server: 'srs',
+                    contributor: 'winlin'
+            };
+            
+            if (metadata.hasOwnProperty("width")) {
+                obj.width = metadata.width;
+            }
+            if (metadata.hasOwnProperty("height")) {
+                obj.height = metadata.height;
+            }
+            
+            if (video.videoWidth > 0) {
+                obj.width = video.videoWidth;
+            }
+            if (video.videoHeight > 0) {
+                obj.height = video.videoHeight;
+            }
+            
+            if (metadata.hasOwnProperty("server")) {
+                obj.server = metadata.server;
+            }
+            if (metadata.hasOwnProperty("contributor")) {
+                obj.contributor = metadata.contributor;
+            }
+            
+            var code:int = flash.external.ExternalInterface.call(on_player_metadata, id, obj);
+            if (code != 0) {
+                throw new Error("callback on_player_metadata failed. code=" + code);
+            }
+        }
     }
 }
\ No newline at end of file