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

709 Commits

Author SHA1 Message Date
Fernando Fernández
3d0b1ccae6
Remove all unused usings 2021-09-06 21:15:30 +02:00
Bond-009
ff83fabac3
Merge pull request #6456 from GodTamIt/vp8-vp9 
Disambiguate vpx to vp8 or vp9
 2021-09-04 16:26:07 +02:00
Chris Tam
b205d5a032 Disambiguate vpx to vp8 or vp9 2021-09-04 07:36:17 -04:00
Cody Robibero
3f2c706575
Apply suggestions from code review 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-09-03 07:19:50 -06:00
Cody Robibero
ec13412155 Merge remote-tracking branch 'upstream/master' into warn-259810 2021-09-03 06:56:45 -06:00
Claus Vium
ae031fdd28
Merge branch 'master' into tonemap-overlay 2021-08-30 20:02:31 +02:00
Bond_009
963ab2dab6 Simplify the way we choose our ffmpeg 
* no longer search $PATH
* no longer require a full path
* don't fall back
 2021-08-30 15:40:52 +02:00
Cody Robibero
cba07b1ca6 Remove more and more warnings 2021-08-28 16:32:50 -06:00
Bond_009
19824bff94 Minor improvements 2021-08-15 23:48:19 +02:00
Nyanmisaka
a84dc794c6
Merge branch 'master' into tonemap-overlay 2021-08-13 15:01:06 +08:00
Rich Lander
1ac2524844
Apply suggestions from code review 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-08-11 13:37:46 -07:00
Rich Lander
32d27d71a8 Fix warnings in MediaBrowser.Controller/MediaEncoding directory 2021-08-10 14:29:48 -07:00
Nyanmisaka
d4f09c6c9b
Apply suggestions from code review 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-08-04 16:25:17 +08:00
nyanmisaka
19e3c38fa8 Apply suggestions from code review 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-07-26 03:09:44 +08:00
nyanmisaka
3beda02d92 add support for cuda tonemap and overlay 2021-07-25 00:52:16 +08:00
Claus Vium
5a9bd712b3
Merge pull request #6296 from Bond-009/oscheck 
Improve platform checks
 2021-07-23 20:54:13 +02:00
