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

3432 Commits

Author SHA1 Message Date
Nyanmisaka
2139e9f8d1
adjust priority in outputSizeParam cutter 2020-07-28 17:07:10 +08:00
Patrick Barron
68a185fd02 Serialize/deserialize new entities properly. 2020-07-27 20:40:21 -04:00
Matt Montgomery
31d3b1b83a Cleanup interfaces 2020-07-27 15:40:14 -05:00
Nyanmisaka
17527d68df
fix build 2020-07-27 14:11:05 +08:00
Nyanmisaka
df6b303da7
Merge branch 'master' into tonemap 2020-07-27 13:57:40 +08:00
Matt Montgomery
3c91aa0c3d Code cleanup 2020-07-26 23:13:14 -05:00
Matt Montgomery
a40fe86776 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-07-26 16:14:58 -05:00
Nyanmisaka
3e55632807
remove spaces 2020-07-27 01:41:27 +08:00
不帅你报警
30bfa5536f
Update MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs 
Co-authored-by: Nyanmisaka <nst799610810@gmail.com>
 2020-07-27 01:34:36 +08:00
不帅你报警
d5dcb12407
Update EncodingHelper.cs 
Fix the problem that hardware decoding cannot be used on macOS.
 2020-07-26 23:47:29 +08:00
Nyanmisaka
95b961c864
remove unused line 2020-07-26 12:38:57 +08:00
nyanmisaka
5716453542 minor changes 2020-07-25 01:03:34 +08:00
nyanmisaka
4bdb870d16 Merge remote-tracking branch 'upstream/master' into tonemap 2020-07-25 00:58:14 +08:00
nyanmisaka
7b862bba5a add Tonemapping relaying on nvdec and ocl 2020-07-25 00:57:34 +08:00
Bond_009
928bc6c787 Fix build 2020-07-24 16:42:28 +02:00
Bond-009
3ff110984a
Merge branch 'master' into readonlyspan 2020-07-24 09:40:44 +02:00
Bond-009
1cc62d6afa
Update MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs 
Co-authored-by: David Mouse <dmouse10462@gmail.com>
 2020-07-24 09:36:18 +02:00
Patrick Barron
3d69cea1c9
Merge branch 'master' into displaypreferences-efcore 2020-07-23 23:50:12 +00:00
Joshua M. Boniface
845ee21ddc
Merge pull request #3664 from Bond-009/createuserasync 
Make CreateUser async
 2020-07-23 18:08:29 -04:00
Joshua M. Boniface
8960d6256f
Merge pull request #3659 from Bond-009/stringbuilder 
Optimize StringBuilder.Append calls
 2020-07-23 18:08:09 -04:00
Joshua M. Boniface
0d446c8755
Merge pull request #3609 from Bond-009/warn21 
Fix warnings
 2020-07-23 18:06:34 -04:00
Joshua M. Boniface
22cc602117
Merge pull request #3366 from barronpm/remove-usermanager-addparts 
Remove UserManager.AddParts
 2020-07-23 18:05:57 -04:00
Bond_009
cbe47325b3 Make UNIX socket configurable 2020-07-23 13:18:47 +02:00
Bond_009
6cbfae209d Make CreateUser async 2020-07-22 20:57:29 +02:00
Bond_009
b9004a0246 Fix build 2020-07-22 14:56:58 +02:00
Bond_009
4d681e3cad Optimize StringBuilder.Append calls 2020-07-22 14:34:51 +02:00
Bond_009
febb6bced6 Review usage of string.Substring (part 1) 
Reduced allocations by replacing string.Substring with ReadOnlySpan<char>.Slice
 2020-07-22 13:39:24 +02: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
Nyanmisaka
d4c6415f99
minor changes 2020-07-21 11:41:28 +08:00
crobibero
1385064497 Merge remote-tracking branch 'upstream/master' into api-migration-merge 2020-07-20 14:28:33 -06:00
Nyanmisaka
5f89e81306
fix qsv device creation on Comet Lake 
reddit: https://www.reddit.com/r/jellyfin/comments/huct4x/jellyfin_1060_released/fyn30ds
 2020-07-20 20:48:20 +08:00
Bond_009
7324b44c43 Fix warnings 2020-07-20 11:01:37 +02:00
Joshua M. Boniface
0b73f3d646
Merge pull request #3569 from nyanmisaka/textsub-fix 
Fix QSV subtitle burn-in on windows and P010 detect
 2020-07-19 16:59:58 -04:00
David
3514813eb4 Continute work 2020-07-19 19:03:48 +02:00
Patrick Barron
4742ddbb71 Update .NET Core to 3.1.6 2020-07-17 19:48:11 -04:00
Patrick Barron
ab396225ea Migrate Display Preferences to EF Core 2020-07-17 16:11:53 -04:00
Nyanmisaka
77f9417d84
enhance platform check and 10bit detect 2020-07-17 19:32:15 +08:00
Nyanmisaka
e1ba1fcebe
fix indent 2020-07-17 01:41:24 +08:00
Nyanmisaka
c1c1a2f751
Match the size of subtitle stream and video stream 2020-07-17 01:30:35 +08:00
Nyanmisaka
32fb34a4cc
Fix QSV subtitle burn-in on windows and P010 detect 2020-07-16 21:09:04 +08:00
Max Git
b356ff6c89 Simplify name of IsCopyDoc 2020-07-15 06:58:36 +02:00
Max Git
87f5a6bdb3 Move videostream null check to start of GetHardwareAcceleratedVideoDecoder 2020-07-15 05:56:05 +02:00
dkanada
87d7c4a62e
Merge pull request #3500 from nyanmisaka/vpp-qsv 
Add FFmpeg 4.3 detection and solve the green line on QSV HWA
 2020-07-14 20:31:13 +09:00
