aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
AgeCommit message (Collapse)Author
2022-07-20Backport pull request #8104 from jellyfin/release-10.8.zJoshua Boniface
Add resolution text output for more resolutions Authored-by: Shadowghost <Ghost_of_Stone@web.de> Merged-by: Bond-009 <bond.009@outlook.com> Original-merge: 2b46917dcf7af970dc95d4ef0bbfebac7a520d25
2022-07-13bump Jellyfin to 10.9Cody Robibero
2022-07-03Add escape hatch for Series mergingMikal Stordal
This is an universal solution for plugins to override how series are merged. The reason to override is so we can set the same provider id on multiple items without merging them, while using another id for merging them. Having an (optional) provider id not tied to any online database allows plugins to use their own rules for merging series.
2022-06-29Merge pull request #7984 from crobibero/dotnet-6.0.6Joshua M. Boniface
Upgrade to dotnet 6.0.6, update remaining dependencies (cherry picked from commit 56e7b323de3e993ba79ed86ef7e9a10f79693156) Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-06-29Merge pull request #7964 from jellyfin/dovi-side-dataJoshua M. Boniface
(cherry picked from commit 39d185c7b19ed2da1ae46566152fb1cf182266cd) Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-06-29Merge pull request #7960 from Shadowghost/subrip-encoder-fixJoshua M. Boniface
(cherry picked from commit ae79bbc34cb3ecc297b0f21fcf474b6c359a3a33) Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-06-29Merge pull request #7950 from nyanmisaka/brighter-vpp-tonemapCody Robibero
(cherry picked from commit b36543275f8e1c380f5c247a04a48d5d96eb5836) Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-06-29Merge pull request #7947 from nyanmisaka/video-range-conditionCody Robibero
(cherry picked from commit f1d56aa5cef4c60021e0b29c5d9fb3adf384fda7) Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-06-29Merge pull request #7940 from Shadowghost/fix-recommendationsCody Robibero
(cherry picked from commit 674931324926368791a47d7bd7ce59b4248f5a71) Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-06-14Fix splashscreen (#7895)Cody Robibero
2022-06-14Merge pull request #7885 from iwalton3/fix-navigation-buttonsClaus Vium
Prevent 400 error when using navigation buttons. (cherry picked from commit 8b69b0f5217e7dcda395449a56d59571b264b2a6) Signed-off-by: crobibero <cody@robibe.ro>
2022-06-10Merge pull request #7854 from cvium/enable_mkv_keyframe_extractionCody Robibero
(cherry picked from commit 2a89683e8019a196b087138531b3958d4f68789d) Signed-off-by: crobibero <cody@robibe.ro>
2022-06-10Merge pull request #7828 from nyanmisaka/fix-dovi-tonemapBond-009
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-06Merge pull request #7781 from crobibero/live-tv-infiniteCody Robibero
(cherry picked from commit 77c73e241fe1705528e3ffbb42f074c46240b9fb) Signed-off-by: crobibero <cody@robibe.ro>
2022-05-20Merge pull request #7766 from crobibero/dotnet-6.0.5Joshua M. Boniface
(cherry picked from commit 71bf56704535d0afa7d4955f03d287d40c9a98a3) Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-05-20Merge pull request #7749 from cvium/disable_auto_add_collectionJoshua M. Boniface
(cherry picked from commit 8119e4a5731e573ef3d1d064384b0ab0b4045191) Signed-off-by: crobibero <cody@robibe.ro>
2022-05-20Merge pull request #7712 from jellyfin/fix-hevc-disable-optionJoshua M. Boniface
(cherry picked from commit 5a9e5e0d5dc9179dd816f7ec93cc21dc8a02468a) Signed-off-by: crobibero <cody@robibe.ro>
2022-05-20Merge pull request #7699 from Shadowghost/streambuilder-fixJoshua M. Boniface
(cherry picked from commit b46d61dfdf5e068a9feb26d8b41377a9fdb2cba6) Signed-off-by: crobibero <cody@robibe.ro>
2022-05-09Bump StyleCop.Analyzers from 1.2.0-beta.406 to 1.2.0-beta.435 (#7726)dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-28Merge pull request #7654 from Shadowghost/nfo-provider-fixCody Robibero
Prefer MetadataProvider enum as provider id key over arbitrary strings (cherry picked from commit a2abae3014578e8d9c7f1b54140fe3dcf1503ad2) Signed-off-by: crobibero <cody@robibe.ro>
2022-04-28Merge pull request #7624 from nielsvanvelzen/quickconnect-enable-dCody Robibero
(cherry picked from commit 1d5961126e6b8415ebd494a56acddd68624cd75b) Signed-off-by: crobibero <cody@robibe.ro>
2022-04-17Merge pull request #7590 from crobibero/dotnet-6.0.4Joshua M. Boniface
(cherry picked from commit 5778541d2fa9a6a2732b715e8c60421e44e035da) Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-04-17Merge pull request #7537 from dmitrylyzo/fix-streambuilderCody Robibero
(cherry picked from commit 5833c707259247338c27b1a75a175c5aba925c29) Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-04-07Merge pull request #7523 from crobibero/null-streamCody Robibero
Allow media without streams to playback (cherry picked from commit 577325b7888c5769c9d9c329ebd40e5f388242ad) Signed-off-by: crobibero <cody@robibe.ro>
2022-04-04Bump MimeTypes from 2.3.0 to 2.4.0 (#7552)dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-26Fix TranscodeReasons property nameCody Robibero
2022-03-25Fix DLNA DirectPlayShadowghost
2022-03-25Merge pull request #7198 from dmitrylyzo/transcode-conditionsJoshua M. Boniface
2022-03-21Bump StyleCop.Analyzers from 1.2.0-beta.376 to 1.2.0-beta.406dependabot[bot]
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-20Fix remuxingDmitry Lyzo
2022-03-20Add TranscodingProfile conditionsDmitry Lyzo
2022-03-19Use requested bitrate for calculationsCody Robibero
2022-03-18Move StreamBuilderTests to correct project (#7461)Bond-009
2022-03-17Prefer Cuvid to Nvdec by default for better performanceNyanmisaka
2022-03-13Revert using Math.ClampCody Robibero
2022-03-12Merge pull request #7325 from eyezak/issue/6450Cody Robibero
2022-03-12Fix flipped Clamp argsCody Robibero
2022-03-11Merge pull request #7441 from 1337joe/add-external-stream-indicatorCody Robibero
Add label for external audio/sub tracks
2022-03-11Merge pull request #7346 from Bond-009/guidClaus Vium
Optimize Guid comparisons
2022-03-10Add label for external audio/sub tracksJoe Rogers
2022-03-10Merge pull request #7432 from Bond-009/socketfactoryCody Robibero
2022-03-10Merge pull request #7434 from crobibero/dotnet-6.0.3Joshua M. Boniface
2022-03-08Update to dotnet 6.0.3Cody Robibero
2022-03-08SocketFactory: Remove redundant codeBond_009
ExclusiveAddressUse should be false by default afaik
2022-03-06Suggestions from reviewCody Robibero
2022-03-06Remove TranscodeReason.None, Add JsonFlagEnum testsCody Robibero
2022-03-06Clean up EnumFlags serializationCody Robibero
2022-03-06Update MediaBrowser.Model/Dlna/StreamBuilder.csIsaac Gordezky
Co-authored-by: Cody Robibero <cody@robibe.ro>
2022-03-06Fix transcode video matching and add tests for Transcode and SafariIsaac Gordezky
2022-03-06Series: issue-6450Isaac Gordezky
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