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

854 Commits

Author SHA1 Message Date
Joshua M. Boniface
23ff1fab46
Merge pull request #4984 from Bond-009/subtitleedit 2021-02-22 20:59:49 -05:00
BaronGreenback
473a995650
Update SubtitleEncoder.cs 2021-02-21 15:53:20 +00:00
Bond_009
b1fe28d0a6 Use GetEncodingOptions where possible 2021-02-21 02:58:30 +01:00
Bond_009
141efafd3d Enable TreatWarningsAsErrors for MediaBrowser.Model 2021-02-20 23:29:33 +01:00
Bond_009
65bab55ca0 Minor improvements 2021-02-13 00:39:18 +01:00
Joshua M. Boniface
bd8c269ea2
Merge pull request #5107 from jellyfin/enhanced-nvdec-vpp-tonemap 2021-02-10 01:24:51 -05:00
Bond_009
be965e35b6 Log subtitle errors 2021-02-09 15:12:43 +01:00
Bond_009
ed8fce2dce Use SubtitleEdit to parse subtitles 2021-02-09 15:12:41 +01:00
dkanada
aea1c4f310
Merge pull request #5142 from M0ssTee/updateRegex 
Replaced /d with [0-9], see issue #2923
 2021-02-08 22:52:58 +09:00
nyanmisaka
b0e0e19468 add cuda format converter 2021-02-06 13:21:40 +08:00
M0ssTee
256bb3ee98
Update MediaBrowser.MediaEncoding/Subtitles/AssParser.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2021-02-04 16:14:57 -05:00
David
f854a1ce1f Remove unused files 2021-02-03 11:34:21 +01:00
Troy
8c640a1492 Replaced /d with [0-9], see issue #2923 2021-02-01 02:49:23 +00:00
BaronGreenback
df402df908 fix return 2021-01-21 12:48:43 +00:00
Bond-009
2c74262f7c
Merge pull request #4945 from obradovichv/fix-string-culture-specificity 2021-01-09 16:21:19 +01:00
Bond-009
45c6d79dc9
Merge pull request #4877 from jellyfin/ass 2021-01-08 21:43:45 +01:00
obradovichv
0282a1ed09 Fix string culture specificity 
Fix bug in SsaParser.cs primary color {\1c} formatting that would leave
behind the {\1c} closing token and instead append </font> token
unconditionally to the dialogue text. Add tests.

Change AlphanumComparatorTests.cs complementary test data generation
from an array shuffle to an array reversal. Although it was previously
using a seeded Random, the shuffle itself could result in no
rearrangement of elements if the seed or test data changed over time.
The reversal guarantees reordering of elements and has the added benefit
of simplifying the test code since no special handling is needed for
arrays of 2 elements.

Change DailyTrigger.cs logging of TriggerDate format to
"yyyy-MM-dd HH:mm:ss.fff zzz" for consistency with configured log
timestamp format and change DueTime format to culture-invariant "c"
format.
 2021-01-03 20:17:27 +02:00
Bond_009
5ac36a8b58 Add tests for srt parser 2020-12-28 15:43:55 +01:00
Bond_009
d0382db37d Minor improvements to ass parser 2020-12-28 15:33:15 +01:00
crobibero
1dac2226c4 Remove unused deps 2020-12-22 08:57:51 -07:00
Nyanmisaka
060f6c194f
Apply suggestions from code review 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2020-12-09 16:37:15 +08:00
nyanmisaka
ebd9ab3ccc use larger batch size on mpegts to avoid corrupted thumbnails 2020-12-09 14:39:41 +08:00
Joshua M. Boniface
670f7cacc3
Merge pull request #4651 from crobibero/iso_manager 
Remove IIsoMounter and IsoMounter
 2020-12-04 14:53:09 -05:00
crobibero
ca5c20c988 Remove IIsoMounter and IsoMounter 2020-12-03 07:34:15 -07:00
Bond_009
e4fd61411f Minor improvements 2020-12-02 15:38:52 +01:00
Claus Vium
3b4f86579b
Merge pull request #4610 from nyanmisaka/hdr-extract 
Extract tone mapped thumbnails for HDR videos
 2020-12-02 09:50:54 +01: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