Bond_009
8528e9bddb Improve platform checks 2021-07-12 20:21:51 +02:00
Cody Robibero
65f8d8c0cd [CA1801] Parameter is never used. Remove the parameter or use it in the method body. 2021-07-10 10:09:02 -06:00
Cody Robibero
d461e3912a
Remove warninigs from MediaBrowser.Controller (Part 3) (#6078) 
Co-authored-by: Bond-009 <bond.009@outlook.com>
 2021-06-06 17:16:41 +02:00
Claus Vium
ffe2770388
Merge pull request #6043 from peterspenler/feature/chromecast-aac-handling 
Reorder requested audio channels checks
 2021-05-24 19:24:40 +02:00
Bond-009
a937a854f2
Merge pull request #6013 from Bond-009/minor13 2021-05-21 01:29:36 +02:00
Bond-009
8d2e5ef8c6
Merge pull request #6042 from crobibero/mbc-warn-2 2021-05-18 21:21:26 +02:00
nyanmisaka
ffc5aba023 Fix the 'No decoder surfaces left' error on Cuda 2021-05-16 18:40:28 +08:00
peterspenler
3c981cf41f Reorder requested audio channels checks 2021-05-13 09:55:31 -04:00
crobibero
6bcbc2b88a Reduce warnings in MediaBrowser.Controller 2021-05-13 07:33:11 -06:00
Bond_009
56ac64e70a Minor improvements 
* properly dispose CancellationTokenSource
* rewrite DynamicHlsController.GetSegmentLengths
* remove dead code
 2021-05-08 00:33:24 +02:00
Bond_009
fb090df0b5 Enable nullable reference types for MediaBrowser.Controller 2021-05-07 00:39:20 +02:00
Bond_009
499bac5185 EncodingHelper: Fix circular dependency 2021-04-20 23:03:36 +02:00
BaronGreenback
bc1cc2d04a Remove unused using directives 2021-04-17 11:37:55 +01:00
MrTimscampi
ef9eba8bc9 Ignore format for ISO files 2021-03-25 12:23:29 +01:00
Nyanmisaka
0853d1265c
Disable auto rotation for some HWA methods (#5586) 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-03-22 17:59:57 +01:00
dkanada
13d65318eb
Merge pull request #5223 from Bond-009/minor10 
Minor improvements
 2021-02-20 10:56:55 +09:00
crobibero
0cce843f07 Fix vpp null reference 2021-02-16 19:14:17 -07:00
Orry Verducci
b718eed314 Use average frame rate when determining deinterlace mode 2021-02-13 15:27:19 +00:00
Bond_009
65bab55ca0 Minor improvements 2021-02-13 00:39:18 +01:00
Nyanmisaka
22e8667105
Apply suggestions from code review 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-02-08 16:41:38 +08:00
nyanmisaka
3052068161 hybird vpp tonemapping for QSV on Linux 2021-02-06 13:21:50 +08:00
nyanmisaka
b0e0e19468 add cuda format converter 2021-02-06 13:21:40 +08:00
nyanmisaka
09b9fa3ce1 add vpp tonemapping for vaapi 2021-02-06 13:21:30 +08:00
nyanmisaka
326fa8ce38 add an enhanced nvdec decoder 2021-01-25 03:40:34 +08:00
Nyanmisaka
470f40442c
not apply to progressive playback 2020-12-26 02:28:38 +08:00
nyanmisaka
ae1187042a also avoid 7ch transcoding 2020-12-24 20:06:55 +08:00
nyanmisaka
bc6ec08322 avoid transcoding to 3ch audio for HLS streaming 2020-12-24 19:41:02 +08:00
nyanmisaka
b61541b6f7 fix some profiles for H264 AMF encoder 2020-12-24 01:32:23 +08:00
Nyanmisaka
ac03ef57c9
allow empty video encoder profile 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-12-19 01:47:31 +08:00
nyanmisaka
cf8aa37f5b Fix some video profile for Android client 
* Fix constrained high profile for some encoders
* Extended profile is not supported by any known h264 encoders
* Replace HEVC 10-bit profiles with main profile
 2020-12-17 23:33:44 +08:00
crobibero
ca5c20c988 Remove IIsoMounter and IsoMounter 2020-12-03 07:34:15 -07:00
Joshua M. Boniface
a6199f821b
Merge pull request #4169 from stanionascu/bdiso-playback 
Playback (direct-stream/transcode) of BDISO/BDAV containers
 2020-12-01 22:36:04 -05:00
nyanmisaka
cc9e178d9a remove a redundant 'hwaccel vaapi' string 2020-11-27 16:08:44 +08:00
Nyanmisaka
b042a9f539
minor changes 2020-11-25 10:33:16 +08:00
Nyanmisaka
44dc1c3729
Apply suggestions from code review 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-24 16:27:46 +00:00
Nyanmisaka
9c703a75ec
disable graphical subs burn-in when tonemapping 2020-11-24 23:10:34 +08:00
nyanmisaka
bee69e409b add tonemapping for intel vaapi 
hwdec->scale->tonemap->hwenc

hwdec->scale->tonemap->textsubs->hwenc

* grapical subs requires overlay_vaapi, but it's still in ffmpeg mailing list.
 2020-11-24 22:09:13 +08:00
Claus Vium
44ff7a4843
Apply suggestions from code review 2020-11-20 08:06:28 +01:00
nyanmisaka
b4598bd71b Merge remote-tracking branch 'upstream/master' into fmp4-hls 2020-11-20 10:01:17 +08:00
Fernando Fernández
e21e00cad5 Merge remote-tracking branch 'upstream/master' into no-scaling 2020-11-19 23:18:25 +01:00
Fernando Fernández
2deda0437d Review suggestions 2020-11-19 16:36:19 +01:00
Nyanmisaka
5ff08338d5
Apply suggestions from code review 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2020-11-19 15:02:36 +00:00
nyanmisaka
51dab0958d changes per suggestions 2020-11-19 22:46:02 +08:00
Greenback
9a323f6df0 More spelling corrections. 2020-11-18 13:46:14 +00:00
Fernando Fernández
38c3b6fcd3 Fix build and thread detection logic 2020-11-18 10:20:59 +01:00
Joshua M. Boniface
e0f60847c0
Merge pull request #4361 from ssenart/feature/4360-transcoding_flac_downsampling 
Add FLAC and define the corresponding target sample rate
 2020-11-17 10:29:29 -05:00
Cody Robibero
08279e91ba
Update MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs 2020-11-17 07:08:22 -07:00
Fernando Fernández
d7cdaeea7d Use all system cores when threads are set to auto or bigger than the amount of system's cores 2020-11-17 14:26:05 +01:00
nyanmisaka
488dbdb31d Merge remote-tracking branch 'upstream/master' into fmp4-hls 2020-11-16 12:36:55 +08:00
Bond_009
bc7359f87d
Use string.Split(char) where possible instead of string.Split(char[]) 2020-11-14 20:27:48 +01:00
Nyanmisaka
06670351ae
Apply suggestions from code review 
Co-authored-by: BaronGreenback <jimcartlidge@yahoo.co.uk>
 2020-11-14 10:19:41 +00:00
nyanmisaka
32bb73acbb add aac_adtstoasc bitstream filter for mpegts to mp4 conversion 2020-11-14 14:23:00 +08:00
nyanmisaka
536b054873 add experimental flag for flac 2020-11-14 04:06:24 +08:00
nyanmisaka
d91a099c9e allow transcoding 8ch(7.1 layout) in aac 2020-11-12 23:10:57 +08:00
nyanmisaka
5bd0c2b69d add an option to disable hevc encoding 2020-11-12 11:02:56 +08:00
nyanmisaka
11c74cb65c fix for no audio stream video 2020-11-11 19:04:58 +08:00
nyanmisaka
57e5b59b93 adjust bitrate limit for HLS audio codecs 2020-11-11 17:10:08 +08:00
Nyanmisaka
0b01acbe91
Apply suggestions from code review 
Co-authored-by: BaronGreenback <jimcartlidge@yahoo.co.uk>
 2020-11-11 02:03:53 +00:00
nyanmisaka
5048719a64 minor changes per suggestions 2020-11-08 09:01:58 +00:00
nyanmisaka
85965741f5 add initial support for HEVC over FMP4-HLS 2020-11-08 01:39:32 +08:00
crobibero
5d88e61076 Merge remote-tracking branch 'upstream/master' into livetv-ts-fix 2020-11-03 07:05:58 -07:00
nyanmisaka
d34be6faf4 fix aac directstreaming 2020-11-01 00:33:38 +08:00
crobibero
429e59fb81 Fix null reference 2020-10-29 13:55:57 -06:00
nyanmisaka
c91f42c7a0 Default output audio bitrate to 128k 2020-10-28 22:27:08 +08:00
Stan
3bb8884e16
Merge branch 'master' into bdiso-playback 2020-10-28 13:18:05 +01:00
Stéphane Senart
28ee4f0a7f [AudioTranscoding] Add FLAC as supported target audio format and be able to define the corresponding target sample rate 2020-10-22 11:09:59 +02:00
Joshua M. Boniface
b3bf07959c
Merge pull request #4171 from nyanmisaka/amf-tonemap 
Add tonemapping for AMD AMF
 2020-10-17 01:55:27 -04:00
Jan-Pieter Baert
ec91d3893d
Fix SA 1116 warnings 2020-10-12 20:05:11 +02:00
Jan-Pieter Baert
6f9beef732
Fix SA1012 and SA1013 warnings 2020-10-12 19:22:33 +02:00
Nyanmisaka
9fbf725a6d
Enhance workload when tone mapping on some APUs 2020-10-03 17:53:10 +08:00
Nyanmisaka
2124bc2e18
enhance workload when tone mapping with AMF 
zscale filter is required.
 2020-10-03 16:04:39 +08:00
Stanislav Ionascu
cd4641dca0 Remove PlayableStreamFileNames as unused 
Since ffmpeg can play and transcode ISO files and BDMV folders directly,
there's no use of that property.
 2020-10-01 22:20:34 +02:00
Stanislav Ionascu
3ad6232973 Add probe / direct-stream / transcoding support for BluRays 
This commit (and ffmpeg built with libbluray support), adds support
for playback of bluray images (bd-iso) and bluray folders.
 2020-10-01 21:59:57 +02:00
Matt Montgomery
53d5f64e03 Fix SA1513, SA1514, SA1507, and SA1508 2020-09-28 15:04:31 -05:00
nyanmisaka
db07510017 add tonemap for AMD AMF 2020-09-17 19:16:23 +08:00
Nyanmisaka
4cb0a57e46
Merge branch 'master' into tonemap 2020-09-04 02:55:57 +08:00
Bond-009
9cbc016b0a
Merge pull request #3877 from orryverducci/deinterlace-improvements 
Deinterlacing improvements
 2020-09-03 20:38:54 +02:00
Claus Vium
e337756428 Remove ServiceStack and related stuff 2020-09-02 12:22:14 +02:00
Bond_009
404bb4f835 Enable TreatWarningsAsErrors for MediaBrowser.Controller in Release 2020-08-22 21:56:24 +02:00
nyanmisaka
54349fc945 fix outputSize 2020-08-20 19:08:36 +08:00
Bond_009
2b400c99ef Fix warnings 2020-08-19 17:50:50 +02:00
Orry Verducci
396148599a
Fix indentation in deinterlace if block 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2020-08-15 12:55:58 +01:00
Orry Verducci
9438a50976 Correct parentheses 2020-08-13 21:23:12 +01:00
Orry Verducci
2d6699fd47 Merge remote-tracking branch 'upstream/master' into deinterlace-improvements 2020-08-10 22:17:13 +01:00
Orry Verducci
ce51775e74 Apply double rate option to hardware deinterlacers 2020-08-10 22:16:46 +01:00
Orry Verducci
9dc95074a3 Add bwdif and simplify software deinterlacing 2020-08-10 22:16:23 +01:00
Orry Verducci
7df2affb23 Add double rate deinterlacing option 2020-08-10 22:14:47 +01:00
crobibero
f915c3e5d9 Merge remote-tracking branch 'upstream/master' into api-migration 2020-08-03 11:24:13 -06:00
Nyanmisaka
7b3f76b81f
resolve conflicts 2020-08-03 14:55:28 +08:00
Nyanmisaka
2139e9f8d1
adjust priority in outputSizeParam cutter 2020-07-28 17:07:10 +08: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
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
Joshua M. Boniface
8960d6256f
Merge pull request #3659 from Bond-009/stringbuilder 
Optimize StringBuilder.Append calls
 2020-07-23 18:08:09 -04: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
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
David
3514813eb4 Continute work 2020-07-19 19:03:48 +02: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
nyanmisaka
ce85cea9fa solve the green line issue on QSV 2020-07-04 19:21:16 +08:00
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
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
Waldemar Tomme
ef487441d1 Remove configuration of global_header flag 2020-01-21 06:48:25 +01:00
Nyanmisaka
8868ff2ffa
remove useless comment 2020-01-15 18:40:58 +08:00
Nyanmisaka
08c4d3797f
add support for AMF hardware encoding on Linux. 
1) h264_amf is now supported on linux with 'amdgpu-pro' installed and '--enable-amf' when compiling ffmpeg.
2) Using vaapi decode and h264_amf encode on linux platform can avoid some weird transcoding errors in h264_vaapi with amd gpu.
 2020-01-12 21:38:28 +08:00
