Commit Graph

214 Commits

Author SHA1 Message Date
Cody Robibero
6004060b4e Fix build errors from new warnings 2022-09-09 07:44:14 -06:00
Cody Robibero
fdd728e9f8
Merge pull request #8259 from RealGreenDragon/subtitle-extraction-timeout 2022-08-16 21:23:39 -06:00
MagicGreenDragon
7391b001ef increased subtitle extraction timeout to 30 min 2022-08-14 08:53:00 +02:00
Shadowghost
3e5cf9395f Backport pull request #8182 from jellyfin/release-10.8.z
Extract external subs from container before determining characterset

Original-merge: 1faee43b1103428392d305cb0d1b46ff3ab6b5fc

Merged-by: Bond-009 <bond.009@outlook.com>

Backported-by: Joshua Boniface <joshua@boniface.me>
2022-08-13 21:46:33 -04:00
Joshua Boniface
38eefbbafa Backport pull request #8087 from jellyfin/release-10.8.z
feat: make subtitleeditparser generic

Authored-by: Claus Vium <cvium@users.noreply.github.com>

Merged-by: Bond-009 <bond.009@outlook.com>

Original-merge: 7323ccfc232d31797af3ceb8bad93cae1ea0898d
2022-08-01 14:25:42 -04:00
Joshua M. Boniface
3061446c87 Merge pull request #7984 from crobibero/dotnet-6.0.6
Upgrade to dotnet 6.0.6, update remaining dependencies

(cherry picked from commit 56e7b323de3e993ba79ed86ef7e9a10f79693156)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-06-29 01:26:36 -04:00
Joshua M. Boniface
e61c80fed7 Merge pull request #7960 from Shadowghost/subrip-encoder-fix
(cherry picked from commit ae79bbc34cb3ecc297b0f21fcf474b6c359a3a33)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-06-29 01:26:15 -04:00
Cody Robibero
eb55f47f2e Merge pull request #7810 from Bond-009/unaccpattern
(cherry picked from commit 5e343d30e198ca57926a13e1a6b05ae232091d86)
Signed-off-by: crobibero <cody@robibe.ro>
2022-06-06 09:16:11 -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
Victor Gambier
dbf9e49258
Increase timeout for subtitle extraction to 30min (#7153) 2022-02-14 16:33:11 +01:00
Cody Robibero
b6489e73ab
Merge pull request #7241 from Bond-009/async5 2022-02-06 15:25:48 -07:00
SenorSmartyPants
509d66dcb5
Fix #7147: Don't return subtitles in mismatched format (#7149) 2022-02-02 23:24:10 +01:00
Bond_009
e7be01d7a5 Flush to disk async where possible 2022-01-22 23:36:42 +01:00
Cody Robibero
7bfc6b5679 Remove more warnings 2021-12-27 07:38:06 -07:00
Bond_009
1d19a5be61 Fix some warnings
down to 580
2021-11-09 22:29:33 +01:00
Thibault Nocchi
f91839dd8c Fix WebVTT region to spec 2021-11-04 15:44:15 +01:00
Dmitry Lyzo
c26e6d89b4 Move FfmpegException to MediaBrowser.Common 2021-10-10 19:48:11 +03:00
Bond_009
9af16fcb6c Remove workaround for dotnet/runtime#42790 2021-10-03 19:52:38 +02:00
Bond_009
f31224fa8f Remove sync FileStream hack 2021-09-25 19:44:40 +02:00
Bond_009
4643fd5dcb Address comments 2021-09-25 18:15:46 +02:00
Bond_009
13fbfe6091 Target net6.0 2021-09-24 20:15:46 +02:00
Bond_009
a6d1e542e6 Reduce allocations 2021-09-19 20:53:31 +02:00
Bond_009
34b38454e0 Fix SubtitleEncoder and add regression tests 2021-09-18 15:23:55 +02:00
Cody Robibero
ea3e66e918 Fix namespace 2021-09-13 06:32:26 -06:00
Bond_009
e3dac4fda2 Use async FileStreams where it makes sense 2021-09-02 14:02:04 +02:00
Bond_009
6f8ccab788 Move non-jellyfin extensions to separate project 2021-06-19 18:04:46 +02:00
Bond_009
0bc0601442 Fix some warnings 2021-05-28 14:33:54 +02:00
Bond_009
26d7fc8280 Enable nullable reference types for MediaBrowser.MediaEncoding.Subtitles 2021-05-20 22:10:19 +02:00
Bond_009
9ed7f429c0 FxCop -> Net Analyzers (part 1) 2021-03-09 03:04:47 +01:00
David
60ffa6f514 Use FileShare.None when creating files 2021-03-07 14:43:28 +01:00
Claus Vium
64730b5661
Merge pull request #5278 from BaronGreenback/STRMFix
Fix for #5168
2021-02-27 20:07:45 +01:00
BaronGreenback
473a995650
Update SubtitleEncoder.cs 2021-02-21 15:53:20 +00: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
M0ssTee
256bb3ee98
Update MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2021-02-04 16:14:57 -05:00
Troy
8c640a1492 Replaced /d with [0-9], see issue #2923 2021-02-01 02:49:23 +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
Bond_009
e4fd61411f Minor improvements 2020-12-02 15:38:52 +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
Bond_009
4b1c9dc9ea Pass cancellation where possible 2020-11-17 19:43:00 +01:00
crobibero
01355e0498 Fix nullability errors in Jellyfin.Api (part 1) 2020-11-13 09:04:31 -07: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
crobibero
30ba35a33b Use HttpClientFactory in SubtitleEncoder 2020-08-31 11:07:40 -06: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