Patrick Barron
3b085f6a03 Remove UserManager.AddParts 2020-07-13 17:25:50 -04:00
dkanada
5e706ba7ce keep playstate during syncplay group creation 2020-07-13 06:55:03 +09:00
Bond-009
fb91e4fc23
Merge pull request #3502 from barronpm/array-empty 
Use Array.Empty
 2020-07-04 23:10:45 +02:00
Patrick Barron
6d1b00da64 Use Array.Empty 2020-07-04 11:54:25 -04:00
nyanmisaka
ce85cea9fa solve the green line issue on QSV 2020-07-04 19:21:16 +08:00
Joshua M. Boniface
46f67c9ea4
Merge pull request #3423 from crobibero/easypassword 
Remove EasyPassword from Authentication providers
 2020-07-04 00:25:00 -04:00
Neil Burrows
4389773508 Respect FFMpeg path passed via Environment Variable 2020-06-29 17:17:28 +01:00
dkanada
9a44e2912e
Merge pull request #3455 from jellyfin/values 
Use constructor to set optimal config values
 2020-06-27 05:58:07 +09:00
dkanada
83ae4d074d use constructor to set optimal config values 2020-06-27 00:22:27 +09:00
Mark Monteiro
0e9164351b Merge remote-tracking branch 'upstream/master' into external-id-type 2020-06-26 10:12:22 -04:00
dkanada
57caa9fdba
Merge pull request #3435 from crobibero/revert-missing-fields 
revert missing session fields
 2020-06-26 06:21:00 +09:00
dkanada
d0bc93e947
Merge pull request #3437 from barronpm/fix-user-delete 
Fix User Deletion
 2020-06-26 06:17:23 +09:00
dkanada
bb7444db07
Merge pull request #3439 from cvium/ignore_application_folders 
Never ignore application folders
 2020-06-26 06:14:19 +09:00
Claus Vium
0f07b19ca5 Remove AllowIgnorePath 2020-06-25 11:33:10 +02:00
Patrick Barron
5ee419ebe4 Fix typo 2020-06-24 21:07:39 -04:00
Patrick Barron
9a01cd8590 Fix user deletion. 2020-06-24 20:19:47 -04:00
crobibero
ef8bec23c4 revert missing session fields 2020-06-24 15:09:15 -06:00
crobibero
1398c2117c Revert ILoggerFactory usage in BaseItem.cs 2020-06-23 07:31:59 -06:00
crobibero
f4d8e0e20c Merge remote-tracking branch 'upstream/master' into easypassword 2020-06-22 20:23:06 -06:00
David
1c78482b48 Use authorization code from api-migration to fix startup wizard 2020-06-20 18:02:03 +02:00
telans
6556bec646
brace multiline if statements (cont.) 2020-06-20 21:19:16 +12:00
telans
5bb639a59a
newlines after braces 2020-06-20 21:13:48 +12:00
telans
7f307f9082
brace multiline if statements 2020-06-20 21:12:36 +12:00
telans
98db8f72e0
fix SA1503 for one line if statements 2020-06-20 20:35:29 +12:00
telans
8e3d874802
remove regions 2020-06-20 18:20:33 +12:00
telans
8de6452967
fix some documentation periods 2020-06-20 18:13:11 +12:00
telans
afe09612e8
fix SA1119 2020-06-20 18:13:11 +12:00
ConfusedPolarBear
e2f16fc255 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-06-19 23:33:43 -05:00
ConfusedPolarBear
329980c727 API cleanup 2020-06-19 23:33:07 -05:00
ConfusedPolarBear
4be476ec53 Move all settings into the main server configuration 
Decreased the timeout from 30 minutes to 5.
Public lookup values have been replaced with the short code.
 2020-06-19 23:32:24 -05: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
crobibero
a8adbef74f Add GetAuthorizationInfo for netcore HttpRequest 2020-06-15 13:21:18 -06:00
crobibero
4aac936721 Add more authorization handlers, actually authorize requests 2020-06-15 12:49:54 -06:00
dkanada
dabb869a6b
Merge branch 'master' into hwaccel 2020-06-15 20:21:25 +09:00
Anthony Lavado
100e9d586d
Merge pull request #3336 from telans/specific-fixes 
Fix trivial SA1005, SA1111, SA1508, SA1510 warnings
 2020-06-14 22:51:29 -04:00
crobibero
589735f60c Merge remote-tracking branch 'upstream/master' into HEAD 2020-06-14 20:15:26 -06:00
dkanada
6db1878011
Merge pull request #3315 from crobibero/dashboard-update 
Add MessageId to websocket message, fix ws exception
 2020-06-15 10:55:33 +09:00
telans
afc9224ede
fix SA1111 2020-06-15 10:46:43 +12:00
telans
9b528aabc2
misc 2020-06-15 10:45:59 +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
telans
726e116d5b
fix SA1510 2020-06-15 10:40:57 +12:00
Patrick Barron
42b4f0aa2e Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
 2020-06-13 19:41:05 -04:00
crobibero
829eb1a849 merge master into api-migration 2020-06-13 13:03:09 -06:00
dkanada
403cd3205f
Merge pull request #3254 from crobibero/ilogger 
Use typed logger where possible
 2020-06-13 00:29:43 +09:00
Patrick Barron
fc02157b42 Fix build errors 2020-06-11 18:28:49 -04:00
Patrick Barron
7a115024aa Merge branch 'master' into userdb-efcore 
# Conflicts:
#	MediaBrowser.Controller/Library/ILibraryManager.cs
#	MediaBrowser.Providers/Users/UserMetadataService.cs
 2020-06-11 18:23:12 -04:00
