Commit Graph

1064 Commits

Author SHA1 Message Date
Victor Gambier
dbf9e49258
Increase timeout for subtitle extraction to 30min (#7153) 2022-02-14 16:33:11 +01:00
Nils Fürniß
ab40554759
add extracting attachments for ffmpeg to burn subs 2022-02-10 01:01:08 +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
Shadowghost
4a3f1a51d2 chore(artist-split): add more artists to split whitelist 2022-01-27 22:01:40 +01:00
Bond_009
e7be01d7a5 Flush to disk async where possible 2022-01-22 23:36:42 +01:00
Bond_009
2dcb2f8a9f Ban the usage of Task.Result
If the calling function can't be made async easily you can still use
.GetAwaiter().GetResult(), which is way easier to find in the future
2022-01-22 16:48:31 +01: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
7bfc6b5679 Remove more warnings 2021-12-27 07:38:06 -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
7db753d247 reduce tonemap cpu usage, add deint and AR support in thumbnails
Co-authored-by: Orry Verducci <orry@orryverducci.co.uk>
2021-12-24 17:03:57 +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
cvium
b880dc8a4a Use our own Contains extension 2021-12-20 13:31:07 +01:00
Bond_009
968c534864 Return null on division by zero 2021-12-18 14:56:10 +01:00
Bond_009
f8fcbc88fc Add tests for ProbeResultNormalizer.GetFrameRate 2021-12-18 14:56:10 +01:00
Bond_009
510f92f4c5 Don't check floats for equality 2021-12-12 01:26:47 +01:00
Cody Robibero
2a82f8dc40
Merge pull request #6222 from orryverducci/mbaff-interlace-detection 2021-12-11 13:54:52 -07:00
Benoît Dardenne
de2d292197
Added artist to '/' split whitelist 2021-12-09 16:07:57 +01:00
dependabot[bot]
c4c7d7431f
Bump libse from 3.6.2 to 3.6.4
Bumps [libse](https://github.com/SubtitleEdit/subtitleedit) from 3.6.2 to 3.6.4.
- [Release notes](https://github.com/SubtitleEdit/subtitleedit/releases)
- [Changelog](https://github.com/SubtitleEdit/subtitleedit/blob/master/Changelog.txt)
- [Commits](https://github.com/SubtitleEdit/subtitleedit/compare/3.6.2...3.6.4)

---
updated-dependencies:
- dependency-name: libse
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-06 13:29:10 +00:00
dependabot[bot]
29095ab390
Bump BDInfo from 0.7.6.1 to 0.7.6.2
Bumps [BDInfo](https://github.com/jellyfin/BDInfo) from 0.7.6.1 to 0.7.6.2.
- [Release notes](https://github.com/jellyfin/BDInfo/releases)
- [Commits](https://github.com/jellyfin/BDInfo/commits)

---
updated-dependencies:
- dependency-name: BDInfo
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-06 12:01:19 +00:00
Orry Verducci
e446e9fde9
Merge branch 'master' into mbaff-interlace-detection 2021-12-01 22:13:52 +00:00
Joe Rogers
1d729b2b0f
Use codec to determine image format 2021-11-12 16:30:30 +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
Cody Robibero
40045d2147 Update to full dotnet 6 2021-11-08 09:40:12 -07:00
Thibault Nocchi
f91839dd8c Fix WebVTT region to spec 2021-11-04 15:44:15 +01:00
dependabot[bot]
2372931b13
Bump UTF.Unknown from 2.4.0 to 2.5.0
Bumps [UTF.Unknown](https://github.com/CharsetDetector/UTF-unknown) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/CharsetDetector/UTF-unknown/releases)
- [Commits](https://github.com/CharsetDetector/UTF-unknown/compare/v2.4...v2.5)

---
updated-dependencies:
- dependency-name: UTF.Unknown
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 12:01:04 +00:00
Orry Verducci
9abe9e7e54 Add rounding to the time base check 2021-10-31 17:04:04 +00:00
Orry Verducci
3a89e88033 Merge remote-tracking branch 'upstream/master' into mbaff-interlace-detection 2021-10-31 10:04:14 +00:00
Bond-009
ca217270b7
Merge pull request #6544 from cvium/fix_ffmpeg_path_updating 2021-10-24 01:09:44 +02:00
Claus Vium
768ec60e11
Merge pull request #6689 from 1337joe/expand-image-extraction 2021-10-21 23:05:32 +02:00
Joe Rogers
31baea072a
Address review comments
Clean up style
Fix references in class summaries
Combine Where+FirstOrDefault queries
Break up large method, long lines
Add validation on file extension
Apply test naming conventions
Extract mock of Movie class, comment on why not mocking interface

Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2021-10-20 14:10:16 +02:00
Cody Robibero
2b10251b32 Update to dotnet6.rc2 2021-10-12 18:31:58 -06: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
Joe Rogers
6ce8cce12c
Add handling for embedded background and logo 2021-10-11 14:09:01 +02:00
Dmitry Lyzo
c26e6d89b4 Move FfmpegException to MediaBrowser.Common 2021-10-10 19:48:11 +03:00
Claus Vium
1156699481
Merge pull request #6657 from Bond-009/dotnetbug 2021-10-09 12:19:44 +02:00
Claus Vium
b16e6621b3
Merge pull request #6663 from crobibero/dotnet-6-rc1
Reference dotnet6-rc1 packages
2021-10-08 16:06:15 +02:00
Dominik Krivohlavek
ef99225c40
Add 22/7 to split whitelist 2021-10-06 10:32:28 +02:00
Cody Robibero
017380f1dd Reference dotnet6-rc1 packages 2021-10-04 07:43:40 -06:00
Bond_009
9af16fcb6c Remove workaround for dotnet/runtime#42790 2021-10-03 19:52:38 +02:00
KonH
e3fccd5ae6 Fix warning: Qualifier is redundant (#2149) 2021-10-03 11:01:40 +07:00
Joe Rogers
ce0457faf5
Add mp4 track title fallback (#6638) 2021-09-30 23:53:33 +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
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
cvium
9c15f96e12 Add first draft of keyframe extraction for Matroska 2021-09-23 15:29:12 +02:00
Claus Vium
a353081ea3
Update MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs 2021-09-21 22:54:11 +02:00
cvium
95f344722c Don't set ffmpeg path from null to its Display value + add 404 2021-09-21 18:51:15 +00:00
Bond_009
52585a865e Validate ffmpeg path 2021-09-21 13:28:34 +02:00
Bond_009
653df7d8e5 Specify DateTimeStyles when possible 2021-09-21 01:21:45 +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
dependabot[bot]
b53c36ee4a
Bump libse from 3.6.0 to 3.6.2
Bumps [libse](https://github.com/SubtitleEdit/subtitleedit) from 3.6.0 to 3.6.2.
- [Release notes](https://github.com/SubtitleEdit/subtitleedit/releases)
- [Changelog](https://github.com/SubtitleEdit/subtitleedit/blob/master/Changelog.txt)
- [Commits](https://github.com/SubtitleEdit/subtitleedit/compare/3.6.0...3.6.2)

---
updated-dependencies:
- dependency-name: libse
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-13 12:01:30 +00:00
Claus Vium
74fef6c05b
Merge pull request #6177 from Bond-009/async
Use async FileStreams where it makes sense
2021-09-06 13:55:34 +02:00
Bond-009
3ec7ecf399
Merge pull request #6358 from MrTimscampi/audio-people 2021-09-03 17:15:58 +02:00
Bond_009
e3dac4fda2 Use async FileStreams where it makes sense 2021-09-02 14:02:04 +02:00
Bond-009
855f9c4a8e
Merge pull request #6425 from boolemancer/boolemancer/fix_image_extractor
Fix explicit stream selection in MediaEncoder.ExtractImageInternal
2021-09-01 18:24:29 +02: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
MrTimscampi
7f52cda03c Make performer regex static 2021-08-16 00:22:36 +02:00
MrTimscampi
d82c2e4237 Address comments 2021-08-16 00:22:36 +02:00
MrTimscampi
c9b1cd1d8c Add some new music-related person types and parse from ffprobe 2021-08-16 00:22:36 +02:00
MrTimscampi
f35a527608 Add performers to the ffprobe normalization for audio 2021-08-16 00:22:36 +02:00
boolemancer
2345646ff1 Fix explicit stream selection in MediaEncoder.ExtractImageInternal 2021-08-14 02:55:51 -07:00
Nyanmisaka
a84dc794c6
Merge branch 'master' into tonemap-overlay 2021-08-13 15:01:06 +08:00
Claus Vium
408d5c78a9
Merge pull request #6262 from MrTimscampi/scanner-prefer-original-date 2021-08-11 12:39:05 +02:00
dependabot[bot]
c4d8e6f056
Bump UTF.Unknown from 2.3.0 to 2.4.0
Bumps [UTF.Unknown](https://github.com/CharsetDetector/UTF-unknown) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/CharsetDetector/UTF-unknown/releases)
- [Commits](https://github.com/CharsetDetector/UTF-unknown/compare/v2.3...v2.4)

---
updated-dependencies:
- dependency-name: UTF.Unknown
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-09 12:00:53 +00:00
Julien Machiels
6c2cbafee0
Update MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2021-08-08 16:37:35 +02:00
MrTimscampi
ba609aefea Attempt to parse YYYY format dates in GetDictionaryDateTime
DateTime.TryParse doesn't properly parse year-only dates, so parsing results from FFProbe sometimes returns null (for example, some music tagged with Beets has yyyy format dates for release dates).
As a result, Jellyfin would previously no get the date from the FFProbe results.
This adds DateTime.TryParseExact with a format of 'yyyy' as a fallback, to attempt to properly parse the value, even if it's only a year.
2021-08-07 22:11:32 +02:00
MrTimscampi
534e088105 Prefer original data when getting premiere date from ffprobe 2021-08-07 22:02:43 +02:00
Rich Lander
c07e83fdf8
Invert code and style analysis configuration (#6334)
Co-authored-by: Bond-009 <bond.009@outlook.com>
2021-07-30 09:49:28 +02:00
nyanmisaka
3beda02d92 add support for cuda tonemap and overlay 2021-07-25 00:52:16 +08:00
natedawg
6957bc9a12 Fix spelling of artist K/DA in splitting whitelist 2021-07-10 16:26:42 -07:00
MrTimscampi
020c0fc4cb Add more artist names to the splitting whitelist 2021-07-10 17:09:44 +02:00
Maxr1998
11a5551218
Refactor ProbeResultNormalizer
Improve code structure and readability
2021-07-09 02:06:38 +02:00
Orry Verducci
d5b63092ed Add H.264 MBAFF interlace check
Use the codec time base to determine if a MBAFF coded H.264 file is interlaced.
2021-06-24 17:51:35 +01:00
Bond_009
6f8ccab788 Move non-jellyfin extensions to separate project 2021-06-19 18:04:46 +02:00
Stan
adf406b182
Fix playback of complex BluRay ISOs (#6166) 2021-06-10 20:07:28 +02:00
Bond_009
0bc0601442 Fix some warnings 2021-05-28 14:33:54 +02:00
Claus Vium
b12f509de3
Merge pull request #5696 from Maxr1998/fix-music-video-metadata-probing 2021-05-27 10:20:22 +02:00
Bond_009
26d7fc8280 Enable nullable reference types for MediaBrowser.MediaEncoding.Subtitles 2021-05-20 22:10:19 +02:00
Bond_009
e432796f6f Minor improvements 2021-05-05 14:39:50 +02:00
BaronGreenback
2e98de9062
Code Clean up: Convert to null-coalescing operator ?? (#5845)
Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
2021-05-05 13:51:14 +02:00
BaronGreenback
f2c10471bf
Code Clean up: Use Pattern Matching (#5838)
Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
2021-05-05 13:37:36 +02:00
Bond-009
eeb5d4bd1e
Merge pull request #5842 from BaronGreenback/optimization
Code Clean up: Group Methods
2021-04-29 21:14:57 +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
BaronGreenback
bb6fddde9a Group Methods 2021-04-17 11:19:09 +01:00
Maxr1998
24ac8a1223
Improve metadata probing to better support music videos 2021-04-06 15:34:29 +02:00
Maxr1998
873ad72c18
Support MKV DATE_RELEASED tag for PremiereDate
https://www.matroska.org/technical/tagging.html#temporal-information
2021-04-04 15:41:01 +02:00
Maxr1998
8d27e10cb6
Interpret ffprobe date as UTC
Currently, dates are parsed according to the local time, which results in potentially wrong data being stored in the database after normalizing to UTC - e.g. 2021-04-04 would be stored as '2021-04-03 22:00:00Z' and displayed in the UI as 03.04.2021.
2021-04-04 15:13:54 +02:00
Maxr1998
e0f513232b
Reduce nesting 2021-04-04 15:13:54 +02:00
MrTimscampi
ef9eba8bc9 Ignore format for ISO files 2021-03-25 12:23:29 +01:00
Bond_009
a8ed753f6c FxCop -> Net Analyzers (part 2) 2021-03-13 22:33:28 +01:00
Bond_009
d202df6e8a Remove useless line 2021-03-09 03:22:51 +01: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
dependabot[bot]
fef43c556d
Bump libse from 3.5.8 to 3.6.0
Bumps [libse](https://github.com/SubtitleEdit/subtitleedit) from 3.5.8 to 3.6.0.
- [Release notes](https://github.com/SubtitleEdit/subtitleedit/releases)
- [Changelog](https://github.com/SubtitleEdit/subtitleedit/blob/master/Changelog.txt)
- [Commits](https://github.com/SubtitleEdit/subtitleedit/compare/3.5.8...3.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-01 12:00:38 +00:00
Claus Vium
64730b5661
Merge pull request #5278 from BaronGreenback/STRMFix
Fix for #5168
2021-02-27 20:07:45 +01:00
Claus Vium
e5f99762e2
Merge pull request #5073 from BaronGreenback/ffmpeg
Fix for 4933: Alternative ffmpeg fix
2021-02-27 19:55:52 +01:00
Joshua M. Boniface
7ece3c5523
Merge pull request #5273 from Bond-009/warn31 2021-02-22 21:00:46 -05:00
Joshua M. Boniface
c0c4aff8a6
Merge pull request #5276 from Bond-009/minor12 2021-02-22 21:00:34 -05:00
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