external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

refine the srs js player and publisher, add private object

Browse source
This commit is contained in:
winlin 2013-12-23 11:05:34 +08:00
parent 116129d1c6
commit 46eb1ebd6b
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
trunk/research/players/js/srs.js
View file

@ -427,8 +427,10 @@ function srs_publiser_get_codec(
* @param container the html container id. * @param container the html container id.
* @param width a float value specifies the width of player. * @param width a float value specifies the width of player.
* @param height a float value specifies the height of player. * @param height a float value specifies the height of player.
* @param private_object [optional] an object that used as private object,
* for example, the logic chat object which owner this player.
*/ */
function SrsPlayer(container, width, height) { function SrsPlayer(container, width, height, private_object) {
if (!SrsPlayer.__id) { if (!SrsPlayer.__id) {
SrsPlayer.__id = 100; SrsPlayer.__id = 100;
} }
@ -438,6 +440,7 @@ function SrsPlayer(container, width, height) {
SrsPlayer.__players.push(this); SrsPlayer.__players.push(this);
this.private_object = private_object;
this.container = container; this.container = container;
this.width = width; this.width = width;
this.height = height; this.height = height;
@ -611,8 +614,10 @@ function __srs_on_player_timer(id, time, buffer_length) {
* @param container the html container id. * @param container the html container id.
* @param width a float value specifies the width of publisher. * @param width a float value specifies the width of publisher.
* @param height a float value specifies the height of publisher. * @param height a float value specifies the height of publisher.
* @param private_object [optional] an object that used as private object,
* for example, the logic chat object which owner this publisher.
*/ */
function SrsPublisher(container, width, height) { function SrsPublisher(container, width, height, private_object) {
if (!SrsPublisher.__id) { if (!SrsPublisher.__id) {
SrsPublisher.__id = 100; SrsPublisher.__id = 100;
} }
@ -622,6 +627,7 @@ function SrsPublisher(container, width, height) {
SrsPublisher.__publishers.push(this); SrsPublisher.__publishers.push(this);
this.private_object = private_object;
this.container = container; this.container = container;
this.width = width; this.width = width;
this.height = height; this.height = height;

4
trunk/research/players/srs_chat.html
View file

@ -184,7 +184,9 @@
// if previous exists, ignore, only add new here. // if previous exists, ignore, only add new here.
var previous_chat = get_previous_chat_user(previous_chats, chat.id); var previous_chat = get_previous_chat_user(previous_chats, chat.id);
if (previous_chat) { if (previous_chat) {
// update reference.
chat.player = previous_chat.player; chat.player = previous_chat.player;
chat.player.private_object = chat;
continue; continue;
} }
@ -209,7 +211,7 @@
if (!no_play) { if (!no_play) {
// start the realtime player. // start the realtime player.
var _player = new SrsPlayer("rp_raw_" + chat.id, 600, 300); var _player = new SrsPlayer("rp_raw_" + chat.id, 600, 300, chat);
_player.on_player_ready = function() { _player.on_player_ready = function() {
this.set_bt(0.5); this.set_bt(0.5);
this.set_fs("screen", 100); this.set_fs("screen", 100);