mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge branch 'master' into subtitle-improvements-2
This commit is contained in:
commit
164ab25fb8
15 changed files with 246 additions and 67 deletions
|
@ -16,10 +16,13 @@ function getBaseProfileOptions(item) {
|
|||
if (browser.edge) {
|
||||
disableHlsVideoAudioCodecs.push('mp3');
|
||||
}
|
||||
|
||||
disableHlsVideoAudioCodecs.push('ac3');
|
||||
disableHlsVideoAudioCodecs.push('eac3');
|
||||
disableHlsVideoAudioCodecs.push('opus');
|
||||
if (!browser.edgeChromium) {
|
||||
disableHlsVideoAudioCodecs.push('ac3');
|
||||
disableHlsVideoAudioCodecs.push('eac3');
|
||||
}
|
||||
if (!(browser.chrome || browser.edgeChromium || browser.firefox)) {
|
||||
disableHlsVideoAudioCodecs.push('opus');
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
|
|
|
@ -43,8 +43,8 @@ export function enableHlsJsPlayer(runTimeTicks, mediaType) {
|
|||
}
|
||||
|
||||
if (canPlayNativeHls()) {
|
||||
// Having trouble with chrome's native support and transcoded music
|
||||
if (browser.android && mediaType === 'Audio') {
|
||||
// Android Webview's native HLS has performance and compatiblity issues
|
||||
if (browser.android && (mediaType === 'Audio' || mediaType === 'Video')) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue