Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-27 07:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
16763 commits 21 branches 76 tags 1.3 GiB
Commit graph

1039 commits

Author SHA1 Message Date
Bond_009 07cc4be6a7 Fix some warnings 
* Add analyzers to MediaBrowser.XbmcMetadata
* Enable TreatWarningsAsErrors for MediaBrowser.XbmcMetadata
* Add analyzers to MediaBrowser.WebDashboard
* Enable TreatWarningsAsErrors for MediaBrowser.WebDashboard
* Disable SA1600 in favor of CS1591
 2020-02-23 12:11:43 +01:00
Bond_009 ffc9eb67f0 Switch remux and direct stream 2020-02-23 00:05:28 +01:00
artiume 4becaf83dd
Update MediaInfoService.cs 2020-02-22 10:03:17 -05:00
artiume a4e0364139
Update MediaInfoService.cs 2020-02-19 06:15:55 -05:00
artiume b375aeb56a
fix indentation 
it was tabs
 2020-02-19 06:07:48 -05:00
artiume 63f13df6fc
Merge pull request #17 from jellyfin/master 
10.5
 2020-02-13 13:09:50 -05:00
Vasily a26c1ab17d Remove commented code 2020-02-12 14:19:11 +03:00
Anthony Lavado 42066ee326
Merge branch 'master' into transcoding-throttling 2020-02-12 02:01:56 -05:00
artiume b5342bb7d9
Fix MaxBitrate 2020-02-11 10:57:16 -05:00
artiume a73ce1d781
Update MediaInfoService.cs 2020-02-06 17:21:10 -05:00
artiume 3b6a4c3a33
Merge pull request #11 from jellyfin/master 
nightly
 2020-02-04 06:02:38 -05:00
Bond_009 87d2479b78 Fix warnings 2020-01-31 22:26:53 +01:00
artiume 918df5e352 Merge remote-tracking branch 'jellyfin/master' 2020-01-26 09:33:31 -05:00
ThreeFive-O 4f3bfd9146 Add Transcoding framerate info 2020-01-24 23:33:32 +01:00
Bond-009 c8409d2ea1 Remove FileSystem.GetStream 2020-01-22 22:20:35 +01:00
Denis 549a2d8b6d
Enable path mapping in PlaybackInfo endpoint 2020-01-17 22:48:28 +03:00
Bond-009 cf13e89ad6
Update MediaBrowser.Api/Playback/MediaInfoService.cs 
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
 2020-01-13 09:01:14 +01:00
Bond_009 84d1b12530 Attempt #2 2020-01-12 21:55:04 +01:00
Bond_009 da5893b0f1 Try to fix nullreff 2020-01-12 21:21:20 +01:00
dkanada ce7744806c
Merge pull request #2216 from gnattu/master 
Let HLS fallback to mpegts in case device reports unsupported container
 2020-01-13 03:43:59 +09:00
gnattu ea075c1b48
Add reminder to remove the workaround 
This will be no longer needed when ffmpeg is ready

Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
 2020-01-12 13:22:20 -05:00
dkanada d217f1614e
Merge pull request #2096 from Bond-009/embytv 
Clean up Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
 2020-01-13 00:41:52 +09:00
Maximilian Marschall 081d942d03 Enable Throttling when transcoding without Hardware-Acceleration 2020-01-12 00:33:57 +01:00
dkanada a272638a84
Merge pull request #2170 from Bond-009/mediainfoservice 
Minor changes to MediaInfoService
 2020-01-11 16:54:23 +09:00
Bond_009 d9ec502ff9 Address comments 2020-01-10 21:25:45 +01:00
Bond_009 e714b9930e Merge branch 'master' into embytv 2020-01-10 21:16:46 +01:00
Artiume a40cb7bbd8
Merge pull request #7 from jellyfin/master 
nightly
 2020-01-09 12:14:54 -05:00
gnattu d5204f572a Fix typo and plural 2020-01-09 02:25:05 -05:00
dkanada aca31457c0 merge branch master into media-attachments 2020-01-08 01:21:09 +09:00
gnattu 167549f5f1 Let HLS fallback to mpegts in case device reported unsupported container 2019-12-31 22:33:14 -05:00
Artiume 0e920a6d5f
Update MediaInfoService.cs 2019-12-20 23:40:36 -05:00
Artiume 963b69c7b2
Update MediaInfoService.cs 2019-12-20 23:17:01 -05:00
Bond_009 5751d86536 Fix warnings and move to System.Text.Json 2019-12-20 21:49:16 +01:00
Artiume 6a6e02e1ec
Merge pull request #3 from jellyfin/master 
nightly, big one
 2019-12-19 20:51:45 -05:00
