Merge 2.2.1 into master

jellyfin · Oct 21, 2024 · ccbbbae · ccbbbae
2 parents c329a94 + 6259b3d
commit ccbbbae
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 22 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 # If you want to get_images, you'll also need convert from ImageMagick
 ##########################################################################
 
-VERSION := 2.2.0
+VERSION := 2.2.1
 
 ## usage
 

diff --git a/components/home/LoadItemsTask.bs b/components/home/LoadItemsTask.bs
@@ -73,6 +73,7 @@ sub loadItems()
         params["DisableFirstEpisode"] = false
         params["limit"] = 24
         params["EnableTotalRecordCount"] = false
+        params["EnableResumable"] = false
 
         maxDaysInNextUp = userSettings["ui.details.maxdaysnextup"].ToInt()
         if isValid(maxDaysInNextUp)

diff --git a/manifest b/manifest
@@ -3,7 +3,7 @@
 title=Jellyfin
 major_version=2
 minor_version=2
-build_version=0
+build_version=1
 
 ### Main Menu Icons / Channel Poster Artwork
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jellyfin-roku",
   "type": "module",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Roku app for Jellyfin media server",
   "dependencies": {
     "@rokucommunity/bslib": "0.1.1",

diff --git a/source/api/Items.bs b/source/api/Items.bs
@@ -47,8 +47,8 @@ function ItemPostPlaybackInfo(id as string, mediaSourceId = "" as string, audioT
 
             ' force the server to transcode AAC profiles we don't support to MP3 instead of the usual AAC
             ' TODO: Remove this after server adds support for transcoding AAC from one profile to another
-            if LCase(selectedAudioStream.Codec) = "aac"
-                if LCase(selectedAudioStream.Profile) = "main" or LCase(selectedAudioStream.Profile) = "he-aac"
+            if selectedAudioStream.Codec <> invalid and LCase(selectedAudioStream.Codec) = "aac"
+                if selectedAudioStream.Profile <> invalid and LCase(selectedAudioStream.Profile) = "main" or LCase(selectedAudioStream.Profile) = "he-aac"
                     for each rule in deviceProfile.TranscodingProfiles
                         if rule.Container = "ts" or rule.Container = "mp4"
                             if rule.AudioCodec = "aac"

diff --git a/source/utils/deviceCapabilities.bs b/source/utils/deviceCapabilities.bs
@@ -301,21 +301,11 @@ function getTranscodingProfiles() as object
     end if
 
     ' AV1
-    for each container in transcodingContainers
-        if di.CanDecodeVideo({ Codec: "av1", Container: container }).Result
-            if container = "mp4"
-                ' check for codec string before adding it
-                if mp4VideoCodecs.Instr(0, ",av1") = -1
-                    mp4VideoCodecs = mp4VideoCodecs + ",av1"
-                end if
-            else if container = "ts"
-                ' check for codec string before adding it
-                if tsVideoCodecs.Instr(0, ",av1") = -1
-                    tsVideoCodecs = tsVideoCodecs + ",av1"
-                end if
-            end if
-        end if
-    end for
+    ' CanDecodeVideo() returns false for AV1 when the container is provided
+    ' Manually add AV1 to the mp4VideoCodecs list if support is detected
+    if di.CanDecodeVideo({ Codec: "av1" }).Result
+        mp4VideoCodecs = mp4VideoCodecs + ",av1"
+    end if
 
     ' AUDIO CODECS
     for each container in transcodingContainers