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

fixes #1161 - Emby offers trancoding while having Transcode disabled

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-02 12:03:59 -04:00
parent d8b5fd5867
commit 1a97ba078c
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -620,8 +620,6 @@
AppSettings.maxStreamingBitrate(bitrate);
$('.videoQualityPopup').popup('close');
self.changeStream(self.getCurrentTicks(), {
Bitrate: bitrate
});

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

@ -605,6 +605,12 @@
self.currentMediaSource = result.MediaSources[0];
var streamInfo = self.createStreamInfo(self.currentItem.MediaType, self.currentItem, self.currentMediaSource, ticks);
if (!streamInfo.url) {
MediaController.showPlaybackInfoErrorMessage('NoCompatibleStream');
self.stop();
return false;
}
self.currentSubtitleStreamIndex = subtitleStreamIndex;
currentSrc = streamInfo.url;
@ -893,7 +899,7 @@
mediaUrl += seekParam;
playMethod = 'DirectStream';
} else {
} else if (mediaSource.SupportsTranscoding) {
mediaUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);
@ -938,7 +944,8 @@
mediaUrl += "&static=true" + seekParam;
playMethod = 'DirectStream';
} else {
} else if (mediaSource.SupportsTranscoding) {
mediaUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);