Patrick Barron
7fba0b778e Properly remove profile images 2020-06-11 17:51:02 -04:00
crobibero
30609c848b Add MessageId to websocket message, add JsonNonStringKeyDictionaryConverter 2020-06-11 10:51:47 -06:00
crobibero
a6815018dc Update to .NET Core 3.1.5 2020-06-11 07:13:56 -06:00
aled
299e49f39d Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
Bond-009
ad5c41b542
Merge pull request #3258 from aled/2149-fix-a-small-number-of-compile-warnings-1 
Fix a small number of compile warnings
 2020-06-09 22:22:36 +02:00
Patrick Barron
d105bc728d Fix startup wizard. 2020-06-09 14:04:25 -04:00
ConfusedPolarBear
35ff2be9d7 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-06-08 14:43:58 -05:00
artiume
d650440492 fix opencl10bit 2020-06-08 14:45:26 +03:00
artiume
347689e4e2 Split VP9 HEVC 10bit button. MacOS Decoder fixed to opencl 2020-06-08 14:45:26 +03:00
Vasily
4999831604 Merge remote-tracking branch 'upstream/master' into hwaccel 2020-06-08 14:44:21 +03:00
crobibero
7ed5cf3dca Force configuration paths to not be ignored. 2020-06-07 20:32:06 -06:00
crobibero
68e1ecaaf9 Remove EasyPassword from Authentication providers 2020-06-07 14:47:08 -06:00
Patrick Barron
98142613e8 Apply review suggestions and fix bug 2020-06-07 13:36:43 -04:00
aled
22a860a806 Fix a small number of compile warnings 2020-06-06 20:17:49 +01:00
Daniyar Itegulov
613748b45d
Make books resumable and have duration of 1 second 2020-06-06 18:50:28 +10:00
crobibero
57d1dbfe7b undo erroneous changes 2020-06-05 18:29:58 -06:00
crobibero
44957c5a9a Use typed logger where possible 2020-06-05 18:15:56 -06: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
Bond-009
2dbb9d4895 Fix build 2020-06-03 11:54:01 +02:00
Vasily
668e10ceb7
Merge pull request #2767 from Bond-009/nullable3 
Enable nullabe reference types for MediaBrowser.Model
 2020-06-03 12:26:54 +03:00
Anthony Lavado
c31b2798a5
Merge pull request #3180 from xumix/master 
Refactor copy codec checks
 2020-06-03 02:47:15 -04:00
Anthony Lavado
91b089c0fa
Merge pull request #3179 from Bond-009/bugs 
Fix some 'bugs' flagged by sonarcloud
 2020-06-03 02:45:22 -04:00
Vasily
b9618c8c01
Merge pull request #2676 from GranPC/public-pr/blurhash 
Implement Blurhash generation for images
 2020-06-02 17:25:45 +03:00
crobibero
e30a85025f Remove log spam when using legacy api 2020-06-01 12:42:59 -06:00
Vasily
26eef1bbf8 Move logic of computing Blurhash components to ImageProcessor 
Also rename last few instances of GetImageHash to GetImageBlurHash for clarity
 2020-06-01 18:12:49 +03:00
ConfusedPolarBear
5d281adedd Merge remote-tracking branch 'upstream/master' into quickconnect 2020-05-29 17:42:42 -05:00
Vasily
9208acd5ae Convert non-local image to local before computing blurhash 2020-05-28 17:55:29 +03:00
Bond_009
7439e095e2 Merge branch 'master' into nullable3 2020-05-27 20:49:18 +02:00
Vasily
edcfcadcd3 Make sure blurhash is recomputed if image changed or metadata refresh toggled 2020-05-27 17:00:59 +03:00
Patrick Barron
31f725fdbf Fix a bug in Emby.Notifications and clean up 2020-05-26 23:08:27 -04:00
Patrick Barron
eef7cfd912 Make SonarCloud less angry 2020-05-26 22:43:03 -04:00
Patrick Barron
01ce56016a Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
#	MediaBrowser.Api/UserService.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
 2020-05-26 20:29:11 -04:00
Joshua M. Boniface
7c72f69189
Merge pull request #2733 from OancaAndrei/syncplay 
Add syncplay feature
 2020-05-26 20:00:01 -04:00
Vasily
8be13b63d4 More cleanup 2020-05-26 19:19:49 +03:00
Joshua M. Boniface
0be3dfe7c5
Revert "Fix emby/user/public API leaking sensitive data" 2020-05-26 12:14:40 -04:00
Vasily
92008baf85 Some simple cleanup 2020-05-26 19:13:11 +03:00
Vasily
3e381cfd5e Clean GetHwaccelType Windows handling a tiny bit 2020-05-26 19:02:22 +03:00
Vasily
628734931c Fix missing commas and merge defects 2020-05-26 18:49:15 +03:00
artiume
abc7558f51 Update EncodingHelper.cs 2020-05-26 18:29:58 +03:00
artiume
f056704c78 add videotoolbox 2020-05-26 18:29:58 +03:00
artiume
62e47d056d Update IMediaEncoder.cs 2020-05-26 18:29:58 +03:00
artiume
0eb5791c70 Comments 2020-05-26 18:29:58 +03:00
Nyanmisaka
22ef0e3574 drop 'force_original_aspect_ratio' 
graphical subtitles can be off-center in some cases
 2020-05-26 18:21:31 +03:00
