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

1045 Commits

Author SHA1 Message Date
crobibero
9171e904de Merge remote-tracking branch 'upstream/api-migration' into api-video 2020-07-31 09:19:02 -06:00
David Ullmer
4aa0bd064f Move HlsSegmentService to Jellyfin.Api 2020-07-27 09:47:19 +02:00
crobibero
37496e958f move VideoService.cs to Jellyfin.Api 2020-07-24 16:49:43 -06:00
David
90039e1ad3 Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio 
# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Jellyfin.Api/Helpers/TranscodingJobHelper.cs
 2020-07-22 11:02:44 +02:00
crobibero
1385064497 Merge remote-tracking branch 'upstream/master' into api-migration-merge 2020-07-20 14:28:33 -06:00
David
3514813eb4 Continute work 2020-07-19 19:03:48 +02:00
David
68dd31d00e Remove routes in old service 2020-06-28 12:44:17 +02:00
Bond-009
9af6eda0b4
Merge pull request #3343 from telans/comment-stops 
Add full stop at end of comments (SA1629)
 2020-06-16 11:54:58 +02:00
telans
247f9c61e6
fix SA1513/SA1516 2020-06-16 16:11:30 +12:00
telans
9018f8d8be
Add full stop at end of comments (SA1629) 2020-06-16 10:37:52 +12:00
telans
3d9049ef08
fix SA1508 2020-06-15 10:45:55 +12:00
telans
acd4389653
fix SA1005 2020-06-15 10:41:00 +12:00
Patrick Barron
bb23ce3466 Merge branch 'master' into userdb-efcore 2020-06-05 22:31:13 -04:00
Andreas B
d92b32a4c6 Fix incorrect HLS master playlist fields 
Resolves: #3224
 2020-06-05 22:05:33 +02:00
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
Anthony Lavado
c31b2798a5
Merge pull request #3180 from xumix/master 
Refactor copy codec checks
 2020-06-03 02:47:15 -04:00
dkanada
73d123fe36 fix issue with audio transcoding 2020-05-27 13:55:45 +09: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
c1360a1dc3 Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Entities/User.cs
#	Jellyfin.Data/ISavingChanges.cs
#	Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
#	Jellyfin.Server.Implementations/JellyfinDb.cs
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Model/Notifications/NotificationOptions.cs
#	MediaBrowser.sln
 2020-05-12 22:22:20 -04:00
Patrick Barron
9ad839c776 Initial migration code 2020-05-12 22:10:35 -04:00
dkanada
c15463fa12
Merge pull request #2837 from Bond-009/async2 
Minor IAsyncDisposable improvements
 2020-05-06 20:30:03 +09:00
Bond-009
7f7a686ea6
Merge pull request #2573 from YouKnowBlom/add-hls-fields 
Add codecs, resolution and frame-rate fields to HLS master playlist
 2020-05-01 11:20:56 +02:00
Andreas B
153ea9f027 Fix error in HLS codecs field when level is null 2020-04-25 15:22:09 +02:00
Bond_009
7f4a229cd2 Add some simple tests 2020-04-20 10:18:12 +02:00
Joshua M. Boniface
5c669d7ad7
Merge pull request #2849 from lyonzy/patch-1 
Handle null outputFileExtension in GetOutputFilePath
 2020-04-19 12:45:08 -04:00
Matt Lyons
e7fde6aaca
Handle null outputFileExtension with null-conditional operator 2020-04-17 16:13:56 +10:00
Bond-009
31769bda28
Merge pull request #2745 from Artiume/patch-6 
Force Audio Transcoding for LiveTV Transcoding
 2020-04-15 23:23:56 +02:00
Bond_009
38dae51ccf Minor IAsyncDisposable improvements 2020-04-15 11:05:32 +02:00
Matt Lyons
b52199e9e2
Handle null outputFileExtension in GetOutputFilePath 2020-04-13 12:44:15 +10:00
Vasily
6386b9b1b9
Merge pull request #2782 from JustAMan/fix-ssa-delivery 
Fix support for attachments with baseURL set
 2020-04-12 23:37:34 +03:00
Vasily
5be60782ed Fix support for attachments with baseURL set 
* Revert "Add baseURL to attachments"
* This is properly handled by jellyfin-web#1020
 2020-04-06 14:06:42 +03:00
Patrick Barron
81b4a4c54c Implement various suggestions 2020-04-05 17:58:39 -04:00
Patrick Barron
e1958e3902 Miscellaneous code cleanup 2020-04-05 15:56:08 -04:00
Patrick Barron
add0a2088d Simplified Conditionals and returns 2020-04-05 14:44:14 -04:00
Patrick Barron
80cfcf5643 Remove unnecessary casts and explicit array types 2020-04-05 13:00:35 -04:00
Patrick Barron
961f48f5bc Use ? and ?? where applicable 2020-04-05 12:45:01 -04:00
Patrick Barron
6a3f9253db Convert using statements to using declarations where applicable 2020-04-05 12:26:11 -04:00
Patrick Barron
5966ee6d87 Convert type checks and null checks into pattern matching 2020-04-05 12:07:43 -04:00
artiume
d10ae74b38
Force Audio Transcoding for LiveTV Transcoding 
Noticing some sync issues when transcoding livetv, the only thing I was able to do to fix it was to force the audio stream to be transcoded as well. This was how I originally wrote the code and we changed it during the review process. I am reverting it back to the original code.
 2020-04-02 14:14:57 -04:00
Bond-009
ddd5d3aaec
Merge branch 'master' into usings 2020-04-01 18:51:44 +02:00
Vasily
9aefb41512
Merge pull request #2503 from nyanmisaka/vaapi 
Fix various bugs in HWA subtitle burn-in
 2020-03-31 23:19:44 +03:00
nyanmisaka
95c5c08610 minor improvements 2020-03-31 04:04:55 +08:00
nyanmisaka
0af353404c fix the UTF-16 error while burning ass/ssa subtitles 2020-03-30 14:47:55 +08:00
Nyanmisaka
0e9d9a7897 fix the incorrect HLS time while using hw encoders 2020-03-30 14:48:57 +08:00
nyanmisaka
fac6831653 fix various bugs in VAAPI hardware acceleration 2020-03-30 14:47:55 +08:00
Bond_009
e9d1eabd53 Remove unused usings 2020-03-24 16:12:06 +01:00
Andreas B
0a2d24aff3 Add RESOLUTION field to HLS master playlist 2020-03-19 23:39:33 +01:00
Andreas B
8a990d1d95 Add FRAME-RATE field to HLS master playlist 2020-03-19 23:39:33 +01:00