Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 2.2.4 into master #2053

Merged
merged 9 commits into from
Nov 18, 2024
Merged

Merge 2.2.4 into master #2053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d1b4cf2
remove unnecessary code. wait until we have data before we create the…
cewert Nov 9, 2024
b420430
Bump build version
jellyfin-bot Nov 10, 2024
6d87f3a
Merge pull request #2040 from jellyfin/bump-bugfix-to-224
cewert Nov 10, 2024
f00038a
stop adding h264 to codec string twice
cewert Nov 12, 2024
a79c259
force a full transcode for AV1 instead of direct streaming
cewert Nov 12, 2024
d3cf38a
Merge pull request #2044 from cewert/fix-av1-no-sound
cewert Nov 13, 2024
ffac3fe
Subtitle should be on when a default one has been selected by the user.
jimdogx Nov 15, 2024
7927d49
Merge pull request #2050 from jellyfin/jf-2049-subtitle-on-but-not-sh…
cewert Nov 16, 2024
25cb9f2
Merge pull request #2035 from cewert/fix-2004
cewert Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,15 +411,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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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
Loading