Commit graph

327 commits

Author SHA1 Message Date
telans 5bb639a59a
newlines after braces 2020-06-20 21:13:48 +12: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
dkanada dabb869a6b
Merge branch 'master' into hwaccel 2020-06-15 20:21:25 +09: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
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
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
Patrick Barron eef7cfd912 Make SonarCloud less angry 2020-05-26 22:43:03 -04:00
Vasily 8be13b63d4 More cleanup 2020-05-26 19:19:49 +03: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
xumix 46420dfd68 Refactor copy codec checks 2020-05-26 00:58:19 +03:00
Patrick Barron c464f700db Remove redundant qualifiers 2020-05-20 13:07:53 -04:00
Patrick Barron 9ad839c776 Initial migration code 2020-05-12 22:10:35 -04: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
Mark Monteiro ecf49caf0d Add back warning message when Skia encoder cannot be used 2020-04-17 10:25:49 -04:00
Mark Monteiro 9728aa8b0a Merge branch 'master' into register-services-correctly 2020-04-13 17:06:24 -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
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
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
ferferga 4e894b4b66 Remove unnecessary space in hardware decoders argument for ffmpeg 2020-04-09 18:23:21 +02: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 7b31b0e322 Inject logger correctly into ActivityManager and ActivityRepository 2020-04-04 15:33:23 -04:00
Bond-009 f31efce52d
Merge branch 'master' into usings 2020-04-01 22:42:43 +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
Nyanmisaka ebb7590350
update as per suggestion
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
2020-04-01 07:48:29 +08:00