michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
22,497 Commits 2 Branches 79 Tags 73 MiB
ca5112f45a
Commit Graph

396 Commits

Author SHA1 Message Date
Shadowghost
ca5112f45a feat(external-media): refactor external subtitle and audio provider 2022-02-18 22:19:24 +01:00
Bond_009
5732e6188c Fix some warnings 2022-02-15 18:59:46 +01:00
Bond_009
1c14c86b20 Fix some warnings 2022-02-14 14:46:04 +01:00
Cody Robibero
603b6fe173
Merge pull request #7054 from matthew-jones-uk/disable-embedded-subs 2022-02-11 13:20:37 -07:00
Matthew Jones
91d143d6ee Changed boolean options to enums 2022-01-26 16:09:05 +00:00
Joe Rogers
fbd243e315
Make ffprobe consistent with MetadataService.MergeData 2022-01-22 21:59:17 +01:00
Matthew Jones
61d8d40a4a Added type options to disable embedded subs 2022-01-14 11:25:08 +00:00
Matt
126274c4ea Add video path to DisableEmbeddedSubtitles log 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2022-01-14 11:25:08 +00:00
Matthew Jones
3f7bd7b63e Changed DisableEmbeddedSubtitles logging to debug 2022-01-14 11:25:08 +00:00
Matthew Jones
4df7590e52 Add DisableEmbeddedSubtitles setting 
Disables embedded subs being added to metadata
 2022-01-14 11:25:08 +00:00
Cody Robibero
634ce40c2f
Merge branch 'master' into comparisons 2021-12-24 02:41:50 +00:00
Cody Robibero
32629cd7da Use BaseItemKind where possible 2021-12-12 06:11:27 -07:00
Jonas Resch
03b3f08354
Format code in MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-12-08 18:55:28 +01:00
Jonas Resch
65833076db
Add "Async" suffix to AddExternalAudio method 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-12-08 16:49:27 +01:00
Jonas Resch
e18d966874
Add "Async" suffix to AddExternalAudio method 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-12-08 16:49:20 +01:00
Jonas Resch
4cdb590291 Exclude .strm files when searching for external audio files 2021-12-08 10:18:09 +01:00
Jonas Resch
01a0a4a87c Add audioResolver argument to FFProbeVideoInfo initialization 2021-12-08 10:16:48 +01:00
Jonas Resch
87a6fdf847 Merge branch 'support-external-audio-files' of github.com:jonas-resch/jellyfin into support-external-audio-files 2021-12-08 09:55:16 +01:00
Claus Vium
a327b43ab7
Update MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs 2021-12-07 20:28:51 +01:00
Claus Vium
3f69eeab27
Merge branch 'master' into support-external-audio-files 2021-12-07 20:16:32 +01:00
cvium
5535b9c01f Reduce allocations 2021-12-02 11:21:59 +01:00
Jonas Resch
180e2dc329 Prevent crashes in specific scenarios 2021-12-01 21:05:43 +01:00
Jonas Resch
6bbfcf1906 Add documentation to AudioResolver class 2021-11-30 21:05:43 +01:00
Jonas Resch
7b50048020
Add ConfigureAwait true in MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 20:45:47 +01:00
Jonas Resch
a9a53dc657
Add ConfigureAwait true in MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 20:45:21 +01:00
Jonas Resch
0d8170cedb
Move variable in MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 20:44:57 +01:00
Jonas Resch
1a35690834
Don't disable warnings in MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 20:44:16 +01:00
Jonas Resch
c61b9ef05a Fix warning due to new line after opening bracket 2021-11-30 19:52:44 +01:00
Jonas Resch
b5b994b22f Fix compiler warning due to missing EnumeratorCancellation attribute 2021-11-30 19:31:46 +01:00
Jonas Resch
0894a6193f Implement coding standards from 2nd code feedback 2021-11-30 19:31:46 +01:00
Jonas Resch
9d34d6339a Change return type from List<string> to IEnumerable<string> in MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 19:31:46 +01:00
Jonas Resch
bbf1399826 Check language for null or empty instead of only null in MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 19:31:46 +01:00
Jonas Resch
d016d483ae Change return type from Task<List<MediaStream>> to Task<IAsyncEnumerable<MediaStream>> in MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 19:31:46 +01:00
Jonas Resch
61b191d345 Fix indentation in MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
If statement which checks if filename of audio and video file match or if audio file starts with video filename

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 19:31:46 +01:00
Jonas Resch
9433072f90 Only search in video folder for external audio files 
Don't search in video metadata folder since audio files won't be stored there

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 19:31:46 +01:00
Jonas Resch
a3c5afa443 Add ConfigureAwait false MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2021-11-30 19:31:46 +01:00
Jonas Resch
f1862f9b1a Add ConfigureAwait false to MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2021-11-30 19:31:46 +01:00
Jonas Resch
a68e58556c Implement code feedback 
- Rewrite AudioResolver
- Use async & await instead of .Result
- Add support for audio containers with multiple audio streams (e.g.
  mka)
- Fix bug when using external subtitle and external audio streams at the
  same time
 2021-11-30 19:31:46 +01:00
Jonas Resch
c1a8385c9c Shorten calculation of audio startIndex in MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 19:31:46 +01:00
Jonas Resch
9978164438 Add support for external audio files 2021-11-30 19:31:46 +01:00
Joe Rogers
1df5b5034b
Address suppressed warnings 2021-11-27 20:35:18 +01:00
Joe Rogers
4a20ae6cb4
Allow default/forced tag without setting language 2021-11-27 20:13:21 +01:00
Joe Rogers
88baff5693
Apply suggestions from code review 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-19 22:40:42 +01:00
Joe Rogers
9ba7bf96ef
Query MediaSourceManager directly in image providers 
Add doc comments/minor tweaks to AudioImageProvider
 2021-11-18 15:11:50 +01:00
Joe Rogers
7cf5767949
Query media streams by type instead of filtering 2021-11-17 22:34:04 +01:00
Joe Rogers
f059be8e4d
Add logging and fast return 2021-11-15 15:30:43 +01:00
Joe Rogers
370b7f8e12
Handle unexpected case more gracefully 2021-11-14 23:13:45 +01:00
Joe Rogers
1d729b2b0f
Use codec to determine image format 2021-11-12 16:30:30 +01:00
Joe Rogers
f73a7a6ed8
Use ImageFormat instead of string for extension 2021-11-12 16:22:11 +01:00
Joe Rogers
de9bf327c6
Merge similar tests with Theories 2021-11-12 13:44:48 +01:00