milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix media streaming from dashboard

Browse source
This commit is contained in:
LukePulverenti 2013-02-27 12:53:42 -05:00
parent 9943bc1374
commit a3de9269e0
1 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Html/scripts/MediaPlayer.js
View file

@ -69,24 +69,23 @@
var item = items[0]; var item = items[0];
var baseParams = { var baseParams = {
id: item.Id,
audioChannels: 2, audioChannels: 2,
audioBitrate: 128000 audioBitrate: 128000
}; };
var mp3Url = ApiClient.getUrl('audio.mp3', $.extend({}, baseParams, { var mp3Url = ApiClient.getUrl('Audio/' + item.Id + '/stream.mp3', $.extend({}, baseParams, {
audioCodec: 'mp3' audioCodec: 'mp3'
})); }));
var aacUrl = ApiClient.getUrl('audio.aac', $.extend({}, baseParams, { var aacUrl = ApiClient.getUrl('Audio/' + item.Id + '/stream.aac', $.extend({}, baseParams, {
audioCodec: 'aac' audioCodec: 'aac'
})); }));
var webmUrl = ApiClient.getUrl('audio.webma', $.extend({}, baseParams, { var webmUrl = ApiClient.getUrl('Audio/' + item.Id + '/stream.webma', $.extend({}, baseParams, {
audioCodec: 'Vorbis' audioCodec: 'Vorbis'
})); }));
var oggUrl = ApiClient.getUrl('audio.oga', $.extend({}, baseParams, { var oggUrl = ApiClient.getUrl('Audio/' + item.Id + '/stream.oga', $.extend({}, baseParams, {
audioCodec: 'Vorbis' audioCodec: 'Vorbis'
})); }));
@ -113,7 +112,6 @@
var screenHeight = Math.min(screen.height, screen.width); var screenHeight = Math.min(screen.height, screen.width);
var baseParams = { var baseParams = {
id: item.Id,
audioChannels: 2, audioChannels: 2,
audioBitrate: 128000, audioBitrate: 128000,
videoBitrate: 500000, videoBitrate: 500000,
@ -121,17 +119,17 @@
maxHeight: screenHeight maxHeight: screenHeight
}; };
var tsVideoUrl = ApiClient.getUrl('video.ts', $.extend({}, baseParams, { var tsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.ts', $.extend({}, baseParams, {
videoCodec: 'h264', videoCodec: 'h264',
audioCodec: 'aac' audioCodec: 'aac'
})); }));
var webmVideoUrl = ApiClient.getUrl('video.webm', $.extend({}, baseParams, { var webmVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.webm', $.extend({}, baseParams, {
videoCodec: 'vpx', videoCodec: 'vpx',
audioCodec: 'Vorbis' audioCodec: 'Vorbis'
})); }));
var ogvVideoUrl = ApiClient.getUrl('video.ogv', $.extend({}, baseParams, { var ogvVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.ogv', $.extend({}, baseParams, {
videoCodec: 'theora', videoCodec: 'theora',
audioCodec: 'Vorbis' audioCodec: 'Vorbis'
})); }));