7b5285feac
Apply suggestions from code review 
Co-authored-by: BaronGreenback <jimcartlidge@yahoo.co.uk>
 2020-12-02 08:22:07 +08:00
nyanmisaka
6536c81226 do not extract audio stream bitrate info for videos from formatInfo 2020-12-01 10:55:25 +08:00
Nyanmisaka
421faabc7c
Merge branch 'master' into hdr-extract 2020-12-01 00:59:21 +08:00
nyanmisaka
92118c2129 allow to extract music bitrate info from formatInfo 2020-11-29 22:46:26 +08:00
nyanmisaka
3e9cf98c30 add hdr tone mapping to image extraction 2020-11-29 13:22:42 +08:00
nyanmisaka
c2c06ae15b fix image extraction 2020-11-29 13:20:55 +08:00
nyanmisaka
bb16174936 increase the default image extraction timeout 2020-11-29 13:12:41 +08:00
Nyanmisaka
0c6efe6317
Apply suggestions from code review 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2020-11-28 22:32:54 +08:00
Nyanmisaka
d72f3498bf
fix ci 2020-11-28 21:27:55 +08:00
Nyanmisaka
53c91c2c14
Apply suggestions from code review 
Co-authored-by: BaronGreenback <jimcartlidge@yahoo.co.uk>
 2020-11-28 21:14:55 +08:00
nyanmisaka
d19edefbcd fix image extraction 2020-11-28 20:55:56 +08:00
Joshua M. Boniface
f39e55e2e5
Merge pull request #4548 from orryverducci/mkv-interlaced-fix 
Revert "Fix frame rate probing for interlaced MKV files"
 2020-11-22 13:06:10 -05:00
Orry Verducci
812300ad33 Revert "Fix frame rate probing for interlaced MKV files" 
This reverts commit 84fd5a0953.
 2020-11-22 16:54:41 +00: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
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
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
Bond_009
4b1c9dc9ea Pass cancellation where possible 2020-11-17 19:43:00 +01:00
Fernando Fernández
94cae4f145 Specify threads to ffmpeg properly 2020-11-17 16:44:04 +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
Fernando Fernández
a6ad36b57a Don't scale images extracted by ffmpeg 2020-11-17 14:20:18 +01:00
nyanmisaka
488dbdb31d Merge remote-tracking branch 'upstream/master' into fmp4-hls 2020-11-16 12:36:55 +08:00
crobibero
dae4541bad Merge remote-tracking branch 'upstream/master' into dotnet-5 2020-11-15 11:56:35 -07:00
Bond_009
ff49a3bb61
Missed some stuff 2020-11-14 20:28:15 +01:00
crobibero
01355e0498 Fix nullability errors in Jellyfin.Api (part 1) 2020-11-13 09:04:31 -07:00
crobibero
e82829c444 Fix nullability errors in MediaBrowser.MediaEncoding 2020-11-13 09:01:55 -07:00
nyanmisaka
6987cb8357 fix ci 2020-11-11 17:25:14 +08:00
nyanmisaka
57e5b59b93 adjust bitrate limit for HLS audio codecs 2020-11-11 17:10:08 +08:00
crobibero
83629ab6f2 Update packages to net5 2020-11-10 09:52:34 -07:00
Stan
3bb8884e16
Merge branch 'master' into bdiso-playback 2020-10-28 13:18:05 +01:00
Orry Verducci
84fd5a0953 Fix frame rate probing for interlaced MKV files 2020-10-25 16:35:03 +00: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
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
BaronGreenback
5464eaed4a
Update EncoderValidator.cs 2020-09-19 16:40:39 +01:00
crobibero
2a8653b309 Merge remote-tracking branch 'upstream/master' into http-client-migrate 2020-09-04 08:16:49 -06:00
Nyanmisaka
4cb0a57e46
Merge branch 'master' into tonemap 2020-09-04 02:55:57 +08:00
crobibero
30ba35a33b Use HttpClientFactory in SubtitleEncoder 2020-08-31 11:07:40 -06:00
crobibero
8b96881aa1 Clean up json Converters 2020-08-26 08:22:48 -06:00
Bond_009
119f64f5e7 Make some methods async 2020-08-21 22:01:19 +02:00
Anthony Lavado
72115c91e0
Merge pull request #3943 from Bond-009/ffmpeg 
Simplify FFmpeg detection code
 2020-08-21 15:04:58 -04:00