Bond-009 bb62dd14c2 Limit size for playbacktest 2019-12-19 17:46:17 +01:00
Vasily 06dfa2e687
Merge pull request #2134 from Bond-009/dlnam3u8 
Fix comparison between different types
 2019-12-19 18:51:51 +03:00
Bond-009 a5cd11735c Minor changes to MediaInfoService 2019-12-19 15:54:27 +01:00
dkanada bc7cbfb21a
Merge pull request #1941 from Bond-009/mediaencoding 
Make probesize and analyzeduration configurable and simplify circular dependencies
 2019-12-18 08:54:40 +09:00
Artiume f3e7c72bac
Update MediaInfoService.cs 2019-12-16 15:22:18 -05:00
Artiume b31f4ccbc2
Update MediaInfoService.cs 2019-12-16 14:53:42 -05:00
Artiume 46442e24f8
Update MediaInfoService.cs 2019-12-16 00:43:03 -05:00
Artiume 3fb7aabfde
Update MediaInfoService.cs 2019-12-16 00:40:25 -05:00
Artiume 64c313a8fb
Update MediaInfoService.cs 2019-12-16 00:27:48 -05:00
Artiume be956dfd02
Update MediaInfoService.cs 2019-12-15 23:52:07 -05:00
dkanada 61b9845e0f
Merge pull request #2099 from cryptobank/master 
Fix VAAPI encoding on 10-bit hevc. Update QSV encoding and scaling to...
 2019-12-15 19:54:20 +09:00
cryptobank f18d3ed33b Formatting fix (3) 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-12-14 11:27:41 +10:30
Bond_009 0bf8bfbb0c Merge branch 'master' into mediaencoding 2019-12-10 23:00:59 +01:00
Bond-009 b20b648659 Fix comparison between different types 2019-12-10 17:25:21 +01:00
Bond-009 19844a2c2a Fix typo 2019-12-10 17:07:23 +01:00
cryptobank 5b5d527a09
Use string.Equals instead of of equals operator 
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
 2019-12-07 06:47:57 +10:30
Petr Janda 75426d0004 Add logging when force_key_frames is disabled 2019-12-06 17:21:24 +10:30
Petr Janda 70530e1f14 Fix formatting (2) 2019-12-05 19:20:47 +10:30
Petr Janda 89605d4fb1 Fix VAAPI encoding on 10-bit hevc. Update QSV encoding and scaling to take advantage of scale_qsv and overlay_qsv 2019-12-05 17:39:36 +10:30
Bond_009 5cab79c839 Clean up Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs 2019-12-04 21:39:27 +01:00
Bond_009 cc5acf37f7 Make probesize and analyzeduration configurable and simplify circular 
dependencies

Makes the probesize and analyzeduration configurable with env args.
(`JELLYFIN_FFmpeg_probesize` and `FFmpeg_analyzeduration`)
 2019-11-25 12:07:59 +01:00
Bond_009 3221e837f9 * Add support for multi segment base urls 
* Make baseurl case-insensitive
 2019-11-25 11:55:24 +01:00
Joshua M. Boniface 48120d01dc
Merge pull request #1991 from Bond-009/transtemp 
Don't append transcodes to transcoding temp path
 2019-11-24 15:13:50 -05:00
Bond-009 b477b3874e Fix some warnings 2019-11-22 16:15:31 +01:00
Bond-009 d4b438791f Don't append transcodes to transcoding temp path 2019-11-21 16:57:49 +01:00
dkanada f3ca37e523 minor changes to transcode cleanup scheduled task 2019-11-21 21:55:10 +09:00
Andrew Mahone a78aec56e3
Format attachment DeliveryURL with CultureInfo.InvariantCulture. 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-11-05 08:21:06 -05:00
Andrew Mahone 262a8f47af Remove attachment filenames from attachment URLs. 2019-11-04 11:31:41 -05:00
Andrew Mahone 1600d5b53f Merge remote-tracking branch 'origin/master' into media-attachments-clean 2019-11-04 10:03:18 -05:00
Joshua Boniface d4474d493b Remove extraneous newline 2019-11-03 12:39:45 -05:00
Vasily 8cf8c36708 Move throwing if cancelled after logging that fact 2019-10-27 16:48:42 +03:00
Vasily dd7ae7747e
Apply suggestions from code review 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-10-27 16:47:00 +03:00
Andrew Mahone 20727906c8 Use attachment filename if available. 2019-10-22 11:54:59 -04:00
Andrew Mahone 01b1c847e9 Provide delivery URLs for attachments in PlaybackInfo. 2019-10-22 11:54:59 -04:00
Vasily 3743137c31 Address Bond-009 review comments 2019-10-21 12:05:49 +03:00
Vasily ae2b95024f
Update MediaBrowser.Api/Playback/BaseStreamingService.cs 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-10-21 11:58:04 +03:00
Vasily 6b6fede2e0 Address review comments 2019-10-16 16:13:59 +03:00
Vasily adccc18298 Revert "yarn build" as it is fixed in master, fix typo 2019-10-14 14:07:12 +03:00
Vasily 3132280b07 * Make sure force_key_frames expression arguments are properly converted to strings 
* Fore usage of keyframe cuts only in HLS
 2019-10-14 13:22:53 +03:00
