merge srs2

@@ -334,6 +334,7 @@
                     <ul class="dropdown-menu">
                         <li><a id="btn_mbt_0_6" href="#">0.6秒(实时)</a></li>
                         <li><a id="btn_mbt_0_9" href="#">0.9秒(实时)</a></li>
+                        <li><a id="btn_mbt_1_2" href="#">1.2秒(实时)</a></li>
                         <li><a id="btn_mbt_1_5" href="#">1.5秒(实时)</a></li>
                         <li><a id="btn_mbt_2_4" href="#">2.4秒(会议)</a></li>
                         <li><a id="btn_mbt_3_0" href="#">3秒(低延迟)</a></li>
@@ -511,8 +512,8 @@
         srs_init_rtmp("#txt_url", "#main_modal");
 
         // consts for buffer and max buffer.
-        var bts = [0.1, 0.2, 0.3, 0.5, 0.8, 1, 2, 3, 4, 5, 6, 8, 10, 15, 20, 30];
-        var mbts = [0.6, 0.9, 1.5, 2.4, 3, 6, 9, 12, 15, 18, 24, 30, 45, 60, 90];
+        var bts =  [0.1, 0.2, 0.3, 0.5, 0.8, 1, 2, 3, 4, 5, 6, 8, 10, 15, 20, 30];
+        var mbts = [0.6, 0.9, 1.2, 1.5, 2.4, 3, 6, 9, 12, 15, 18, 24, 30, 45, 60, 90];
 
         // the play startup time.
         var pst = new Date();