rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Actions Packages Projects Releases Wiki Activity

Use VideoJS for RTMP (#532)

Browse source
This commit is contained in:
calzoneman 2015-11-08 19:51:17 -08:00
parent f9e1d329e4
commit 5c50e93458
2 changed files with 19 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
player/rtmp.coffee
View file

@ -2,25 +2,19 @@ window.rtmpEventHandler = (id, event, data) ->
if event == 'volumechange' if event == 'volumechange'
PLAYER.volume = if data.muted then 0 else data.volume PLAYER.volume = if data.muted then 0 else data.volume
window.RTMPPlayer = class RTMPPlayer extends EmbedPlayer window.RTMPPlayer = class RTMPPlayer extends VideoJSPlayer
constructor: (data) -> constructor: (data) ->
if not (this instanceof RTMPPlayer) if not (this instanceof RTMPPlayer)
return new RTMPPlayer(data) return new RTMPPlayer(data)
@volume = VOLUME data.meta.direct =
@load(data) # Quality is required for data.meta.direct processing but doesn't
# matter here because it's dictated by the stream. Arbitrarily
# choose 480.
480: [
{
link: data.id
}
]
load: (data) ->
data.meta.embed =
tag: 'object'
src: 'https://fpdownload.adobe.com/strobe/FlashMediaPlayback_101.swf'
params:
flashvars: "src=#{data.id}&\
streamType=live&\
javascriptCallbackFunction=rtmpEventHandler&\
autoPlay=true&\
volume=#{VOLUME}"
super(data) super(data)
getVolume: (cb) ->
cb(@volume)

27
www/js/player.js
View file

@ -1006,28 +1006,19 @@
if (!(this instanceof RTMPPlayer)) { if (!(this instanceof RTMPPlayer)) {
return new RTMPPlayer(data); return new RTMPPlayer(data);
} }
this.volume = VOLUME; data.meta.direct = {
this.load(data); 480: [
} {
link: data.id
RTMPPlayer.prototype.load = function(data) { }
data.meta.embed = { ]
tag: 'object',
src: 'https://fpdownload.adobe.com/strobe/FlashMediaPlayback_101.swf',
params: {
flashvars: "src=" + data.id + "&streamType=live&javascriptCallbackFunction=rtmpEventHandler&autoPlay=true&volume=" + VOLUME
}
}; };
return RTMPPlayer.__super__.load.call(this, data); RTMPPlayer.__super__.constructor.call(this, data);
}; }
RTMPPlayer.prototype.getVolume = function(cb) {
return cb(this.volume);
};
return RTMPPlayer; return RTMPPlayer;
})(EmbedPlayer); })(VideoJSPlayer);
HITBOX_ERROR = 'Hitbox.tv only serves its content over plain HTTP, but you are viewing this page over secure HTTPS. Your browser therefore blocks the hitbox embed due to mixed content policy. In order to view hitbox, you must view this page over plain HTTP (change "https://" to "http://" in the address bar)-- your websocket will still be connected using secure HTTPS. This is something I have asked Hitbox to fix but they have not done so yet.'; HITBOX_ERROR = 'Hitbox.tv only serves its content over plain HTTP, but you are viewing this page over secure HTTPS. Your browser therefore blocks the hitbox embed due to mixed content policy. In order to view hitbox, you must view this page over plain HTTP (change "https://" to "http://" in the address bar)-- your websocket will still be connected using secure HTTPS. This is something I have asked Hitbox to fix but they have not done so yet.';