Vasily 2f6879e869 Add limiting max keyframe interval when full transcoding 2019-10-14 13:22:53 +03:00
Vasily 986ea5c636 Fix log message - log args were swapped 2019-10-14 13:22:53 +03:00
Vasily 3740228100 Don't start waiting for a segment which doesn't exist if transcoding is not running 2019-10-14 13:22:52 +03:00
Vasily 7aea9266d0 Stop waiting for a segment to become ready if there's no alive transcode 
Remove extra quotes in logging

Fix typo in comment
 2019-10-14 13:22:39 +03:00
Vasily c1f9107b8b Add more logging 
Trying to fix hls muxer plus ffmpeg 4.1+ combo

Try to fix waiting for segment being ready

This is needed because hls muxer in ffmpeg >= 4.1 creates the
playlist only when it finishes transcoding.

Also cleaned up logs a bit.

Lower log level for "StartFfmpeg finished" to debug
 2019-10-14 13:22:15 +03:00
Vasily 6746f708f2 Revert "Revert "Fix premature stop when streaming"" 
This reverts commit 575b96d03a.
 2019-10-14 13:16:30 +03:00
Joshua M. Boniface 575b96d03a
Revert "Fix premature stop when streaming" 2019-10-01 12:07:09 -04:00
Vasily 4fae733eef Cleaned up move to HLS muxer 2019-09-27 18:22:43 +03:00
Vasily 36a34f911e Replaced "stream" muxer with "hls" trying to fix "premature stop" issue 2019-09-27 16:37:41 +03:00
Erwin de Haan e8b13ea8a9 Fix culture problem on Windows for segment_time_delta argument. 2019-09-10 16:31:35 +02:00
Bond_009 675754bc5c Possible fix for MrMC 2019-09-08 21:07:29 +02:00
marius b711ece829 - fix ArgumentOutOfRangeException at MediaBrowser.Api.Playback.BaseStreamingService.ParseTimeSeekHeader (second substring argument is length) 2019-08-28 21:05:17 +03:00
Bond-009 e87d7cfaf3
Merge pull request #1659 from jellyfin/fix_ffmpeg 
Fix segment_time_delta value for ffmpeg 4.1
 2019-08-25 13:38:11 +02:00
Claus Vium 2e66361482 Move argument to new line 2019-08-24 11:38:33 +02:00
Claus Vium 15b054be94 Fix style issues 2019-08-24 11:17:17 +02:00
Joshua M. Boniface d95c04787c
Merge branch 'master' into h265 2019-08-19 14:57:48 -04:00
Claus Vium 617f7e8b5b Fix segment_time_delta value for ffmpeg 4.1 2019-08-16 19:52:54 +02:00
whooo 9556561a77
Merge branch 'master' into master 2019-08-11 12:42:19 +02:00
dkanada b5f3f28f41
Merge pull request #1578 from Bond-009/httpresponse 
Replace custom code with Asp.Net Core code
 2019-08-09 23:26:10 -07:00
Bond_009 52c1b45feb Fix build 2019-08-09 23:17:54 +02:00
Bond-009 6032f31aa6 Use CultureInvariant string conversion for Guids 2019-08-09 23:17:54 +02:00
Bond_009 9fff4b060e Replace custom code with Asp.Net Core code 2019-08-09 22:36:20 +02:00
Erik Larsson a1efe4caca Add DLNA headers if requested by the client. 
And remove the code which adds the headers as ResponseHelper.WriteToResponse
will do it.
 2019-07-27 19:55:18 +02:00
Claus Vium c05b7c382a Change UsCulture to InvariantCulture 2019-06-05 20:59:06 +02:00
Anthony Lavado f631b2ecdc
Merge pull request #1159 from Bond-009/streamjob 
Trying to make sense of the streaming code
 2019-06-04 00:20:43 -04:00
Frank 3ba709fcc3 Fix #1432. Add support for encoding with libx265 and hevc_nvenc. 2019-06-01 15:46:41 -07:00
bugfixin a827a2fbcc Remove unreachable code and const trySupportSeek within BaseProgressiveStreamingService 2019-04-25 19:14:33 +00:00