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

Jump to bottom

Query media streams by type instead of filtering #6862

Merged
merged 5 commits into from
Nov 20, 2021
Merged

Query media streams by type instead of filtering #6862

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7cf5767
Query media streams by type instead of filtering
1337joe Nov 17, 2021
97124f5
Add missed override
1337joe Nov 18, 2021
bff5ff0
Merge similar tests with Theories
1337joe Nov 15, 2021
9ba7bf9
Query MediaSourceManager directly in image providers
1337joe Nov 18, 2021
88baff5
Apply suggestions from code review
1337joe Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 0 additions & 9 deletions MediaBrowser.Controller/Entities/Audio/Audio.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,6 @@ public override UnratedItem GetBlockUnratedType()
return base.GetBlockUnratedType();
}

public List<MediaStream> GetMediaStreams(MediaStreamType type)
{
return MediaSourceManager.GetMediaStreams(new MediaStreamQuery
{
ItemId = Id,
Type = type
});
}

public SongInfo GetLookupInfo()
{
var info = GetItemLookupInfo<SongInfo>();
Expand Down
8 changes: 7 additions & 1 deletion MediaBrowser.Controller/Entities/BaseItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,10 +1107,16 @@ public PlayAccess GetPlayAccess(User user)
}

public virtual List<MediaStream> GetMediaStreams()
1337joe marked this conversation as resolved.
Show resolved Hide resolved
{
return GetMediaStreams(null);
}

public virtual List<MediaStream> GetMediaStreams(MediaStreamType? type)
{
return MediaSourceManager.GetMediaStreams(new MediaStreamQuery
{
ItemId = Id
ItemId = Id,
Type = type
});
}

Expand Down
5 changes: 1 addition & 4 deletions MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,7 @@ public Task<DynamicImageResponse> GetImage(BaseItem item, ImageType type, Cancel
{
var audio = (Audio)item;

var imageStreams =
audio.GetMediaStreams(MediaStreamType.EmbeddedImage)
.Where(i => i.Type == MediaStreamType.EmbeddedImage)
.ToList();
var imageStreams = audio.GetMediaStreams(MediaStreamType.EmbeddedImage);

// Can't extract if we didn't find a video stream in the file
if (imageStreams.Count == 0)
Expand Down
2 changes: 1 addition & 1 deletion MediaBrowser.Providers/MediaInfo/EmbeddedImageProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private async Task<DynamicImageResponse> GetEmbeddedImage(Video item, ImageType
}

// Fall back to EmbeddedImage streams
var imageStreams = item.GetMediaStreams().FindAll(i => i.Type == MediaStreamType.EmbeddedImage);
var imageStreams = item.GetMediaStreams(MediaStreamType.EmbeddedImage);

if (imageStreams.Count == 0)
{
Expand Down
2 changes: 1 addition & 1 deletion MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private async Task<DynamicImageResponse> GetVideoImage(Video item, CancellationT
? TimeSpan.FromTicks(item.RunTimeTicks.Value / 10)
: TimeSpan.FromSeconds(10);

var videoStream = item.GetDefaultVideoStream() ?? item.GetMediaStreams().FirstOrDefault(i => i.Type == MediaStreamType.Video);
var videoStream = item.GetDefaultVideoStream() ?? item.GetMediaStreams(MediaStreamType.Video).FirstOrDefault();

if (videoStream == null)
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Jellyfin.Providers.Tests/MediaInfo/EmbeddedImageProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ private static Movie GetMovie(List<MediaAttachment> mediaAttachments, List<Media

movie.Setup(item => item.GetMediaSources(It.IsAny<bool>()))
.Returns(new List<MediaSourceInfo> { new () { MediaAttachments = mediaAttachments } } );
movie.Setup(item => item.GetMediaStreams())
movie.Setup(item => item.GetMediaStreams(MediaStreamType.EmbeddedImage))
.Returns(mediaStreams);

return movie.Object;
Expand Down
2 changes: 1 addition & 1 deletion tests/Jellyfin.Providers.Tests/MediaInfo/VideoImageProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ private static Movie GetMovie(int defaultVideoStreamIndex, MediaStream? defaultS

movie.Setup(item => item.GetDefaultVideoStream())
.Returns(defaultStream!);
movie.Setup(item => item.GetMediaStreams())
movie.Setup(item => item.GetMediaStreams(MediaStreamType.Video))
.Returns(mediaStreams);

return movie.Object;
Expand Down