Commit graph

302 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
Patrick Barron eef7cfd912 Make SonarCloud less angry 2020-05-26 22:43:03 -04: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
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 e9d1eabd53 Remove unused usings 2020-03-24 16:12:06 +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
Peter Maar 818695a01e Improve controls for deinterlace method; matches with jellyfin-web changes 2020-02-23 21:40:53 -05:00
Bond_009 a07ee65365 Minor improvements 2020-02-23 10:53:51 +01:00
Peter Maar 7716deddf0 Add encoding option bobandweave, change back the EncodingHelper logic 2020-02-22 17:01:56 -05:00
Bond-009 a2490a7ae5
Merge branch 'master' into images 2020-02-12 17:41:46 +01:00
Peter Maar 8531ed646d Temporary fix/change forcing yadif to "send_field" 2020-02-09 12:13:31 -05: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
Nyanmisaka 8eced835c0
Update JobLogger.cs 2020-02-02 15:58:29 +08:00
Bond_009 87d2479b78 Fix warnings 2020-01-31 22:26:53 +01: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
Bond_009 ddf9b38799 Simplify image processing by removing image enhancers 2020-01-21 20:26:30 +01:00
dkanada d4de78693f
Merge pull request #2184 from WiiPlayer2/bug/global-header-flag-support
Add check if output container supports "global_header" flag
2020-01-21 19:24:35 +09:00