Nyanmisaka
5fd3ea8b21 minor changes 2020-05-26 18:21:31 +03:00
Nyanmisaka
695f20b303 probe Main/High 10 more specifically 2020-05-26 18:21:31 +03:00
Nyanmisaka
161b2a2da9 minor changes 2020-05-26 18:19:14 +03:00
nyanmisaka
c4ba71d96a resolve conflicts 2020-05-26 18:13:20 +03:00
nyanmisaka
b4b93995f7 add more separate hw decoding toggles 2020-05-26 18:06:49 +03:00
gion
e42bfc92f3 Fix code issues 2020-05-26 11:37:52 +02:00
gion
e4838b0faa Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-26 10:23:09 +02:00
xumix
46420dfd68 Refactor copy codec checks 2020-05-26 00:58:19 +03:00
Bond_009
10e381f66f Fix some 'bugs' flagged by sonarcloud 2020-05-25 23:52:51 +02:00
Vasily
29443e3681
Apply suggestions from code review 
Co-authored-by: dkanada <dkanada@users.noreply.github.com>
 2020-05-26 00:50:29 +03:00
Mark Monteiro
4f6e5591ec Remove 'General' as an ExternalIdMediaType, and instead use 'null' to represent a general external id type 2020-05-23 16:08:51 -04:00
Patrick Barron
56212e8101 Warnings cleanup 2020-05-22 20:20:18 -04:00
Vasily
1f83a21288 Rename Hash to BlurHash in all properties and methods for clarity 2020-05-21 01:43:19 +03:00
Vasily
3fb4c1356c Make blurhash be computed during regular scans if it was not already computed 2020-05-20 23:50:17 +03:00
Patrick Barron
c464f700db Remove redundant qualifiers 2020-05-20 13:07:53 -04:00
Patrick Barron
7d9d54d2ec Fix profile images. 2020-05-20 12:09:52 -04:00
Vasily
2b1ae7ac58 Fix code smells 2020-05-19 15:42:50 +03:00
Vasily
a226a4ee03 Compute hash only when one is not computed in DB, small optimizations here and there 2020-05-19 14:50:14 +03:00
Jesús Higueras
fe480caf54 Add endpoint to update all items in library 2020-05-18 23:21:38 +03:00
Jesús Higueras
b9fc0d2628 Add BlurHash support to backend 2020-05-18 23:21:37 +03:00
Mark Monteiro
d06fee75b6 Rename Name to ProviderName 2020-05-17 17:36:36 -04:00
Mark Monteiro
c82f7eeca1 Clean up some doc comments 2020-05-17 17:26:40 -04:00
Mark Monteiro
67edf1b7f5 Do not convert 'Type' value to string unnecessarily, and do not replace 'General' type with null 2020-05-17 15:59:13 -04:00
Mark Monteiro
422d5b2b68 Move ExternalIdMediaType enum to MediaBrowser.Model 2020-05-17 15:57:24 -04:00
Mark Monteiro
e5c857ac36 Rename external id type 'None' to 'General' 2020-05-17 15:29:53 -04:00
Mark Monteiro
526e47c362 Clean up documentation 2020-05-17 15:27:43 -04:00
Mark Monteiro
96acd6481e Merge branch 'master' into externalid-type 2020-05-17 13:50:44 -04:00
Mark Monteiro
3ed76d7e08 Update to .NET Core 3.1.4 2020-05-17 13:33:38 -04: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
Vasily
d21feb2b18
Merge pull request #2970 from barronpm/activitydb-efcore 
Migrate Activity Database to Entity Framework Core
 2020-05-15 22:04:23 +03:00
gion
029bb80910 Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-15 18:59:35 +02:00
Frank Riley
9ee10d22c8 Rename function 2020-05-14 16:15:09 -07:00
Frank Riley
3cb6fd8a27 Fix #3083: Set the Access-Control-Allow-Origin header to the request origin/host header if possible 2020-05-14 16:15:03 -07:00
Patrick Barron
87c63e668c
Merge branch 'master' into activitydb-efcore 2020-05-14 21:16:43 +00:00
Mark Monteiro
2e09311a93
Merge branch 'master' into websocket 2020-05-14 11:08:08 -04:00
Patrick Barron
1fecd55ac0 Merge branch 'activitydb-efcore' of https://github.com/barronpm/jellyfin into activitydb-efcore 2020-05-13 15:35:44 -04:00
Patrick Barron
1e9b2613c6 Remove more unused code 2020-05-13 15:35:14 -04:00
Patrick Barron
a8f0d0aa0d
Merge branch 'master' into activitydb-efcore 2020-05-13 19:06:04 +00:00
Patrick Barron
511d20a100 Apply review suggestions 2020-05-13 15:03:35 -04:00
Mark Monteiro
51cdb30741
Apply documentation suggestions from code review 
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
 2020-05-13 09:46:29 -04:00
Patrick Barron
b7621d762c 2nd half of changes 2020-05-13 00:00:57 -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
Mark Monteiro
3abf870c1e Do not include a double slash in URLs when a base URL is not set 2020-05-10 18:07:56 -04:00
Mark Monteiro
dc5165b97f Merge branch 'master' into simplify-https-config 2020-05-10 14:43:57 -04:00
Mark Monteiro
43c22a5822 Add GetLoopbackHttpApiUrl() helper method to replace forceHttps functionality 
Also refactor to use return a Uri instead of a string and use UriBuilder under the hood
 2020-05-10 14:36:11 -04:00
gion
5c8cbd4087 Fix code issues 2020-05-09 14:34:07 +02:00
gion
8a6ec2fb71 Rename Syncplay to SyncPlay 2020-05-09 12:37:39 +02:00
gion
6e22e9222b Fix code issues 2020-05-09 12:37:23 +02:00
redSpoutnik
2363ad5449 Add Post subtitle in API 2020-05-08 21:56:29 +02:00
Bond-009
62da4d0e5c
Merge pull request #2492 from Polpetta/fix-api-private-data-leak 
Fix emby/user/public API leaking sensitive data
 2020-05-07 14:52:10 +02:00
Bond_009
3623aafcb6 Make SonarCloud happy 2020-05-02 01:30:04 +02:00
Bond_009
15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00
Vasily
8607b6a997
Merge pull request #2817 from ferferga/master 
Remove unnecessary space in hardware decoders argument for ffmpeg
 2020-04-29 02:37:24 +03:00
