Skip to content

Commit

Permalink
Merge pull request #2053 from jellyfin/2.2.z
Browse files Browse the repository at this point in the history
  • Loading branch information
cewert authored Nov 18, 2024
2 parents b07373b + 25cb9f2 commit b33c586
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 33 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# If you want to get_images, you'll also need convert from ImageMagick
##########################################################################

VERSION := 2.2.3
VERSION := 2.2.4

## usage

Expand Down
9 changes: 0 additions & 9 deletions components/home/HomeRows.bs
Original file line number Diff line number Diff line change
Expand Up @@ -421,15 +421,6 @@ end sub
' createContinueWatchingRow: Creates a row displaying items the user can continue watching
'
sub createContinueWatchingRow()
sectionName = tr("Continue Watching")

if not sectionExists(sectionName)
nextUpRow = m.top.content.CreateChild("HomeRow")
nextUpRow.title = sectionName
nextUpRow.imageWidth = homeRowItemSizes.WIDE_POSTER[0]
nextUpRow.cursorSize = homeRowItemSizes.WIDE_POSTER
end if

' Load the Continue Watching Data
m.LoadContinueWatchingTask.observeField("content", "updateContinueWatchingItems")
m.LoadContinueWatchingTask.control = "RUN"
Expand Down
2 changes: 1 addition & 1 deletion components/video/VideoPlayerView.bs
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,8 @@ sub onVideoContentLoaded()
' If IsForced, make sure to remember the Roku global setting so we
' can set it back when the video is done playing.
m.originalClosedCaptionState = m.top.globalCaptionMode
m.top.globalCaptionMode = "On"
end if
m.top.globalCaptionMode = "On"
m.top.subtitleTrack = m.top.availableSubtitleTracks[availableSubtitleTrackIndex].TrackName
end if
end if
Expand Down
2 changes: 1 addition & 1 deletion manifest
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
title=Jellyfin
major_version=2
minor_version=2
build_version=3
build_version=4

### Main Menu Icons / Channel Poster Artwork

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "jellyfin-roku",
"type": "module",
"version": "2.2.3",
"version": "2.2.4",
"description": "Roku app for Jellyfin media server",
"dependencies": {
"@rokucommunity/bslib": "0.1.1",
Expand Down
21 changes: 3 additions & 18 deletions source/utils/deviceCapabilities.bs
Original file line number Diff line number Diff line change
Expand Up @@ -211,19 +211,6 @@ function getTranscodingProfiles() as object
'
' AVC / h264 / MPEG4 AVC
for each container in transcodingContainers
if di.CanDecodeVideo({ Codec: "h264", Container: container }).Result
if container = "mp4"
' check for codec string before adding it
if mp4VideoCodecs.Instr(0, ",h264") = -1
mp4VideoCodecs = mp4VideoCodecs + ",h264"
end if
else if container = "ts"
' check for codec string before adding it
if tsVideoCodecs.Instr(0, ",h264") = -1
tsVideoCodecs = tsVideoCodecs + ",h264"
end if
end if
end if
if di.CanDecodeVideo({ Codec: "mpeg4 avc", Container: container }).Result
if container = "mp4"
' check for codec string before adding it
Expand Down Expand Up @@ -301,11 +288,9 @@ function getTranscodingProfiles() as object
end if

' AV1
' 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
' direct streaming av1 is not supported on roku
' force a full transcode by omitting av1 from the transcoding profile
' https://community.roku.com/t5/Roku-Developer-Program/HLS-fMP4-No-Audio/td-p/607399

' AUDIO CODECS
for each container in transcodingContainers
Expand Down

0 comments on commit b33c586

Please sign in to comment.