Commit Graph

654 Commits

Author SHA1 Message Date
Cody Robibero bacb41e142 Merge pull request #7854 from cvium/enable_mkv_keyframe_extraction
(cherry picked from commit 2a89683e80)
Signed-off-by: crobibero <cody@robibe.ro>
2022-06-10 23:43:18 -04:00
Joshua M. Boniface 1b020b8abb Merge pull request #7749 from cvium/disable_auto_add_collection
(cherry picked from commit 8119e4a573)
Signed-off-by: crobibero <cody@robibe.ro>
2022-05-20 18:32:47 -04:00
Cody Robibero 1ed57f48a5 Merge pull request #7624 from nielsvanvelzen/quickconnect-enable-d
(cherry picked from commit 1d5961126e)
Signed-off-by: crobibero <cody@robibe.ro>
2022-04-28 09:26:45 -04:00
Nyanmisaka 18c7dc210c
Prefer Cuvid to Nvdec by default for better performance 2022-03-17 18:01:58 +08:00
Cody Robibero 603b6fe173
Merge pull request #7054 from matthew-jones-uk/disable-embedded-subs 2022-02-11 13:20:37 -07:00
Matthew Jones b7cab46b4a Added values to EmbeddedSubtitleOptions enum 2022-02-09 23:33:46 +00:00
Matthew Jones 91d143d6ee Changed boolean options to enums 2022-01-26 16:09:05 +00:00
Matthew Jones 61d8d40a4a Added type options to disable embedded subs 2022-01-14 11:25:08 +00:00
Matthew Jones 4df7590e52 Add DisableEmbeddedSubtitles setting
Disables embedded subs being added to metadata
2022-01-14 11:25:08 +00:00
cvium 6ffa9539bb Refactor and add scheduled task 2022-01-11 23:30:30 +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
nyanmisaka 728a5988b3 Merge remote-tracking branch 'origin/master' into hwa 2021-12-25 00:33:17 +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
Joe Rogers dea5a3f3bc
Deprecate LibraryOptions.EnableInternetProviders 2021-12-16 00:52:18 +01:00
Cody Robibero 4d1b824651
Merge pull request #6902 from cvium/migrate_networkconfig
Migrate network configuration safely
2021-12-11 12:04:58 -07:00
Bond_009 beafd6eaab Use JsonContent where possible
Should reduce the # of allocated bytes
2021-12-01 15:40:06 +01:00
cvium 69df004b9f Migrate network configuration safely 2021-11-24 13:00:12 +01:00
Cody Robibero 03c7bcf9c6
Merge pull request #6870 from cvium/fix_omdb_image_provider 2021-11-20 08:50:22 -07:00
cvium 96ea865681 Refactor omdb providers 2021-11-19 15:32:07 +01:00
Petrus.Z acb86066ff
Replace library option to AutomaticallyAddToCollection
Signed-off-by: Petrus.Z <silencly07@gmail.com>
2021-11-18 16:00:14 +08:00
Petrus.Z 0a0ddb0eaf
Add AutoCollection option
it can determine whether auto create/add movies to collection

