lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,215 Commits 2 Branches 0 Tags 64 MiB
bb23ce3466
Commit Graph

559 Commits

Author SHA1 Message Date
Patrick Barron
06f9cde22f Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
#	Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
#	Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
#	Emby.Server.Implementations/TV/TVSeriesManager.cs
#	Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
 2020-06-04 16:52:23 -04:00
xumix
46420dfd68 Refactor copy codec checks 2020-05-26 00:58:19 +03:00
Patrick Barron
aca7e221d8 Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Jellyfin.Server/Jellyfin.Server.csproj
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Controller/Devices/IDeviceManager.cs
 2020-05-15 17:20:07 -04:00
Patrick Barron
dcaffd3812 Fix regressions introduced by #3098 2020-05-14 20:11:34 -04:00
Patrick Barron
9ad839c776 Initial migration code 2020-05-12 22:10:35 -04:00
Bond_009
7f4a229cd2 Add some simple tests 2020-04-20 10:18:12 +02:00
Matt Lyons
e7fde6aaca
Handle null outputFileExtension with null-conditional operator 2020-04-17 16:13:56 +10:00
Matt Lyons
b52199e9e2
Handle null outputFileExtension in GetOutputFilePath 2020-04-13 12:44:15 +10:00
Patrick Barron
81b4a4c54c Implement various suggestions 2020-04-05 17:58:39 -04:00
Patrick Barron
add0a2088d Simplified Conditionals and returns 2020-04-05 14:44:14 -04:00
Patrick Barron
961f48f5bc Use ? and ?? where applicable 2020-04-05 12:45:01 -04:00
Bond_009
ffc9eb67f0 Switch remux and direct stream 2020-02-23 00:05:28 +01: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
Bond-009
c8409d2ea1 Remove FileSystem.GetStream 2020-01-22 22:20:35 +01:00
Maximilian Marschall
081d942d03 Enable Throttling when transcoding without Hardware-Acceleration 2020-01-12 00:33:57 +01:00
Bond_009
e714b9930e Merge branch 'master' into embytv 2020-01-10 21:16:46 +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
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
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
Joshua Boniface
d4474d493b Remove extraneous newline 2019-11-03 12:39:45 -05: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
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
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
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
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
Frank
3ba709fcc3 Fix #1432. Add support for encoding with libx265 and hevc_nvenc. 2019-06-01 15:46:41 -07:00
Bond-009
e89c8dbf76 Use CultureInfo.InvariantCulture 2019-04-17 15:23:03 +02:00
Bond_009
9aaeb19418 Self-documenting code 2019-03-27 17:05:08 +01:00
Bond_009
b647959ec4 Add EnableOutputInSubFolder back 2019-03-27 16:26:33 +01:00
Bond_009
ca37ca291f More style changes 2019-03-26 23:06:38 +01:00