Bond-009
6292a9e4e9
Merge branch 'master' into warn24 2020-08-20 18:50:15 +02:00
Bond_009
301e029d42 Add unsupported ffmpeg version to tests 2020-08-20 17:45:40 +02:00
Bond_009
cb5cb075a9 Simplify FFmpeg detection code 2020-08-20 17:16:09 +02:00
Bond-009
5160e627f1
Merge branch 'master' into feature/ffmpeg-version-check 2020-08-20 16:40:03 +02:00
Bond_009
ab2147751f Make MediaBrowser.MediaEncoding warnings free 2020-08-20 12:16:24 +02:00
Bond_009
2b400c99ef Fix warnings 2020-08-19 17:50:50 +02:00
Bond-009
d9f6953416 Minor fixes 2020-08-04 17:14:07 +02:00
Bond-009
53f99d5d4b Add some analyzers to MediaBrowser.MediaEncoding 2020-08-04 17:08:09 +02:00
Bond-009
18efa25a6f Enable TreatWarningsAsErrors for MediaBrowser.MediaEncoding 2020-08-04 16:20:52 +02:00
Nyanmisaka
c23d991c95
Merge branch 'master' into tonemap 2020-08-03 14:58:44 +08:00
Bond_009
d4092846e4 Optimize Substring and StringBuilder usage 2020-07-29 13:17:01 +02:00
Nyanmisaka
df6b303da7
Merge branch 'master' into tonemap 2020-07-27 13:57:40 +08:00
Odd Stråbø
591fcf7ff2 Fix formating 2020-07-25 13:41:04 +02:00
Odd Stråbø
27709c9bb3 Fix embedded subtitles 2020-07-25 12:44:31 +02: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
3ff110984a
Merge branch 'master' into readonlyspan 2020-07-24 09:40:44 +02:00
Anthony Lavado
0cb2cd9456
Merge pull request #3576 from HelloWorld017/fix/sami-utf16 
Fix SAMI UTF-16 Encoding Bug
 2020-07-23 17:48:04 -07:00
Joshua M. Boniface
6f2b23b3df
Merge pull request #3613 from Bond-009/regex 
Replace \d with [0-9] in ffmpeg detection and scan code
 2020-07-23 18:07:01 -04:00
Bond-009
323fc576a5
Merge pull request #3521 from sachk/master 
Fix support for mixed-protocol subtitles
 2020-07-23 14:22:41 +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
Bond_009
e98351b912 Replace \d with [0-9] in ffmpeg detection and scan code 2020-07-20 14:14:15 +02:00
Khinenw
6e069f925b Fix SAMI UTF-16 Encoding Bug 2020-07-18 04:53:05 +00: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
Sacha Korban
29c4220227 Fix support for mixed-protocol external subtitles 2020-07-07 19:54:11 +10:00
Patrick Barron
6d1b00da64 Use Array.Empty 2020-07-04 11:54:25 -04:00
nyanmisaka
f5c5352861 add FFmpeg 4.3 detection and tests 2020-07-04 19:14:49 +08:00
Max Git
3588ee5229 Merge branch 'master' into feature/ffmpeg-version-check 2020-07-02 23:50:13 +02:00
Neil Burrows
6b532b3da5
User string.Empty instead of "" 
Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
 2020-06-29 20:52:20 +01:00