gion
083d3272d0 Refactor and other minor changes 2020-04-27 22:39:37 +02:00
gion
aad5058d25 Implement KeepAlive for WebSockets 2020-04-27 22:39:37 +02:00
gion
84d92ba9ce Check that client is playing the right item 
Send date when playback command is emitted
Rename some classes
 2020-04-27 22:39:20 +02:00
gion
f273995f5b Refactor: rename user to session 2020-04-27 22:07:33 +02:00
gion
10c2c62f07 Implement syncplay backend 2020-04-27 22:07:33 +02:00
Mark Monteiro
679f97d5e9 Merge remote-tracking branch 'upstream/master' into simplify-https-config 
Also reverts conflicting changes made in https://github.com/jellyfin/jellyfin/pull/2798
 2020-04-26 17:37:30 -04:00
Joshua M. Boniface
00d8983d7c
Merge pull request #2990 from mark-monteiro/create-missing-folders 
Create Missing Data Folders
 2020-04-26 16:02:09 -04:00
Mark Monteiro
7615cdc963 Ensure metadata path is created on app startup, and also each time it is updated 2020-04-26 15:51:41 -04:00
Joshua M. Boniface
f502c89331
Merge pull request #2798 from JustAMan/fix-livetv-again 
Make localhost LiveTV restreams always use plain HTTP port
 2020-04-26 15:13:27 -04:00
Joshua M. Boniface
cbeeeced75
Apply style change 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-26 14:58:43 -04:00
Joshua M. Boniface
6ac723706c
Apply style change 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-26 14:58:34 -04:00
Joshua M. Boniface
0157326354
Apply style change 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-26 14:58:00 -04:00
Mark Monteiro
93649ad77b Merge remote-tracking branch 'upstream/master' into simplify-https-config 2020-04-26 11:44:42 -04:00
dkanada
97d7ffc458
Merge pull request #2861 from mark-monteiro/fix-auth-response-codes 
Fix Auth Response Codes
 2020-04-23 14:10:22 +09:00
Bond-009
d744d7d234 Merge branch 'master' into register-services-correctly 2020-04-22 13:05:03 -04:00
Bond-009
07326c1d9b
Merge branch 'master' into fix-auth-response-codes 2020-04-22 13:16:08 +02:00
Bond-009
c0b3c11b2e
Merge pull request #2846 from jellyfin/azure 
Remove requirement to build web during server builds
 2020-04-22 00:17:44 +02:00
Mark Monteiro
c5f163293f Add <ProjectGuid> properties to all project files 
This is required for SonarCloud analysis to run
 2020-04-21 16:21:09 -04:00
Mark Monteiro
f815059698 Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-20 20:11:33 -04:00
Anthony Lavado
ed1dc5c922 Remove JsonIgnore from the DateLastSaved property of BaseItem 2020-04-20 02:35:47 -04:00
dkanada
3142c9b990
Merge pull request #2916 from Bond-009/minor2 
Minor improvements
 2020-04-20 13:52:27 +09:00
Bond_009
a73e1f18b6 Minor improvements 2020-04-19 11:16:09 +02:00
ConfusedPolarBear
387a07c6dd Add persistent setting configuration and temporary activation 2020-04-19 01:33:09 -05:00
dkanada
eda208e258
Merge pull request #2829 from Bond-009/warn19 
Fix some warnings
 2020-04-19 12:04:02 +09:00
Mark Monteiro
ecf49caf0d Add back warning message when Skia encoder cannot be used 2020-04-17 10:25:49 -04:00
Mark Monteiro
00a0e013c6 Update documentation for URL methods in ApplicationHost 2020-04-16 21:46:49 -04:00
Mark Monteiro
fee76097f4 Remove CanConnectWithHttps Property 
It is only used in one place and only adds confusion by existing
 2020-04-16 21:45:00 -04:00
ConfusedPolarBear
36f3e933a2 Add quick connect 2020-04-15 14:49:20 -05:00
Mark Monteiro
daed41815f
Add missing punctuation in xml comment 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-15 08:56:00 -04:00
Bond_009
fc049caba2 Merge branch 'master' into nullable3 2020-04-15 11:09:14 +02:00
Mark Monteiro
9728aa8b0a Merge branch 'master' into register-services-correctly 2020-04-13 17:06:24 -04:00
Mark Monteiro
98044e7793 Document AuthenticationException correctly 2020-04-13 13:18:12 -04:00
Mark Monteiro
6d35dd6b32 Clean up SecurityException 
- Remove unused SecurityExceptionType
- Add missing constructor for InnerException
- Add missing documentation
 2020-04-13 13:13:48 -04:00
Joshua M. Boniface
bf92694f8b
Merge pull request #2715 from nyanmisaka/libfdk-aac 
Prefer to use libfdk_aac encoder for better audio quality when it is available
 2020-04-12 19:17:11 -04:00
Bond-009
84dba64644
Merge pull request #2821 from nyanmisaka/mpeg4 
Fix MPEG4 broken on VAAPI
 2020-04-12 11:44:17 +02:00
Nyanmisaka
62d9a48833
update as per suggestions 2020-04-12 17:34:25 +08:00
Nyanmisaka
e6f65863e3
update as per suggestions 2020-04-12 17:32:03 +08:00
Mark Monteiro
1e1295bebf Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-11 10:00:39 -04:00
Bond_009
49fe5e0a21 Fix some warnings 2020-04-11 12:03:10 +02:00
Mark Monteiro
64a255f090 Fix misformed xml doc comment 2020-04-10 15:02:54 -04:00
Nyanmisaka
6485c1eabc
probe Main/High 10 more specifically 2020-04-11 01:19:28 +08:00
Nyanmisaka
dd3f3089ef
minor changes 2020-04-10 22:41:27 +08:00
Nyanmisaka
e0ee61d114
fix mpeg4 failed on vaapi 2020-04-10 22:12:26 +08:00
Vasily
06c5b73c15
Merge pull request #2755 from Bond-009/dbcleanup 
Clean up SqliteItemRepository
 2020-04-10 00:20:53 +03:00
