mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

allow separate settings for each video codec for each quality level

Browse source
This commit is contained in:
Techywarrior 2013-05-06 20:31:44 -07:00
parent ca5c8313cf
commit 28f0e78eb3
2 changed files with 36 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dashboard-ui/scripts/mediaplayer.js
View file

@ -192,18 +192,21 @@
var mp4VideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.mp4', $.extend({}, baseParams, {
videoCodec: 'h264',
audioCodec: 'aac',
profile: 'high'
profile: 'high',
videoBitrate: 2500000
}));
var tsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.ts', $.extend({}, baseParams, {
videoCodec: 'h264',
audioCodec: 'aac',
profile: 'high'
profile: 'high',
videoBitrate: 2500000
}));
var webmVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.webm', $.extend({}, baseParams, {
videoCodec: 'vpx',
audioCodec: 'Vorbis'
audioCodec: 'Vorbis',
videoBitrate: 2500000
}));
var hlsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.m3u8', $.extend({}, baseParams, {

36
dashboard-ui/scripts/videojsextensions.js
View file

@ -302,10 +302,34 @@ _V_.ResolutionMenuItem = _V_.MenuItem.extend({
return;
var resolutions = new Array();
resolutions['ultra'] = new Array(2500000, 128000, 1920, 1080);
resolutions['high'] = new Array(1500000, 128000, 1920, 1080);
resolutions['medium'] = new Array(750000, 128000, 1280, 720);
resolutions['low'] = new Array(200000, 128000, 720, 480);
resolutions['ultra'] = new Array('webm','mp4','ts','m3u8','ogv');
resolutions['high'] = new Array('webm','mp4','ts','m3u8','ogv');
resolutions['medium'] = new Array('webm','mp4','ts','m3u8','ogv');
resolutions['low'] = new Array('webm','mp4','ts','m3u8','ogv');
resolutions['ultra']['webm'] = new Array(4000000, 128000, 1920, 1080);
resolutions['ultra']['mp4'] = new Array(4000000, 128000, 1920, 1080);
resolutions['ultra']['ts'] = new Array(4000000, 128000, 1920, 1080);
resolutions['ultra']['m3u8'] = new Array(2500000, 128000, 1920, 1080);
resolutions['ultra']['ogv'] = new Array(2500000, 128000, 1920, 1080);
resolutions['high']['webm'] = new Array(2500000, 128000, 1920, 1080);
resolutions['high']['mp4'] = new Array(2500000, 128000, 1920, 1080);
resolutions['high']['ts'] = new Array(2500000, 128000, 1920, 1080);
resolutions['high']['m3u8'] = new Array(1500000, 128000, 1920, 1080);
resolutions['high']['ogv'] = new Array(1500000, 128000, 1920, 1080);
resolutions['medium']['webm'] = new Array(1000000, 128000, 1280, 720);
resolutions['medium']['mp4'] = new Array(1000000, 128000, 1280, 720);
resolutions['medium']['ts'] = new Array(1000000, 128000, 1280, 720);
resolutions['medium']['m3u8'] = new Array(750000, 128000, 1280, 720);
resolutions['medium']['ogv'] = new Array(750000, 128000, 1280, 720);
resolutions['low']['webm'] = new Array(400000, 128000, 720, 480);
resolutions['low']['mp4'] = new Array(400000, 128000, 720, 480);
resolutions['low']['ts'] = new Array(400000, 128000, 720, 480);
resolutions['low']['m3u8'] = new Array(200000, 128000, 720, 480);
resolutions['low']['ogv'] = new Array(200000, 128000, 720, 480);
var currentTime = this.player.currentTime();
@ -315,8 +339,8 @@ _V_.ResolutionMenuItem = _V_.MenuItem.extend({
// Change the source and make sure we don't start the video over
var currentSrc = this.player.tag.src;
var src = parse_src_url(currentSrc);
var newSrc = "/mediabrowser/" + src.Type + "/" + src.item_id + "/stream." + src.stream + "?audioChannels=" + src.audioChannels + "&audioBitrate=" + resolutions[this.options.src[0].res][1] +
"&videoBitrate=" + resolutions[this.options.src[0].res][0] + "&maxWidth=" + resolutions[this.options.src[0].res][2] + "&maxHeight=" + resolutions[this.options.src[0].res][3] +
var newSrc = "/mediabrowser/" + src.Type + "/" + src.item_id + "/stream." + src.stream + "?audioChannels=" + src.audioChannels + "&audioBitrate=" + resolutions[this.options.src[0].res][src.stream][1] +
"&videoBitrate=" + resolutions[this.options.src[0].res][src.stream][0] + "&maxWidth=" + resolutions[this.options.src[0].res][src.stream][2] + "&maxHeight=" + resolutions[this.options.src[0].res][src.stream][3] +
"&videoCodec=" + src.videoCodec + "&audioCodec=" + src.audioCodec;
if (this.player.duration() == "Infinity") {