Bond_009
a253fa616d Fix build and address comments 2020-01-08 01:23:57 +09:00
dkanada
aca31457c0 merge branch master into media-attachments 2020-01-08 01:21:09 +09:00
Waldemar Tomme
57aec873d0 Add check if output container supports "global_header" flag 2019-12-22 13:01:18 +01:00
dkanada
bc7cbfb21a
Merge pull request #1941 from Bond-009/mediaencoding 
Make probesize and analyzeduration configurable and simplify circular dependencies
 2019-12-18 08:54:40 +09:00
cryptobank
d063300af4
Add space 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-12-15 20:35:52 +10:30
cryptobank
bafcadbe58 Use case insensitive contains (4) 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-12-14 11:27:43 +10:30
cryptobank
d0febd6c37 Use case insensitive contains (3) 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-12-14 11:27:43 +10:30
cryptobank
802a66a9e6 Use case insensitive contains (2) 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-12-14 11:27:43 +10:30
cryptobank
867b61025d Use case insensitive contains (1) 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-12-14 11:27:43 +10:30
Bond-009
6464bca791 Use extension methods 2019-12-12 17:02:42 +01:00
Bond_009
0bf8bfbb0c Merge branch 'master' into mediaencoding 2019-12-10 23:00:59 +01:00
cryptobank
408cf017a4
Remove newline 
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
 2019-12-07 06:48:44 +10:30