Bond_009
c2b5fb78ce Address comments 2020-04-09 19:27:03 +02:00
ferferga
4e894b4b66 Remove unnecessary space in hardware decoders argument for ffmpeg 2020-04-09 18:23:21 +02:00
Vasily
5b59cd2eb2
Merge pull request #2696 from mark-monteiro/fix-extras 
Display Extras With Unknown Types
 2020-04-07 23:39:31 +03:00
Vasily
e85f9f5613 Make localhost LiveTV restreams always use plain HTTP port 2020-04-07 18:41:15 +03:00
Nyanmisaka
0ecac47098 drop the unnecessary colorspace conversion 
Since 'hwdownload, format = nv12' has completed the conversion of colorspace. 'format = p010le' is redundant and will reduce the speed by almost half under the premise of unchanged cpu usage.
 2020-04-07 00:20:49 +08:00
Nyanmisaka
a5249730d7 mpeg4 profile 15 is not supported by vaapi device 2020-04-07 00:20:36 +08:00
Mark Monteiro
5bc6c08a0a Merge remote-tracking branch 'upstream/master' into simplify-https-config 2020-04-06 00:24:11 -04:00
Mark Monteiro
410a322fe2 Add CanConnectWithHttps to interface 2020-04-05 23:30:57 -04:00
Bond_009
30ce346f34 Enable nullabe reference types for MediaBrowser.Model 2020-04-05 18:10:56 +02:00
Mark Monteiro
f91f2ef328 Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-05 10:07:17 -04:00
Mark Monteiro
efe3ebaab8 Eliminate circular dependency between LibraryManager and ImageProcessor 2020-04-04 16:01:10 -04:00
Mark Monteiro
7b31b0e322 Inject logger correctly into ActivityManager and ActivityRepository 2020-04-04 15:33:23 -04:00
Bond-009
0951dc632b
Update MediaBrowser.Controller/Entities/InternalPeopleQuery.cs 
Co-Authored-By: Mark Monteiro <marknr.monteiro@protonmail.com>
 2020-04-04 00:21:54 +02:00
Bond-009
d6224ddeda
Update InternalPeopleQuery.cs 2020-04-03 22:44:18 +02:00
Bond_009
8e7b15285e Clean up SqliteItemRepository 2020-04-03 20:59:38 +02:00
Bond_009
3161e85f76 Address comments 2020-04-03 17:30:01 +02:00
Mark Monteiro
ca71ac72ab Replace EnableHttps and SupportsHttps with ListenWithHttps and CanConnectWithHttps 2020-04-02 17:45:04 -04:00
Mark Monteiro
5b1091db27 Merge remote-tracking branch 'upstream/master' into do-not-instantiate-services-at-startup 2020-04-01 23:05:36 +02:00
Bond-009
f31efce52d
Merge branch 'master' into usings 2020-04-01 22:42:43 +02:00
Vasily
07ea120ba9
Merge pull request #2601 from mark-monteiro/support-running-without-web-content 
Support Running Server Without Web Content
 2020-04-01 23:38:43 +03:00
Mark Monteiro
1a4d9d4c53 Code review suggestions 2020-04-01 19:41:52 +02:00
Bond_009
3ab50f5a3f Address comments 2020-04-01 19:05:41 +02:00
Bond_009
787049f35f Merge branch 'master' into minor 2020-04-01 18:53:22 +02:00
Bond-009
ddd5d3aaec
Merge branch 'master' into usings 2020-04-01 18:51:44 +02:00
Nyanmisaka
d9b78a1dc5
update as per suggestion 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-02 00:48:43 +08:00
Mark Monteiro
cc8294842a Add ExtraType.Unknown enum value and use it instead of null 2020-04-01 18:10:29 +02:00
Mark Monteiro
861bad1eda Apply suggestions from code review 2020-04-01 13:26:47 +02:00
Nyanmisaka
ebb7590350
update as per suggestion 
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
 2020-04-01 07:48:29 +08: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
cf98a1fbc7
update as per suggestion 
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
 2020-04-01 00:22:10 +08:00
nyanmisaka
95c5c08610 minor improvements 2020-03-31 04:04:55 +08:00
nyanmisaka
db23660660 prefer to use libfdk_aac for better audio quality 2020-03-30 15:53:49 +08:00
Nyanmisaka
0c6ac38454 fix graphical subtitle scaling for NVDEC 2020-03-30 14:48:44 +08:00
Nyanmisaka
111095c2b0 fix QSV HWA failed when burning text subtitles 
ffmpeg 4.3+ is required for better transcoding speed(more than twice increase).
Using qsv on Linux also requires a fix in ffmpeg 4.3+.
See 74007dd86a
 2020-03-30 14:47:55 +08:00
nyanmisaka
fac6831653 fix various bugs in VAAPI hardware acceleration 2020-03-30 14:47:55 +08:00
Bond-009
5acd0521a2
Merge pull request #2639 from alset333/master 
Change DeinterlaceMethod's "bobandweave" to "yadif" or "yadif_bob", and set default value
 2020-03-29 23:03:01 +02:00
