cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-18 19:38:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2135 from nyanmisaka/ac3-is-remuxing-only

Browse Source 
Do not use AC3 for audio transcoding if AAC and MP3 are supported
This commit is contained in:
Bill Thornton 2020-11-30 11:14:00 -05:00 committed by GitHub
commit 76d2b7018c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/apphost.js
View File

@ -7,6 +7,9 @@ import * as webSettings from '../scripts/settings/webSettings';
import globalize from '../scripts/globalize'; import globalize from '../scripts/globalize';
import profileBuilder from '../scripts/browserDeviceProfile'; import profileBuilder from '../scripts/browserDeviceProfile';
const appName = 'Jellyfin Web';
const appVersion = '10.7.0';
function getBaseProfileOptions(item) { function getBaseProfileOptions(item) {
const disableHlsVideoAudioCodecs = []; const disableHlsVideoAudioCodecs = [];
@ -31,7 +34,7 @@ function getDeviceProfile(item, options = {}) {
let profile; let profile;
if (window.NativeShell) { if (window.NativeShell) {
profile = window.NativeShell.AppHost.getDeviceProfile(profileBuilder); profile = window.NativeShell.AppHost.getDeviceProfile(profileBuilder, appVersion);
} else { } else {
const builderOpts = getBaseProfileOptions(item); const builderOpts = getBaseProfileOptions(item);
profile = profileBuilder(builderOpts); profile = profileBuilder(builderOpts);
@ -316,8 +319,6 @@ function askForExit() {
let deviceId; let deviceId;
let deviceName; let deviceName;
const appName = 'Jellyfin Web';
const appVersion = '10.7.0';
export const appHost = { export const appHost = {
getWindowState: function () { getWindowState: function () {

62
src/scripts/browserDeviceProfile.js
View File

@ -345,26 +345,8 @@ import browser from './browser';
const canPlayEac3VideoAudio = supportsEac3(videoTestElement); const canPlayEac3VideoAudio = supportsEac3(videoTestElement);
const canPlayAc3VideoAudioInHls = supportsAc3InHls(videoTestElement); const canPlayAc3VideoAudioInHls = supportsAc3InHls(videoTestElement);
if (canPlayAc3VideoAudio) { // Transcoding codec is the first in hlsVideoAudioCodecs.
videoAudioCodecs.push('ac3'); // Prefer AAC, MP3 to other codecs when audio transcoding.
if (canPlayEac3VideoAudio) {
videoAudioCodecs.push('eac3');
}
// This works in edge desktop, but not mobile
// TODO: Retest this on mobile
// Transcoding codec is the first in hlsVideoAudioCodecs
// Put ac3/eac3 first only when the audio channels > 2 and need transcoding
if (canPlayAc3VideoAudioInHls && physicalAudioChannels > 2) {
hlsInTsVideoAudioCodecs.push('ac3');
hlsInFmp4VideoAudioCodecs.push('ac3');
if (canPlayEac3VideoAudio) {
hlsInTsVideoAudioCodecs.push('eac3');
hlsInFmp4VideoAudioCodecs.push('eac3');
}
}
}
if (canPlayAacVideoAudio) { if (canPlayAacVideoAudio) {
videoAudioCodecs.push('aac'); videoAudioCodecs.push('aac');
hlsInTsVideoAudioCodecs.push('aac'); hlsInTsVideoAudioCodecs.push('aac');
@ -382,25 +364,21 @@ import browser from './browser';
hlsInFmp4VideoAudioCodecs.push('mp3'); hlsInFmp4VideoAudioCodecs.push('mp3');
} }
// For ac3/eac3 directstream // For AC3/EAC3 remuxing.
// Do not use AC3 for audio transcoding unless AAC and MP3 are not supported.
if (canPlayAc3VideoAudio) { if (canPlayAc3VideoAudio) {
if (canPlayAc3VideoAudioInHls) { videoAudioCodecs.push('ac3');
if (hlsInTsVideoAudioCodecs.indexOf('ac3') === -1) { if (canPlayEac3VideoAudio) {
hlsInTsVideoAudioCodecs.push('ac3'); videoAudioCodecs.push('eac3');
} }
if (hlsInFmp4VideoAudioCodecs.indexOf('ac3') === -1) { if (canPlayAc3VideoAudioInHls) {
hlsInFmp4VideoAudioCodecs.push('ac3'); hlsInTsVideoAudioCodecs.push('ac3');
} hlsInFmp4VideoAudioCodecs.push('ac3');
if (canPlayEac3VideoAudio) { if (canPlayEac3VideoAudio) {
if (hlsInTsVideoAudioCodecs.indexOf('eac3') === -1) { hlsInTsVideoAudioCodecs.push('eac3');
hlsInTsVideoAudioCodecs.push('eac3'); hlsInFmp4VideoAudioCodecs.push('eac3');
}
if (hlsInFmp4VideoAudioCodecs.indexOf('eac3') === -1) {
hlsInFmp4VideoAudioCodecs.push('eac3');
}
} }
} }
} }
@ -560,17 +538,27 @@ import browser from './browser';
Type: 'Audio' Type: 'Audio'
}); });
if (audioFormat === 'webma') { // https://www.webmproject.org/about/faq/
if (audioFormat === 'opus' || audioFormat === 'webma') {
profile.DirectPlayProfiles.push({ profile.DirectPlayProfiles.push({
Container: 'webm', Container: 'webm',
AudioCodec: audioFormat,
Type: 'Audio' Type: 'Audio'
}); });
} }
// aac also appears in the m4a and m4b container // aac also appears in the m4a and m4b container
// m4a/alac only works when using safari
if (audioFormat === 'aac' || audioFormat === 'alac') { if (audioFormat === 'aac' || audioFormat === 'alac') {
profile.DirectPlayProfiles.push({ profile.DirectPlayProfiles.push({
Container: 'm4a,m4b', Container: 'm4a',
AudioCodec: audioFormat,
Type: 'Audio'
});
profile.DirectPlayProfiles.push({
Container: 'm4b',
AudioCodec: audioFormat,
Type: 'Audio' Type: 'Audio'
}); });
} }