Commit Graph

622 Commits

Author SHA1 Message Date
Bond-009
c19c787273 Merge pull request #7828 from nyanmisaka/fix-dovi-tonemap
Fix Dolby Vision profile 5 and 8 to SDR HW tone-mapping

(cherry picked from commit 8595a979a872c05d0d06f9b87ed1b56c693c267d)
Signed-off-by: crobibero <cody@robibe.ro>
2022-06-10 23:43:17 -04:00
Joshua M. Boniface
8e9c02f4c6 Merge pull request #7736 from jellyfin/fix-swscale-pgs
(cherry picked from commit 5da4bcc782c47c5bf64e1cc06eabd07b7f82de33)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-05-20 23:49:38 -04:00
Cody Robibero
1922ee153e Merge pull request #7716 from Shadowghost/opus-fix
Respect limited opus sampling rates when building trancoding command

(cherry picked from commit 5a9afb0874b0862f6184478003332219796ee73b)
Signed-off-by: crobibero <cody@robibe.ro>
2022-05-20 18:30:57 -04:00
Cody Robibero
efcdab116f Merge pull request #7529 from Shadowghost/strm-ffprobe-external-fix
(cherry picked from commit 60affd096595d68728506149d0ffce6e84b6b015)
Signed-off-by: crobibero <cody@robibe.ro>
2022-05-20 18:30:56 -04:00
Cody Robibero
76cfb8c903 Merge pull request #7643 from jellyfin/h264-level
(cherry picked from commit 12f9132975a4415ab7df3be9dcc2b56d68082d5f)
Signed-off-by: crobibero <cody@robibe.ro>
2022-04-28 09:26:45 -04:00
Cody Robibero
fe3dbabbff Merge pull request #7580 from jellyfin/external-audio-map
(cherry picked from commit c5212a20a314adb3cf654bc1a08f03933377e519)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-04-17 15:45:11 -04:00
Cody Robibero
a2f1ec23ce Merge pull request #7557 from jellyfin/pgs-qsv-iris655
(cherry picked from commit 620625c4c12ad59c0c36ca9bc3f405242ee3d83d)
Signed-off-by: crobibero <cody@robibe.ro>
2022-04-07 12:54:58 -04:00
Cody Robibero
96a03776e1 Fix TranscodeReasons property name 2022-03-26 12:20:29 -06:00
Joshua M. Boniface
c229f3ae0a
Merge pull request #7333 from eyezak/hls/audio-bitstream-fmp4 2022-03-25 10:13:58 -04:00
Nyanmisaka
3cea6c61f3
Apply suggestions from code review 2022-03-25 22:12:56 +08:00
Joshua M. Boniface
97d3212410
Merge pull request #7437 from Nalsai/mks-attachments 2022-03-23 20:19:32 -04:00
Nils Fürniß
90463d5e4f
Pass CancellationToken to ExtractAllAttachments 2022-03-22 19:17:48 +01:00
Nils Fürniß
6904edf68c
add extracting attachments from external subs 2022-03-22 19:17:48 +01:00
Nyanmisaka
fb8ae0e9a1
Improve fps for cuda tonemap in sw decoding
avoid second copy if subtitle is not applied.
2022-03-22 00:45:07 +08:00
Cody Robibero
e6df698df1
Merge pull request #7325 from eyezak/issue/6450 2022-03-12 09:08:25 -07:00
nyanmisaka
b2c58338f2 Fix the fMP4 HLS audio sync issue on Safari 2022-03-09 21:28:58 +08:00
Nyanmisaka
4f1efb3996
Re-enable the legacy NVIDIA CUVID decoder in full HWA pipeline (#7413) 2022-03-08 16:36:30 +01:00
Cody Robibero
bbd5d11d3b Remove TranscodeReason.None, Add JsonFlagEnum tests 2022-03-06 18:13:54 -07:00
Cody Robibero
c331e11c24 Clean up EnumFlags serialization 2022-03-06 18:13:54 -07:00
Isaac Gordezky
5e779f20ee Series: issue-6450
Issue: https://github.com/jellyfin/jellyfin/issues/6450

Enable DirectPlay responses
Rewrite DirectPlay and DirectStream resolution
Prefer copy transcode video codec options
Enhance condition processor
Support DirectStream and Transcode with parity
Rework audio stream selection and add tests for ExternalAudio
Update MediaInfoHelper to only call StreamBuilder once
2022-03-06 18:13:54 -07:00
Isaac Gordezky
d871dded9f Convert TranscodeReason to Flags 2022-03-06 18:13:54 -07:00
Joshua M. Boniface
947ff9defe
Merge pull request #7404 from nyanmisaka/omx 2022-03-05 14:35:41 -05:00
nyanmisaka
bfc27e494b Remove the deprecated OMX and MMAL HWA 2022-03-05 21:47:59 +08:00
nyanmisaka
de4a084b03 Set the name of intel vaapi driver explicitly
Fix crashes on older intel gfx when both iHD and i965 driver are existed.
2022-03-05 01:32:06 +08:00
Claus Vium
6498a5baca
Merge pull request #7387 from jellyfin/nvdec-threads 2022-03-01 16:53:23 +01:00
Nyanmisaka
4239f80c81
Lowering the VRAM usage on NVDEC decoder 2022-03-01 23:14:35 +08:00
Nyanmisaka
ba8e478a2f
Fix the path to the extracted fonts on Windows 2022-03-01 22:41:54 +08:00
Bond-009
eff3d3e67e
Merge pull request #7275 from Nalsai/burn-subtitle-attached-fonts 2022-03-01 11:21:19 +01:00
Cody Robibero
3c0c7572ef
Merge pull request #7338 from mueslimak3r/hls-remove-seek-param 2022-02-28 20:16:19 -07:00
Nyanmisaka
9251c875b1
Update presets for NVENC encoder 2022-02-28 23:05:08 +08:00
Isaac Gordezky
def8500dd0
Update MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2022-02-21 07:54:13 -05:00
cameron
36cdeaa53c dont use noaccurate_seek for hls 2022-02-18 23:18:28 -08:00
Isaac Gordezky
151ddd400d [Bugfix] Provile bitStreamArgs for HLS fMP4
Enable the audio bitstream arguments to ffmpeg for both ts and fMP4 HLS streaming
2022-02-18 13:18:08 +00:00
Nils Fürniß
ab40554759
add extracting attachments for ffmpeg to burn subs 2022-02-10 01:01:08 +01:00
Ace Olszowka
ea7e5e639d Fix h264_v4l2m2m acceleration in Raspberry Pi 4 2022-02-07 20:41:07 -07:00
Cody Robibero
34ee6d82fb
Merge pull request #6600 from cvium/keyframe_extraction_v1 2022-01-20 08:54:40 -07:00
nyanmisaka
8c3f98f41b Also seek the external audio stream 2022-01-09 13:49:40 +08:00
nyanmisaka
ddc2569258 Fix the wrong logic in HEVC VP9 10bit hwdec boxes 2022-01-08 22:31:45 +08:00
cvium
c658a883a2 Merge branch 'master' into keyframe_extraction_v1
# Conflicts:
#	Jellyfin.Api/Controllers/DynamicHlsController.cs
#	MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
#	MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
2022-01-07 10:23:22 +01:00
Cody Robibero
82260e22a2 ADd more null check 2022-01-06 21:49:13 -07:00
Cody Robibero
7bfc6b5679 Remove more warnings 2021-12-27 07:38:06 -07:00
Cody Robibero
ebbde383e8 Fix analysis issues 2021-12-26 11:08:43 -07:00
Cody Robibero
78bb581f0c
Merge pull request #6934 from nyanmisaka/hwa
HWA pipeline refactor, AMD/Intel/Nvidia full hardware filtering support, AV1 hwdec
2021-12-26 17:32:06 +00:00
Bond_009
cbfa355e31 Update StyleCop 2021-12-24 18:28:27 +01:00
nyanmisaka
728a5988b3 Merge remote-tracking branch 'origin/master' into hwa 2021-12-25 00:33:17 +08:00
nyanmisaka
b2d85a02c2 Apply suggestions from code review
Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
Co-authored-by: Bond_009 <bond.009@outlook.com>
2021-12-24 17:03:57 +08:00
nyanmisaka
4b9c84c52e EncodingHelper hwaccel pipelines refactor
separate the HW pipeline according to HWA method for maintainability.
2021-12-24 17:03:57 +08:00
Jonas Resch
d47811bdaf Fix wrong ffmpeg map argument due to wrong calculation 2021-12-08 10:17:25 +01:00
Jonas Resch
99a48554a6
Optimize calculation of external audio stream index in MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2021-12-03 19:19:22 +01:00
Jonas Resch
120828d8d0
Replace escaped quote string with quote character in MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2021-12-03 19:18:43 +01:00
Jonas Resch
0894a6193f Implement coding standards from 2nd code feedback 2021-11-30 19:31:46 +01:00
Jonas Resch
a68e58556c Implement code feedback
- Rewrite AudioResolver
- Use async & await instead of .Result
- Add support for audio containers with multiple audio streams (e.g.
  mka)
- Fix bug when using external subtitle and external audio streams at the
  same time
2021-11-30 19:31:46 +01:00
Jonas Resch
9978164438 Add support for external audio files 2021-11-30 19:31:46 +01:00
Joe Rogers
f73a7a6ed8
Use ImageFormat instead of string for extension 2021-11-12 16:22:11 +01:00
Bond_009
1d19a5be61 Fix some warnings
down to 580
2021-11-09 22:29:33 +01:00
Joe Rogers
e3eee10d05
Add image provider tests and clean up 2021-10-11 14:09:02 +02:00
Joe Rogers
8d70cc2dde
Add support for non-jpg image extractions 2021-10-11 14:09:02 +02:00
Cody Robibero
9234e5bf80 Remove all instances of en-US culture 2021-09-26 09:11:25 -06:00
cvium
30f3be1da0 Merge branch 'master' into keyframe_extraction_v1 2021-09-25 20:52:09 +02:00
Bond_009
13fbfe6091 Target net6.0 2021-09-24 20:15:46 +02:00
cvium
9c15f96e12 Add first draft of keyframe extraction for Matroska 2021-09-23 15:29:12 +02:00
Bond_009
a6d1e542e6 Reduce allocations 2021-09-19 20:53:31 +02:00
Bond_009
0d16c48998 Fix some warnings 2021-09-09 15:59:13 +02:00
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