Merge pull request #748 from 3flex/drop-enableHls

jellyfin · Jan 25, 2025 · 67ae98a · 67ae98a
2 parents 4f1a0dc + 3d2b52e
commit 67ae98a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 24 deletions.
diff --git a/src/components/deviceprofileBuilder.ts b/src/components/deviceprofileBuilder.ts
@@ -34,11 +34,9 @@ import {
 } from './codecSupportHelper';
 
 interface ProfileOptions {
-    enableHls: boolean;
     bitrateSetting: number;
 }
 
-let profileOptions: ProfileOptions;
 let currentDeviceId: DeviceIds;
 
 /**
@@ -291,18 +289,16 @@ function getTranscodingProfiles(): TranscodingProfile[] {
     const hlsAudioCodecs = getSupportedHLSAudioCodecs();
     const audioChannels: number = getMaxAudioChannels();
 
-    if (profileOptions.enableHls) {
-        TranscodingProfiles.push({
-            AudioCodec: hlsAudioCodecs.join(','),
-            BreakOnNonKeyFrames: false,
-            Container: 'ts',
-            Context: EncodingContext.Streaming,
-            MaxAudioChannels: audioChannels.toString(),
-            MinSegments: 1,
-            Protocol: 'hls',
-            Type: DlnaProfileType.Audio
-        });
-    }
+    TranscodingProfiles.push({
+        AudioCodec: hlsAudioCodecs.join(','),
+        BreakOnNonKeyFrames: false,
+        Container: 'ts',
+        Context: EncodingContext.Streaming,
+        MaxAudioChannels: audioChannels.toString(),
+        MinSegments: 1,
+        Protocol: 'hls',
+        Type: DlnaProfileType.Audio
+    });
 
     const supportedAudio = getSupportedAudioCodecs();
 
@@ -325,11 +321,7 @@ function getTranscodingProfiles(): TranscodingProfile[] {
 
     const hlsVideoCodecs = getSupportedHLSVideoCodecs();
 
-    if (
-        hlsVideoCodecs.length &&
-        hlsAudioCodecs.length &&
-        profileOptions.enableHls
-    ) {
+    if (hlsVideoCodecs.length && hlsAudioCodecs.length) {
         TranscodingProfiles.push({
             AudioCodec: hlsAudioCodecs.join(','),
             BreakOnNonKeyFrames: false,
@@ -388,7 +380,6 @@ function getSubtitleProfiles(): SubtitleProfile[] {
  * @returns Device profile.
  */
 export function getDeviceProfile(options: ProfileOptions): DeviceProfile {
-    profileOptions = options;
     currentDeviceId = getActiveDeviceId();
 
     // MaxStaticBitrate seems to be for offline sync only

diff --git a/src/components/maincontroller.ts b/src/components/maincontroller.ts
@@ -265,8 +265,7 @@ export async function reportDeviceCapabilities(): Promise<void> {
     const maxBitrate = await getMaxBitrate();
 
     const deviceProfile = getDeviceProfile({
-        bitrateSetting: maxBitrate,
-        enableHls: true
+        bitrateSetting: maxBitrate
     });
 
     hasReportedCapabilities = true;

diff --git a/src/components/playbackManager.ts b/src/components/playbackManager.ts
@@ -207,8 +207,7 @@ export abstract class PlaybackManager {
 
         const maxBitrate = await getMaxBitrate();
         const deviceProfile = getDeviceProfile({
-            bitrateSetting: maxBitrate,
-            enableHls: true
+            bitrateSetting: maxBitrate
         });
         let playbackInfo: PlaybackInfoResponse = {};