cryptobank
68edb9734d
Add space between if statement and boolean expression 
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
 2019-12-07 06:46:24 +10:30
Petr Janda
3f43aef997 Add back code removed during testing/debugging 2019-12-06 16:04:29 +10:30
Petr Janda
535390bb64 QSV can hardware deinterlace too now 2019-12-06 06:30:09 +10:30
Petr Janda
a9766992b7 Do not force original aspect ratio to decrease, it causes bitmap subtitles to be off-centre 2019-12-06 06:08:45 +10:30
Petr Janda
9ee0804407 Move scaling filters and definitions before deinterlacing 2019-12-06 05:52:40 +10:30
Petr Janda
7d2bfabb32 Force original aspect ratio can be used for QSV subtitle scaling 2019-12-06 05:12:16 +10:30
Petr Janda
8368815788 Remove trailing spaces 2019-12-06 05:03:46 +10:30
Petr Janda
70530e1f14 Fix formatting (2) 2019-12-05 19:20:47 +10:30
Petr Janda
3d8f3da5d6 Add comments 2019-12-05 18:39:09 +10:30
Petr Janda
78a161138f Fix formatting stuffed up by previous commit 2019-12-05 18:07:46 +10:30
Petr Janda
89605d4fb1 Fix VAAPI encoding on 10-bit hevc. Update QSV encoding and scaling to take advantage of scale_qsv and overlay_qsv 2019-12-05 17:39:36 +10:30
ferferga
94ef239de0 Add full Raspberry Pi hardware decoding support 2019-11-25 23:09:23 +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
d4b438791f Don't append transcodes to transcoding temp path 2019-11-21 16:57:49 +01:00
Andrew Mahone
1600d5b53f Merge remote-tracking branch 'origin/master' into media-attachments-clean 2019-11-04 10:03:18 -05:00
Joshua M. Boniface
a460814182
Merge pull request #1904 from JustAMan/hls-move-2 
Switch ffmpeg to hls muxer (from segment) to fix premature stop on non-patched ffmpeg
 2019-11-03 14:36:34 -05:00