Mark Monteiro
e266ad51c5 Simplify logic; remove unnecessary methods 2020-03-28 14:17:33 +01:00
Mark Monteiro
ea306e8f6d Do not assign an invalid value of zero to ExtraType 2020-03-28 13:54:14 +01:00
Mark Monteiro
5fcbedc194 Display extras with an unknown type 2020-03-28 13:40:56 +01:00
Luke Foust
0fb78cf54b Add documentation around Name, Id, and Type. Changed ExternalIdType to ExternalIdMediaType 2020-03-26 14:26:12 -07:00
Luke Foust
ae4e727b24 Merge branch 'master' of https://github.com/lfoust/jellyfin into externalid-type 2020-03-26 13:36:18 -07:00
Mark Monteiro
aa9737afb3 Update .NET Core to 3.1.3 2020-03-25 20:09:48 +01:00
Bond_009
e9d1eabd53 Remove unused usings 2020-03-24 16:12:06 +01:00
dkanada
86f614b26b
Merge pull request #2638 from mark-monteiro/update-asp 
Update .NET Core to 3.1.2
 2020-03-23 18:48:22 +09:00
Luke Foust
9bdb99fe92 Add type to externalids to distinguish them in the UI 2020-03-22 12:58:53 -07:00
Mark Monteiro
6897a19051 Add missing null check when retrieving extras 2020-03-22 15:09:51 +01:00
Mark Monteiro
debab44870 Update all packages to .NET Core 3.1.2 2020-03-22 02:03:07 +01:00
Mark Monteiro
dc140429fe Do not create unnecessary instances of IService at server startup 2020-03-21 23:17:30 +01:00
Mark Monteiro
aa546dd36a Rename command line option to --nowebclient and config setting to HostWebClient 2020-03-21 18:25:09 +01:00
Peter Maar
adbf375efe
Merge pull request #1 from jellyfin/master 
Pull latest to my fork
 2020-03-19 22:02:08 -04:00
dkanada
a96c0a72b8
Merge pull request #2549 from dkanada/refactor 
Refactor some provider classes
 2020-03-18 17:43:15 +09:00
Mark Monteiro
ef7497e837 Merge remote-tracking branch 'upstream/master' into support-running-without-web-content 2020-03-15 19:50:00 +01:00
dkanada
7aec11d621
Merge pull request #2497 from mark-monteiro/1914-prevent-duplicates-in-playlists 
Check for duplicates when adding items to a playlist
 2020-03-16 02:49:57 +09:00
Mark Monteiro
e2685c51ec Merge remote-tracking branch 'upstream/master' into support-running-without-web-content 2020-03-15 18:07:02 +01:00
Mark Monteiro
a67e32f8ec Clean up and document BrowserLauncher correctly 2020-03-15 13:14:57 +01:00
Mark Monteiro
4102e3afd0 Rename IsNoWebContent to NoWebContent 2020-03-15 13:00:14 +01:00
Mark Monteiro
9a7875b6f9 Do not check for duplicates if they are allowed in playlist configuration 2020-03-13 23:14:25 +01:00
Mark Monteiro
79413d9f33 Add a configuration flag to allow/disallow duplicates in playlists 2020-03-13 23:11:59 +01:00
Mark Monteiro
99bf6edba2 Merge remote-tracking branch 'upstream/master' into support-running-without-web-content 2020-03-11 23:04:47 +01:00
Mark Monteiro
d437950ac3 Parse config value correctly 2020-03-11 22:55:10 +01:00
Mark Monteiro
29bad073eb Use config setting to decide if web content should be hosted 
Also fail server startup if web content is expected but missing
 2020-03-11 22:54:54 +01:00
Bond-009
94fe9b8f6d
Merge branch 'master' into warn17 2020-03-11 20:26:43 +01:00
Bond-009
008a76cf4d
Merge pull request #2502 from JustAMan/baseitem-equals 
Adds BaseItem.Equals method that compares items by their Id
 2020-03-11 16:00:36 +01:00
Bond-009
a7e1a5c96a
Merge pull request #2506 from mark-monteiro/inject-loggers-with-context 
Inject loggers with context using ILogger<T>
 2020-03-10 15:04:35 +01:00
dkanada
4f195f289c remove useless interface 2020-03-10 00:10:02 +09:00
dkanada
52fde64f10 remove unused files and fix some future warnings 2020-03-09 23:30:57 +09:00
Vasily
f4ccee5801 Add inheritdoc comment and squash simple method bodies 2020-03-05 15:03:17 +03:00
Vasily
456f571343 Follow code review suggestions 2020-03-05 14:25:50 +03:00
Bond_009
be1d4b32c6 Add speed for alpha numeric sorting 2020-03-05 00:57:24 +01:00
Vasily
007c5b9f67 Implement BaseItem.GetHashCode override 2020-03-04 13:06:13 +03:00
Mark Monteiro
b67e9cde8c Replace ILogger with ILogger<T> wherever possible 
Log entries will contain additional class context when using this interface
 2020-03-03 23:07:10 +01:00
dkanada
c07e1e4f84
Merge pull request #2476 from JustAMan/playto-sort 
Bring back sorting when needed to fix PlayTo
 2020-03-04 01:53:26 +09:00
Vasily
f21cd30039 Lower log level for BaseItem.Equals to debug 2020-03-03 19:22:45 +03:00
Bond-009
1c21248e2e
Merge pull request #2474 from JustAMan/simplify-sorting 
Simplify AlphanumericComparer, reduce code duplication
 2020-03-02 12:28:31 +01:00
Vasily
13d30a0a79
Merge pull request #2436 from dkanada/music 
Add config options for MusicBrainz
 2020-03-02 12:54:17 +03:00
