Fix StreamBuilder #7537
Merged
Fix StreamBuilder #7537
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dmitrylyzo
force-pushed
the
fix-streambuilder
branch
2 times, most recently
from
516cb1c
to
2b97fdf
Compare
|
@eyezak Could you also take a look? |
jellyfin-bot
added
the
merge conflict
dmitrylyzo
force-pushed
the
fix-streambuilder
branch
from
2b97fdf
to
ff747fc
Compare
jellyfin-bot
removed
the
merge conflict
`ApplyConditions` is used to determine the applicability of the current codec (`Conditions`). `Conditions` is the actual conditions for the stream. `CodecType.VideoAudio` (not `CodecType.Video`) must be used for the audio tracks in the video.
Don't add codec failure reasons if the codec isn't supported.
dmitrylyzo
force-pushed
the
fix-streambuilder
branch
from
71b685f
to
0ff3741
Compare
cvium
reviewed
Apr 12, 2022
| @@ -750,10 +750,13 @@ private TranscodingProfile GetVideoTranscodeProfile(MediaSourceInfo item, VideoO | |||
| var container = transcodingProfile.Container; | |||
| var appliedVideoConditions = options.Profile.CodecProfiles | |||
| .Where(i => i.Type == CodecType.Video && | |||
| i.ContainsAnyCodec(videoCodec, container)) | |||
| i.ContainsAnyCodec(videoCodec, container) && | |||
There was a problem hiding this comment.
Style-wise, we put the && before the lines, not after
There was a problem hiding this comment.
Then this is what it would look like (since I don't want to touch more lines than enough):
.Where(i => i.Type == CodecType.Video &&
i.ContainsAnyCodec(videoCodec, container)
&& i.ApplyConditions.All(...))And below:
.Where(codecProfile => codecProfile.Type == CodecType.Video && codecProfile.ContainsAnyCodec(videoStream?.Codec, container)
&& !checkVideoConditions(codecProfile.ApplyConditions).Any())
cvium
approved these changes
Apr 12, 2022
crobibero
approved these changes
Apr 12, 2022
jellyfin-bot
pushed a commit
that referenced
this pull request
Apr 17, 2022
(cherry picked from commit 5833c70) Signed-off-by: Joshua Boniface <joshua@boniface.me>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
IMO,
ApplyConditionsandConditionswere mixed up in #7325Changes
ApplyConditionsto determine the applicability of the current codec (Conditions).VideoAudiofor the audio tracks in the video.Issues
Fixes jellyfin/jellyfin-androidtv#1576
VideoLevelNotSupported(for HEVC). Ideally, we shouldn't test codec conditions if the codec isn't supported.Don't add codec failure reasons if the codec isn't supported.