Andrew Mahone
12f752d8b1 FFMPEG extractor for attachments. 2019-10-22 11:50:07 -04:00
Vasily
3743137c31 Address Bond-009 review comments 2019-10-21 12:05:49 +03:00
KerryJ
ef3df7baaf Fix System.NullReferenceException when playing Dvds copied to HDD 2019-10-17 11:31:11 +02:00
Vasily
1bd12083c3 Respect non-inversed setting of "enable break on non-keyframes" 2019-10-14 13:22:53 +03:00
Joshua M. Boniface
dcc8c7b92a
Merge pull request #1808 from joshuaboniface/fix-amf-win 
Change Win32 AMF flag to d3d11va
 2019-09-29 17:19:23 -04:00
Joshua Boniface
7fd75bf071 Change Win32 AMF flag to d3d11va for Windows 8+ 2019-09-29 12:39:52 -04:00
Joshua M. Boniface
d64005df40
Merge pull request #1812 from dkanada/settings 
Avoid editing preferences without user interaction
 2019-09-29 11:43:03 -04:00
dkanada
7a88e7fa34 avoid editing preferences without user interaction 2019-09-29 16:21:32 +09:00
Bond_009
c9820d30ed Fix multiple mistakes and warnings 2019-09-23 20:32:44 +02:00
Bond_009
675754bc5c Possible fix for MrMC 2019-09-08 21:07:29 +02:00
Bond_009
1616f24cee Fix more warnings 2019-09-01 18:39:23 +02:00
Samantha Collard
627bde4b72 Fix VAAPI 8-bit HW to SW transcoding for some media 2019-09-01 13:20:18 +10:00
Samantha Collard
a321ca5b39 Enable VAAPI decoding without hardware encoding 
Enable VAAPI command arguments to ffmpeg if VAAPI is selected, and
add the "hwdownload" filter if transcoding from VAAPI to software.
Also support transforming 10 bit colourspace to 8-bit, consistent
with other hardware encoding options, at least until client pixel
formats are configurable.
 2019-08-31 12:04:31 +10:00
