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

900 Commits

Author SHA1 Message Date
Negulici-R. Barnabas
1e41636e30
Merge branch 'jellyfin:master' into master 2022-08-22 07:19:39 +03: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
Negulici-R. Barnabas
5196f63d43
Merge branch 'jellyfin:master' into master 2022-08-14 08:15:01 +03:00
Shadowghost
3e5cf9395f Backport pull request #8182 from jellyfin/release-10.8.z 
Extract external subs from container before determining characterset

Original-merge: 1faee43b11

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

Backported-by: Joshua Boniface <joshua@boniface.me>
 2022-08-13 21:46:33 -04:00
Negulici-R. Barnabas
c1d990c9a3
Merge branch 'jellyfin:master' into master 2022-08-02 17:16:01 +03: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: 7323ccfc23
 2022-08-01 14:25:42 -04:00
Negulici-R. Barnabas
5121baa9e8
Merge branch 'jellyfin:master' into master 2022-07-21 16:41:30 +03:00
Joshua Boniface
be3d57ad41 Backport pull request #8115 from jellyfin/release-10.8.z 
Update to dotnet 6.0.7

Authored-by: Cody Robibero <cody@robibe.ro>

Merged-by: Joshua M. Boniface <joshua@boniface.me>

Original-merge: d0fd23bb4b
 2022-07-20 19:29:09 -04:00
Negulici-R. Barnabas
12ec0e285d Chapter Images: 
- chapter image extraction intervals, limit count and resolutions can be set by the user from the server general settings;
 2022-07-18 17:50:52 +03: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 56e7b323de)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
 2022-06-29 01:26:36 -04:00
Joshua M. Boniface
fe32b5e333 Merge pull request #7964 from jellyfin/dovi-side-data 
(cherry picked from commit 39d185c7b1)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
 2022-06-29 01:26:15 -04:00
Joshua M. Boniface
e61c80fed7 Merge pull request #7960 from Shadowghost/subrip-encoder-fix 
(cherry picked from commit ae79bbc34c)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
 2022-06-29 01:26:15 -04:00
Cody Robibero
a65397ae14 Merge pull request #7950 from nyanmisaka/brighter-vpp-tonemap 
(cherry picked from commit b36543275f)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
 2022-06-29 01:26:15 -04:00
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 8595a979a8)
Signed-off-by: crobibero <cody@robibe.ro>
 2022-06-10 23:43:17 -04:00
Cody Robibero
eb55f47f2e Merge pull request #7810 from Bond-009/unaccpattern 
(cherry picked from commit 5e343d30e1)
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 60affd0965)
Signed-off-by: crobibero <cody@robibe.ro>
 2022-05-20 18:30:56 -04:00
dependabot[bot]
812841d01e
Bump StyleCop.Analyzers from 1.2.0-beta.406 to 1.2.0-beta.435 (#7726) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-09 15:24:09 +02:00
Cody Robibero
8056b0e961
Merge pull request #7443 from whiteowl3/strm-probe 2022-03-25 13:33:10 -06:00
whiteowl3
6a7775de6e empty line required by linter 2022-03-25 19:08:03 +00:00
whiteowl3
16a449a023
Apply suggestions from code review 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2022-03-23 13:19:05 -04:00
Nils Fürniß
d7d36a102a
Fix releasing lock 2022-03-22 19:17:49 +01:00
Nils Fürniß
b4bb82b6d7
Improve code 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
Cody Robibero
c512e783b3
Merge pull request #7480 from jellyfin/dependabot/nuget/StyleCop.Analyzers-1.2.0-beta.406 2022-03-21 11:10:06 -06:00
dependabot[bot]
5d44e45b90
Bump libse from 3.6.4 to 3.6.5 
Bumps [libse](https://github.com/SubtitleEdit/subtitleedit) from 3.6.4 to 3.6.5.
- [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.4...3.6.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-21 12:22:20 +00:00
dependabot[bot]
dde984bd0e
Bump StyleCop.Analyzers from 1.2.0-beta.376 to 1.2.0-beta.406 
Bumps [StyleCop.Analyzers](https://github.com/DotNetAnalyzers/StyleCopAnalyzers) from 1.2.0-beta.376 to 1.2.0-beta.406.
- [Release notes](https://github.com/DotNetAnalyzers/StyleCopAnalyzers/releases)
- [Commits](https://github.com/DotNetAnalyzers/StyleCopAnalyzers/compare/1.2.0-beta.376...1.2.0-beta.406)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-21 12:22:11 +00:00
Cody Robibero
28223704f3
Merge pull request #7441 from 1337joe/add-external-stream-indicator 
Add label for external audio/sub tracks
 2022-03-11 07:48:23 -07:00
whiteowl3
6f25291931 allow strm probe to succeed 2022-03-11 06:54:25 +00:00
Joe Rogers
1a307db7eb
Add label for external audio/sub tracks 2022-03-10 22:20:35 +01:00
Mayur Panchal
96de01ce01
ProbeResultNormalizer: fix framerate compare + tests (#7167) 2022-03-10 20:55:30 +01:00
nyanmisaka
bfc27e494b Remove the deprecated OMX and MMAL HWA 2022-03-05 21:47:59 +08:00
Bond-009
7d226e8eef
Merge pull request #7376 from GermanCoding/fix_soundhandler 2022-03-01 11:24:20 +01:00
Bond-009
eff3d3e67e
Merge pull request #7275 from Nalsai/burn-subtitle-attached-fonts 2022-03-01 11:21:19 +01:00
GermanCoding
11bb834957 Remove superfluous "SoundHandler" from audio stream names 2022-02-28 17:44:23 +01:00
Joe Rogers
175ddff169
Switch chapter id to long to not break on ffmpeg 5.0 2022-02-27 21:04:11 +01:00
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