Signed-off-by: Petrus.Z <silencly07@gmail.com>
2021-11-17 14:02:07 +08:00
Cody Robibero 73201ed498 Default log upload to enabled 2021-10-29 06:33:46 -06:00
Cody Robibero c534c45033 Suggestions from review 2021-10-27 19:20:14 -06:00
Bond_009 1b6eb2ff2d Enable nullable for more files 2021-10-26 13:56:30 +02:00
cvium 9c15f96e12 Add first draft of keyframe extraction for Matroska 2021-09-23 15:29:12 +02:00
Bond_009 0d16c48998 Fix some warnings 2021-09-09 15:59:13 +02:00
Bond_009 b458f85c47 Fix InvalidOperationException when serializing MediaPathInfo 2021-09-03 16:39:03 +02:00
Bond_009 645825db36 Enable nullable for more files 2021-08-28 17:32:09 +02:00
Bond_009 383c2d7374 Remove useless nullable directives 2021-06-11 23:36:10 +02:00
Bill Thornton cc0f191228 Disable hevc encoding by default 2021-04-08 09:57:17 -04:00
Patrick Barron ebb6467db4 Remove unused entity 2021-02-27 11:42:37 -05:00
Bond_009 141efafd3d Enable TreatWarningsAsErrors for MediaBrowser.Model 2021-02-20 23:29:33 +01:00
dkanada 75ec8b0c8c
Merge pull request #5207 from matthin/default-language
Default to English metadata during the setup wizard.
2021-02-14 16:06:27 +09:00
dkanada 9fcdbd4c4b remove deprecated settings from server config 2021-02-12 21:58:37 +09:00
me@justinharrison.ca 90236efdf2
Default to English metadata during the setup wizard. 2021-02-10 17:08:55 -05:00
nyanmisaka 09b9fa3ce1 add vpp tonemapping for vaapi 2021-02-06 13:21:30 +08:00
nyanmisaka 326fa8ce38 add an enhanced nvdec decoder 2021-01-25 03:40:34 +08:00
Cody Robibero 5c57569692
Merge branch 'master' into PluginDowngrade 2020-12-30 18:11:37 -07:00
artiume cd979e6b62
Add default of 5 minutes 2020-12-30 08:52:11 -05:00
MrTimscampi 48d8536d2f Enable TMDB and OMDB by default 2020-12-28 09:19:08 +01:00
BaronGreenback 67c480ad53
Merge branch 'master' into PluginDowngrade 2020-12-15 01:15:54 +00:00
Greenback 7986465cf7 Initial upload 2020-12-14 16:14:39 +00:00
nyanmisaka 7be3276dff Fine tune some tone mapping params
*Set recommand algorithm to Hable
*Set recommand tone mapping peak to 100
2020-12-12 18:26:52 +08:00
Claus Vium f1cc01f324
Merge pull request #4242 from Spacetech/library_scan_speed
Increase library scan and metadata refresh speed
2020-12-04 13:17:26 +01:00
BaronGreenback e8cb9cea7d
Merge branch 'master' into library_scan_speed 2020-11-21 22:54:40 +00:00
Greenback 086e2fdaa1 Fixed a couple of merge errors. 2020-11-21 14:09:56 +00:00
Greenback c4753cec6c Fixed merge. 2020-11-21 14:05:09 +00:00
BaronGreenback 124bd4c2c0
Networking: 1 - Network Manager (#4124)
* NetworkManager

* Config file with additional options.

* Update Jellyfin.Networking/Manager/INetworkManager.cs

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

* Update Jellyfin.Networking/Manager/INetworkManager.cs

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

* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs

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

* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs

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

* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Split function.

* Update Jellyfin.Networking/Manager/INetworkManager.cs

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

* fixed iterations

* Update Jellyfin.Networking.csproj

* Update NetworkManager.cs

* Updated to NetCollection 1.03.

* Update ServerConfiguration.cs

* Update StartupController.cs

* Update INetworkManager.cs

Removed public

* Update INetworkManager.cs

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Updated comment

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/INetworkManager.cs

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

* Remove mono code.
Removed forced chromecast option

* Inverted if

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Moved config into a separate container

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Changed sortedList to dictionary.

* Update INetworkManager.cs

Changed UpdateSettings param type

* Update NetworkManager.cs

* Update NetworkManager.cs

* Update NetworkManager.cs

* Update NetworkConfiguration.cs

* Update INetworkManager.cs

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs

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

* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs

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

* Updated changes github didn't update.

* Fixed compilation.

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Removed read locking.

* Update NetworkManager.cs

Changed configuration event to NamedConfigurationUpdated

* updated comment

* removed whitespace

* Updated NetCollection to 1.0.6
Updated DXCopAnalyser to 3.3.1

* removed NetCollection

* Update NetworkManager.cs

* Update NetworkExtensions.cs

* Update NetworkExtensions.cs

Removed function.

* Update NetworkExtensions.cs

* Update NetworkManager.cs

Changed ToString() to AsString() as native collection formats incorrectly.

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update NetworkExtensions.cs

* Update Jellyfin.Networking/Configuration/NetworkConfiguration.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>

* Update Jellyfin.Networking/Configuration/NetworkConfiguration.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>

* Update Jellyfin.Networking/Configuration/NetworkConfiguration.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>

* Update MediaBrowser.Common/Net/IPObject.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>

* updated

* Replaced NetCollection with Collection<IPObject>

* Update MediaBrowser.Common/Net/NetworkExtensions.cs

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

* Update MediaBrowser.Model/Configuration/PathSubstitution.cs

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

* Update MediaBrowser.Common/Net/NetworkExtensions.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update MediaBrowser.Common/Net/IPObject.cs

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

* Update MediaBrowser.Common/Net/IPObject.cs

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

* Update MediaBrowser.Common/Net/IPObject.cs

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

* Update MediaBrowser.Common/Net/IPHost.cs

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

* Update MediaBrowser.Common/Net/IPHost.cs

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

* Update MediaBrowser.Common/Net/IPHost.cs

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

* Update MediaBrowser.Common/Net/IPHost.cs

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

* Update MediaBrowser.Common/Net/IPHost.cs

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

* Update MediaBrowser.Common/Net/IPHost.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update MediaBrowser.Common/Net/IPHost.cs

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

* Update MediaBrowser.Common/Net/IPObject.cs

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

* Update MediaBrowser.Common/Net/IPObject.cs

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

* updated comments.

* Updated comments / changes as suggested by @crobibero.

* Split function as suggested

* Fixed null ref.

* Updated comment.

* Updated cs to .net5

* Fixed issue with PublishedServerUrl

* Fixes

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Restored locking

* optimisation

* Added comment

* updates.

* updated.

* updates

* updated.

* Update IPHost.cs

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update NetworkManager.cs

* Removed whitespace.

* Added debug logging

* Added debug.

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Replaced GetAddressBytes

Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
Co-authored-by: Bond-009 <bond.009@outlook.com>
2020-11-21 13:59:14 +01:00
BaronGreenback 7a6063ed41
Merge branch 'master' into NetworkPR2 2020-11-21 00:35:53 +00:00
Gary Wilber 4a22380565 Merge remote-tracking branch 'upstream/master' into library_scan_speed 2020-11-19 18:44:16 -08:00
BaronGreenback d66f88672c
Merge branch 'master' into NetworkPR2 2020-11-16 16:27:37 +00:00
nyanmisaka 488dbdb31d Merge remote-tracking branch 'upstream/master' into fmp4-hls 2020-11-16 12:36:55 +08:00
nyanmisaka 5bd0c2b69d add an option to disable hevc encoding 2020-11-12 11:02:56 +08:00
Claus Vium cdf979efef
Merge pull request #3196 from ferferga/images-advance
Remove "download images in advance" option
2020-11-10 10:54:23 +01:00
Gary Wilber f680a0fbbe fix merge 2020-11-08 11:55:38 -08:00
Gary Wilber e6d8c02944 Merge remote-tracking branch 'upstream/master' into library_scan_speed 2020-11-08 11:51:40 -08:00
nyanmisaka 737cb727f9 Merge remote-tracking branch 'upstream/master' into fonts 2020-11-08 19:11:54 +08:00
BaronGreenback ec245dce90
Merge branch 'master' into NetworkPR2 2020-11-04 20:17:41 +00:00
crobibero ceecc80bb3 Allow configuration of ActivityLogRetention 2020-11-01 18:32:41 -07:00
ferferga 9fd01fade6 Remove "download images in advance" option 2020-10-19 17:28:07 +02:00
Greenback ebe650afa9 Merge remote-tracking branch 'upstream/master' into NetworkPR2 2020-10-09 14:12:41 +01:00
Greenback 39754b840d minor fixes 2020-10-08 19:16:47 +01:00
cvium 72cd6ab071 Remove dummy season and missing episode provider in a futile attempt to remove cruft 2020-10-05 12:13:41 +02:00
BaronGreenback 29133b6452
Update PathSubstitution.cs 2020-10-04 10:04:43 +01:00
Gary Wilber c2276b17cb Increase library scan and metadata refresh speed 2020-09-30 19:33:34 -07:00
Jim Cartlidge 3b64171cde Minor change to get it to compile. 2020-09-30 18:02:36 +01:00
Jim Cartlidge bbe2400b59 Updating to NetCollection 1.03 2020-09-30 17:51:17 +01:00
spookbits 5cca8bffea Removed browser auto-load functionality from the server.
Added profiles in launchSettings to start either the web client or the swagger API page.
Removed --noautorunwebapp as this is the default functionality.
2020-09-16 13:22:04 -04:00
Jim Cartlidge 9ef79d190b Large number of files 2020-09-12 16:41:37 +01:00
cvium 78cab77f81 Add Known Proxies to system configuration 2020-09-10 11:05:46 +02:00
crobibero 8a08111adc Merge remote-tracking branch 'upstream/master' into dynamic-cors 2020-09-05 09:00:55 -06:00
Joshua M. Boniface 376e4793e6
Merge pull request #4035 from crobibero/api-doc-base-url
Fix apidoc routes with base url
2020-09-04 10:30:13 -04:00
crobibero 21a5692626 Merge remote-tracking branch 'upstream/master' into api-doc-base-url 2020-09-03 16:18:36 -06:00
Nyanmisaka 4cb0a57e46
Merge branch 'master' into tonemap 2020-09-04 02:55:57 +08:00
Bond-009 9cbc016b0a
Merge pull request #3877 from orryverducci/deinterlace-improvements
Deinterlacing improvements
2020-09-03 20:38:54 +02:00
Bond-009 42f22a8e55
Merge pull request #3976 from nyanmisaka/muxer
Expose max_muxing_queue_size to user
2020-09-03 20:36:17 +02:00
crobibero 1feee6f95e Properly host static files and set base url 2020-09-02 08:03:15 -06:00
crobibero 65d05f92ac Merge remote-tracking branch 'upstream/master' into dynamic-cors 2020-09-01 18:27:55 -06:00
crobibero 3c0484cc97 Allow for dynamic cors response 2020-08-30 09:32:14 -06:00
nyanmisaka d7caf88df6 expose max_muxing_queue_size to user 2020-08-25 02:20:46 +08:00
nyanmisaka aa75755480 Merge remote-tracking branch 'upstream/master' into fonts 2020-08-19 16:56:53 +08:00
Matt Montgomery 4fa3d3f4f3 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-12 15:38:07 -05:00
Orry Verducci 2d6699fd47 Merge remote-tracking branch 'upstream/master' into deinterlace-improvements 2020-08-10 22:17:13 +01:00
Orry Verducci 7df2affb23 Add double rate deinterlacing option 2020-08-10 22:14:47 +01:00
Matt Montgomery a40fe86776 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-07-26 16:14:58 -05:00
nyanmisaka 7b862bba5a add Tonemapping relaying on nvdec and ocl 2020-07-25 00:57:34 +08:00
nyanmisaka c888b34a62 add a method to use custom fallback fonts for subtitle rendering 2020-07-24 21:19:56 +08:00
Bond-009 ab9c1295ce
Merge pull request #3538 from Ullmie02/api-fix
Fix value parsing in Jellyfin.Api
2020-07-23 10:37:30 +02:00
crobibero 1385064497 Merge remote-tracking branch 'upstream/master' into api-migration-merge 2020-07-20 14:28:33 -06:00
David 262e19b691 Add X-Response-Time-ms header and log slow server response time 2020-07-14 13:40:18 +02:00
David ee03b919f9 Fix parsing 2020-07-12 20:11:59 +02:00
Bond-009 89ef8d79d6
Merge pull request #3465 from BaronGreenback/BugFix2
10.6.0.0 Null Pointer fix
2020-06-27 20:43:37 +02:00
BaronGreenback 2f4860741c _config.Configuration.PluginRespositories not instantiated causing InstallationManager.cs to crash with a null pointer. 2020-06-27 15:41:57 +01:00
dkanada 83ae4d074d use constructor to set optimal config values 2020-06-27 00:22:27 +09:00
Bond-009 3d42f37538 Minor changes 2020-06-22 15:35:53 +02:00
dkanada 552a358c9c
Merge pull request #3244 from jellyfin/custom-repos
Initial implementation for custom plugin repositories
2020-06-22 22:08:43 +09:00
telans 5bb639a59a
newlines after braces 2020-06-20 21:13:48 +12:00
ConfusedPolarBear e2f16fc255 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-06-19 23:33:43 -05:00
ConfusedPolarBear 4be476ec53 Move all settings into the main server configuration
Decreased the timeout from 30 minutes to 5.
Public lookup values have been replaced with the short code.
2020-06-19 23:32:24 -05:00