Joshua M. Boniface
d95c04787c
Merge branch 'master' into h265 2019-08-19 14:57:48 -04:00
Bond_009
e6ef6088ff Fix #1388 and #1472 2019-07-29 00:43:57 +02:00
dkanada
dbc2cda9d4
Merge pull request #1369 from teacupx/master 
Enable Exynos MFC encoder and fix transcoding bitrate control
 2019-06-20 16:55:09 -07:00
dkanada
65fa61a636 add comment explaining GetMinBitrate 2019-06-20 16:44:27 -07:00
Frank
3ba709fcc3 Fix #1432. Add support for encoding with libx265 and hevc_nvenc. 2019-06-01 15:46:41 -07:00
JMCC
012e4a3e63 Fix transcode bitrate control 2019-05-11 17:19:20 +02:00
Bond_009
b647959ec4 Add EnableOutputInSubFolder back 2019-03-27 16:26:33 +01:00
Bond_009
93e535d3a1 Trying to make sense of the streaming code 
Mostly small changes as I was looking through the code.

* async void -> async Task
* Properly implemented dispose methods
* Pass the logstream directly to the JobLogger
* Style fixes
 2019-03-26 23:00:14 +01:00
Bond_009
d5f080fefb Check before flushing ffmpeg log 
The stream could have been diposed while writing.
 2019-03-15 17:58:34 +01:00
Bond_009
37ea50a572 Reduce the amount of exceptions thrown 2019-03-07 21:42:56 +01:00
PloughPuff
2617a49b78 Renamed Init() to SetFFmpegPath() 2019-03-05 21:29:15 +00:00
PloughPuff
ed69e690b8 Review comments 
Address review comments from JustAMan, Bond-009 and cvium.
 2019-03-05 21:29:15 +00:00
Joshua M. Boniface
9651a78b0c
Merge pull request #977 from Lynxy/genpts 
Always set ffmpeg flag +genpts when video stream is being copied
 2019-02-27 00:52:51 -05:00
Claus Vium
547d0ecf58 Move the check further down 2019-02-24 22:04:30 +01:00
Claus Vium
96b3d37caf Check that ffmpeg log target isn't disposed before writing to it 2019-02-24 21:25:24 +01:00
The Lynxy
67f399dccf
Leave +genpts untouched in GetProgressiveVideoArguments() 2019-02-23 10:01:41 -05:00
Lynxy
9b39404b9a Always set ffmpeg flag +genpts when video stream is being copied 2019-02-21 19:50:57 -05:00
Bond_009
1cdcace061 Remove dead code 2019-02-02 15:58:39 +01:00
Bond_009
66eabcdd39 Minor changes to encoding code 
* Don't wait in intervals of 100ms for the file to exist
 2019-02-02 15:56:54 +01:00