Vasily
ba8d8cede9 Replace foreach with for - MOAR SPEED 2020-03-02 12:39:34 +03:00
Vasily
9a9f2aa293
Apply suggestions from code review 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-03-02 12:36:44 +03:00
Vasily
376bbb40bd Apply code review suggestion 2020-03-02 12:34:34 +03:00
Vasily
11abe31e0d Speed up equality comparison of BaseItem 2020-03-02 12:31:31 +03:00
Davide Polonio
5d760b7ee8 Fix emby/user/public API leaking private data 
This commit fixes the emby/user/public API that was returning more data
than necessary. Now only the following information are returned:
- the account name
- the primary image tag
- the field hasPassword
- the field hasConfiguredPassword, useful for the first wizard only
(see
https://github.com/jellyfin/jellyfin/issues/880#issuecomment-465370051)
- the primary image aspect ratio

A new DTO class, PrivateUserDTO has been created, and the route has been
modified in order to return that data object.
 2020-03-01 21:46:01 +01:00
Mark Monteiro
3f4b9e9a81 Add new 'nowebcontent' configuration flag 2020-02-28 20:40:45 +01:00
Vasily
7f38af3701 Remove custom queue class as it is not needed 2020-02-28 17:27:16 +03:00
Vasily
f81cd037f0 Small speed improvement - no need to convert an array to a list to just iterate over it 2020-02-28 16:19:51 +03:00
Vasily
ae1f975b99 Implement fast sorting 2020-02-27 20:21:34 +03:00
Vasily
0f0b89f344 Trying to be more safe 2020-02-27 20:14:56 +03:00
Vasily
e125db4fe3 Bring back sorting when needed to fix PlayTo 
This is partial revert of https://github.com/jellyfin/jellyfin/pull/1011
 2020-02-27 20:11:40 +03:00
Vasily
d1670f8180
Apply suggestions from code review 
Co-Authored-By: Claus Vium <cvium@users.noreply.github.com>
 2020-02-27 16:02:18 +03:00
Vasily
8e20d2e931 Simplify AlphanumericComparer, reduce code duplication 2020-02-27 14:51:34 +03:00
Mark Monteiro
1b5999a1bc Open the Swagger API page on server start if not hosting the static web content 2020-02-25 17:01:57 +01:00
Peter Maar
818695a01e Improve controls for deinterlace method; matches with jellyfin-web changes 2020-02-23 21:40:53 -05:00
dkanada
de40f22a46
Merge pull request #2384 from Bond-009/warn16 
Fix some warnings in Emby.Server.Implementations
 2020-02-23 21:46:15 +09:00
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
a07ee65365 Minor improvements 2020-02-23 10:53:51 +01:00
dkanada
6715450598
Merge pull request #2427 from Bond-009/minor 
Minor improvements
 2020-02-23 10:48:47 +09:00
Peter Maar
7716deddf0 Add encoding option bobandweave, change back the EncodingHelper logic 2020-02-22 17:01:56 -05:00
dkanada
65a9d618cc add config options for musicbrainz 2020-02-22 15:04:52 +09:00
dkanada
557b165f01
Merge pull request #2434 from Bond-009/photo 
Fix photo serialization
 2020-02-22 00:21:34 +09:00
dkanada
61015c1d0f
Merge pull request #2321 from Bond-009/images 
Simplify image processing by removing image enhancers
 2020-02-21 12:32:54 +09:00
Bond-009
b02a3a29f5 Fix photo serialization 2020-02-20 15:30:04 +01:00
Bond_009
adc9fc282c Minor improvements 2020-02-19 23:08:58 +01:00
Bond_009
184ad29f3f Address comments 2020-02-19 21:04:28 +01:00
dkanada
8ee917143f
Merge pull request #2358 from Bond-009/tests 
Enable TreatWarningsAsErrors and Nullable for test projects
 2020-02-14 00:31:00 +09:00
Bond-009
64800de29d
Merge pull request #2394 from mark-monteiro/xml-documentation 
Add Some XML Documentation
 2020-02-12 20:43:51 +01:00
Bond-009
a2490a7ae5
Merge branch 'master' into images 2020-02-12 17:41:46 +01:00
Mark Monteiro
33761c3658 Use "implement" instead of "apply" when referring to an interface 2020-02-12 14:08:06 +01:00
Anthony Lavado
00073c162a
Merge pull request #2363 from dkanada/view 
Add session view endpoint
 2020-02-11 23:56:47 -05:00
Mark Monteiro
a381eb884c add-some-xml-documentation 2020-02-10 10:26:28 +01:00
Peter Maar
8531ed646d Temporary fix/change forcing yadif to "send_field" 2020-02-09 12:13:31 -05:00
Bond-009
6a6472bb8a
Update MediaBrowser.Controller/Entities/PersonInfo.cs 
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
 2020-02-04 12:28:16 +01:00
Bond-009
c9e11c95ee
Apply suggestions from code review 
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
 2020-02-04 12:05:14 +01:00
Bond_009
32dcd372f4 Fix some warnings in MediaBrowser.Controller 2020-02-04 02:10:44 +01:00
dkanada
f93edb7ade add code suggestions 2020-02-04 01:29:18 +09:00
dkanada
b7a9900556
Merge pull request #2357 from Bond-009/warn13 
Fix warnings
 2020-02-03 17:15:03 +09:00
dkanada
c1ecd886d9
Merge pull request #2368 from nyanmisaka/master 
Fix framerate info not showing when mediasource is in H264 format.
 2020-02-03 15:58:26 +09:00
Nyanmisaka
c149fcb3ee
Update MediaBrowser.Controller/MediaEncoding/JobLogger.cs 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-02-03 00:02:24 +08:00
Nyanmisaka
2c3b1bb8cb
Update JobLogger.cs 2020-02-02 16:46:56 +08:00
Nyanmisaka
7472ae5ca9
fix fps info issue when the video is h264. 
Fixed an issue that when the media source is in H264 format and the frame rate info is not displayed due to missing space characters in ffmpeg log.
 2020-02-02 16:27:02 +08:00