Neil Burrows
4389773508 Respect FFMpeg path passed via Environment Variable 2020-06-29 17:17:28 +01:00
Max Git
c35c401d65 Merge branch 'master' into feature/ffmpeg-version-check 2020-06-23 09:20:50 +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
8de6452967
fix some documentation periods 2020-06-20 18:13:11 +12:00
Max Git
33f78df051 Merge branch 'master' into feature/ffmpeg-version-check 2020-06-17 02:52:38 +02: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
Max Git
e6c197b969 Cleanup 2020-06-16 01:09:41 +02:00
telans
9018f8d8be
Add full stop at end of comments (SA1629) 2020-06-16 10:37:52 +12:00
Max Git
ef3200e178 Remove redundant cast 2020-06-15 19:50:09 +02:00
Max Git
11f3a0dc58 Use Version instead of double. Use correct version number for libavdevice. 2020-06-15 15:10:59 +02:00
dkanada
dabb869a6b
Merge branch 'master' into hwaccel 2020-06-15 20:21:25 +09:00
Max Git
37e737e012 Merge from master & fix conflict 2020-06-15 12:12:03 +02: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
dkanada
403cd3205f
Merge pull request #3254 from crobibero/ilogger 
Use typed logger where possible
 2020-06-13 00:29:43 +09:00
Max Git
0f69ca8fa9 Merge branch 'master' into feature/ffmpeg-version-check 2020-06-11 20:47:12 +02:00
Max Git
620a1a106d Merge branch 'master' into feature/ffmpeg-version-check 2020-06-11 14:50:29 +02:00
dependabot[bot]
33f70bd5f0
Bump System.Text.Encoding.CodePages from 4.7.0 to 4.7.1 
Bumps [System.Text.Encoding.CodePages](https://github.com/dotnet/corefx) from 4.7.0 to 4.7.1.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-11 10:30:11 +00:00
artiume
0476acf5d5 Update EncoderValidator.cs 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
aled
22a860a806 Fix a small number of compile warnings 2020-06-06 20:17:49 +01:00
crobibero
44957c5a9a Use typed logger where possible 2020-06-05 18:15:56 -06:00
Max Git
5df00cb2b8 Merge branch 'master' into feature/ffmpeg-version-check 2020-06-03 12:26:50 +02:00
rotvel
480fd0a66a
Update MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-06-01 16:00:58 +02:00
Max Git
e103d087d3 Try harder at detecting FFmpeg version and enable the validation 2020-06-01 07:10:15 +02:00
Vasily
aa17a53e83 Skip only line saying "Hardware acceleration methods:" instead of some random one 2020-05-26 19:05:44 +03:00
Vasily
628734931c Fix missing commas and merge defects 2020-05-26 18:49:15 +03:00
artiume
3c82379759 Update EncoderValidator.cs 2020-05-26 18:29:58 +03:00
artiume
407de0209e Update MediaEncoder.cs 2020-05-26 18:29:58 +03:00
artiume
1ff95289ef Update EncoderValidator.cs 2020-05-26 18:29:58 +03:00
nyanmisaka
b4b93995f7 add more separate hw decoding toggles 2020-05-26 18:06:49 +03:00
Bond_009
10e381f66f Fix some 'bugs' flagged by sonarcloud 2020-05-25 23:52:51 +02:00
dkanada
4b4b50f3ee
Merge pull request #3115 from MrTimscampi/ffprobe 
Parse color transfer and color primaries from ffprobe, and fix video range
 2020-05-18 00:06:07 +09:00
MrTimscampi
9314434bbf Fix suggestions 2020-05-16 17:35:34 +02:00
MrTimscampi
2e18142bb3 Add color primaries to ffprobe output 2020-05-14 18:52:42 +02:00
MrTimscampi
428e1b04fc Add color transfer to ffprobe results 2020-05-14 18:11:32 +02:00
MrTimscampi
a262ecd9c7 Add positionning cues to WebVTT writer 2020-05-09 20:47:05 +02:00
Max Git
cee587d6e3 Try harder to find ffmpeg in app directory. While here do some cleanup 2020-04-27 03:25:57 +02:00
Mark Monteiro
8f02fb9a4f Remove unused usings 
This addresses the new issues identified in SonarCloud analysis
 2020-04-22 13:09:59 -04:00
Bond-009
d744d7d234 Merge branch 'master' into register-services-correctly 2020-04-22 13:05:03 -04: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
Bond_009
a73e1f18b6 Minor improvements 2020-04-19 11:16:09 +02: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
Mark Monteiro
4113288278 Fix style issues 2020-04-11 13:46:31 -04:00
Mark Monteiro
7152b55747 Use a separate line for each property initializer 2020-04-11 13:28:21 -04:00