Bond-009
1ea219bf3f
Merge branch 'master' into culture 2019-01-30 16:57:15 +01:00
Erwin de Haan
581a7fe078 Unwrapped MoveDirectory, DirectoryExists, FileExists & removed MoveFile 2019-01-28 22:10:00 +01:00
Bond_009
a709cbdc64 Fix more analyzer warnings 2019-01-27 12:12:44 +01:00
Luca Beltrame
ee89236fe8 [VA-API] Fix filter order (#714) 
ffmpeg is very picky about the filters to be used when using VA-API,
because most of them are incompatible. This is particularly evident when
burning-in subtitles.
 2019-01-27 09:44:56 +01:00
Bond_009
883575893b Change image dimentions from double to int 
Rename ImageSize -> ImageDimensions
 2019-01-26 13:16:47 +01:00
Mathieu Velten
ae73f7b3e3 Fix transcoding bitrate 2019-01-20 22:50:17 +01:00
Mathieu Velten
060eb98cc5 Fix encoding profile handling for vaapi 2019-01-20 22:50:17 +01:00
Mathieu Velten
da16de48aa Revert back to 10e57ce8d21b4516733894075001819f3cd6db6b for MediaEncoding 
Remove some duplicate code that were causing warnings
 2019-01-20 22:50:09 +01:00
Bond_009
fc7c211025 Remove unused font 2019-01-20 20:32:15 +01:00
Erwin de Haan
38f96af079 Reformat JustAMan review pt2 changes 
Refs #575
 2019-01-17 20:24:39 +01:00
Erwin de Haan
e867446437 ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Erwin de Haan
a36658f6f0 ReSharper Reformat: Properties to expression bodied form. 2019-01-13 21:31:14 +01:00
Erwin de Haan
ba610b5094 Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
Erwin de Haan
26ca4b607b Visual Studio Reformat: MediaBrowser.Controller 2019-01-13 20:25:32 +01:00
Erwin de Haan
e2751d42e8 Merge branch 'dev' into code-cleanup 2019-01-11 12:50:36 +01:00
Erwin de Haan
ec1f5dc317 Mayor code cleanup 
Add Argument*Exceptions now use proper nameof operators.

Added exception messages to quite a few Argument*Exceptions.

Fixed rethorwing to be proper syntax.

Added a ton of null checkes. (This is only a start, there are about 500 places that need proper null handling)

Added some TODOs to log certain exceptions.

Fix sln again.

Fixed all AssemblyInfo's and added proper copyright (where I could find them)

We live in *current year*.

Fixed the use of braces.

Fixed a ton of properties, and made a fair amount of functions static that should be and can be static.

Made more Methods that should be static static.

You can now use static to find bad functions!

Removed unused variable. And added one more proper XML comment.
 2019-01-10 20:38:53 +01:00
hawken
bd169e4fd4 remove trailing whitespace 2019-01-07 23:27:46 +00:00
hawken
ba1794f64b Remove tabs and trailing whitespace 2019-01-07 23:24:34 +00:00
Bond_009
340a2c6512 Post GPL cleanup 2019-01-03 23:19:02 +01:00
Bond_009
c99b45dbe0 Remove some warnings 2019-01-02 02:35:40 +03:00
Bond_009
ea4c914123 Fix exception logging 2018-12-30 22:44:39 +01:00
Bond_009
0c1b9d3bff Rebase 2018-12-30 22:44:38 +01:00
Bond_009
0f8b3c6347 Use Microsoft.Extensions.Logging abstraction 2018-12-30 22:44:38 +01:00
Andrew Rabert
a86b71899e Add GPL modules 2018-12-27 18:27:57 -05:00
stefan
48facb797e Update to 3.5.2 and .net core 2.1 2018-09-12 19:26:21 +02:00
Luke Pulverenti
26edcfefbb cache network data longer 2017-11-27 15:16:41 -05:00
Luke Pulverenti
9f46122d91 3.2.36.10 2017-11-15 16:33:04 -05:00
Luke Pulverenti
5cb7469028 support track selection before playback 2017-11-05 16:51:23 -05:00
Luke Pulverenti
8b7936addf removed dead code 2017-10-13 01:45:06 -04:00
Luke Pulverenti
bc656edf4f update resolved video titles 2017-10-13 01:44:20 -04:00