Commit Graph

351 Commits

Author SHA1 Message Date
Bond_009 05836c8cd3 Fix warning SA1414 and CA1849 2022-01-10 10:57:32 +01:00
SenorSmartyPants d5e7e75421 Remove unused httpContext parameter 2022-01-08 19:53:53 -06:00
SenorSmartyPants 3ea54a8009 Remove isHeadRequest from GetStaticFile method signatures 2022-01-07 18:21:48 -06:00
SenorSmartyPants bd2bec4d4a Remove special HTTP HEAD processing
removing this allows HTTP 206 Partial Content responses and lets some clients(popcorn hour namely) play videos from JF.
2022-01-07 16:29:22 -06:00
Cody Robibero 7bfc6b5679 Remove more warnings 2021-12-27 07:38:06 -07:00
Bond_009 cbfa355e31 Update StyleCop 2021-12-24 18:28:27 +01:00
Cody Robibero 55b429edb7
Merge pull request #6920 from marius-luca-87/subtitle_drop 2021-12-24 02:01:44 +00:00
Cody Robibero 32629cd7da Use BaseItemKind where possible 2021-12-12 06:11:27 -07:00
Cody Robibero 4d1b824651
Merge pull request #6902 from cvium/migrate_networkconfig
Migrate network configuration safely
2021-12-11 12:04:58 -07:00
Marius Luca 7d86ef6f22 - add an option for dropping specific subtitle formats using the DLNA SubtitleProfile 2021-12-09 17:52:51 +02:00
Marius Luca eaa003775f - take into account the streams dlnaheaders query parameter set by the DidlBuilder NormalizeDlnaMediaUrl function 2021-11-30 16:09:02 +02:00
Claus Vium ca887518dd
Use the Memory overload for ReadAsync (#6865) 2021-11-27 03:23:46 +01:00
cvium 69df004b9f Migrate network configuration safely 2021-11-24 13:00:12 +01:00
Bond_009 1d19a5be61 Fix some warnings
down to 580
2021-11-09 22:29:33 +01:00
Cody Robibero 64652b6392 Fix and disable new dotnet6 warnings 2021-11-08 12:40:52 -07:00
Dmitry Lyzo 32f3d60a84 Throw on FFmpeg non-zero exit code 2021-10-10 19:53:32 +03:00
KonH 6cbfdea4c0 Fix warning: Type cast is redundant (#2149) 2021-10-03 11:05:18 +07:00
KonH e3fccd5ae6 Fix warning: Qualifier is redundant (#2149) 2021-10-03 11:01:40 +07:00
KonH 7c282ec369 Fix warning: The nullable warning suppression expression is redundant (#2149) 2021-10-03 10:43:41 +07:00
Bond_009 f31224fa8f Remove sync FileStream hack 2021-09-25 19:44:40 +02:00
Bond_009 13fbfe6091 Target net6.0 2021-09-24 20:15:46 +02:00
Bond-009 32ea4806f8
Merge pull request #6538 from cvium/livetv_oh_no 2021-09-20 22:38:44 +02:00
Bond_009 a6d1e542e6 Reduce allocations 2021-09-19 20:53:31 +02:00
cvium ae0055c494 Missing linebreaks that Rider apparently can't just do for me? 2021-09-10 13:09:24 +02:00
cvium 026a7af0e8 Don't throw when livestream file isn't found 2021-09-10 11:54:26 +02:00
cvium 1a5a74d2a9 Remove more unused args 2021-09-10 10:03:42 +02:00
cvium 1603d1928e Kill ProgressiveFileCopier and seek to end for ongoing livetv 2021-09-10 09:29:14 +02:00
Fernando Fernández 3d0b1ccae6
Remove all unused usings 2021-09-06 21:15:30 +02: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 ff83fabac3
Merge pull request #6456 from GodTamIt/vp8-vp9
Disambiguate vpx to vp8 or vp9
2021-09-04 16:26:07 +02:00
Chris Tam b205d5a032 Disambiguate vpx to vp8 or vp9 2021-09-04 07:36:17 -04:00
Cody Robibero ff9d14c811 Merge remote-tracking branch 'upstream/master' into authenticationdb-efcore 2021-09-03 11:01:55 -06:00
Bond_009 e3dac4fda2 Use async FileStreams where it makes sense 2021-09-02 14:02:04 +02:00
Cody Robibero cba07b1ca6 Remove more and more warnings 2021-08-28 16:32:50 -06:00
cvium 12a7fda0a6 Add timeout to ProgressiveFileStream 2021-08-17 19:18:26 +02:00
Patrick Barron 45f478f63e Merge branch 'master' into authenticationdb-efcore
# Conflicts:
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
#	MediaBrowser.Controller/Security/IAuthenticationRepository.cs
#	MediaBrowser.Controller/Session/ISessionManager.cs
2021-08-13 21:08:24 -04:00
Claus Vium a29f702432
Merge pull request #6258 from gnuyent/feat/hardware-encode-status 2021-08-11 12:54:27 +02:00
Bond_009 8528e9bddb Improve platform checks 2021-07-12 20:21:51 +02:00
Brandon Nguyen d0c5e25ec0 Use nullable enum type instead of strings 2021-07-05 16:52:52 -07:00
Brandon Nguyen df17c67f11 Use hardware encoding string over boolean 2021-07-03 15:29:07 -07:00
Brandon Nguyen 7e3c94d094 Add hardware encoding status to playback data
Resolves #6087
2021-07-03 01:12:09 -07:00
Patrick Barron be88efce3c Merge branch 'master' into authenticationdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
#	Emby.Server.Implementations/Security/AuthenticationRepository.cs
#	Emby.Server.Implementations/Session/SessionManager.cs
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
#	MediaBrowser.Controller/Net/ISessionContext.cs
2021-06-18 18:56:10 -04:00
Cody Robibero 9154f20b34
Don't dispose managed CancellationTokenSource (#6139) 2021-06-04 14:36:58 +02:00
Bond-009 d61530eb4b
Merge pull request #6083 from Bond-009/nullable4
Enable nullable reference types for Emby.Server.Implementations
2021-05-21 13:05:03 +02:00
Patrick Barron b6446c06ee Merge branch 'master' into authenticationdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Security/AuthenticationRepository.cs
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Devices/IDeviceManager.cs
2021-05-21 00:19:07 -04:00
Patrick Barron a0c6f72762 Migrate authentication db to EF Core 2021-05-20 23:56:59 -04:00
Bond_009 7e8428e588 Enable nullable reference types for Emby.Server.Implementations 2021-05-20 22:48:53 +02:00
Patrick Barron a225f34796 Merge branch 'master' into authenticationdb-efcore
# Conflicts:
#	Jellyfin.Api/Helpers/RequestHelpers.cs
2021-05-18 18:09:46 -04:00
Bond_009 56ac64e70a Minor improvements
* properly dispose CancellationTokenSource
* rewrite DynamicHlsController.GetSegmentLengths
* remove dead code
2021-05-08 00:33:24 +02:00
Bond_009 ddb04dc12b Use new ReadAllLines extensions 2021-05-06 14:12:43 +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
cvium ba2e346d12 prevent cancellationtoken leakage 2021-04-30 15:27:07 +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 184e05aeb6
Merge pull request #5681 from BaronGreenback/ContentFeatureOptimization
Various DLNA Optimizations
2021-04-22 16:45:36 +02:00
Bond-009 d5163b4167
Merge pull request #5877 from Bond-009/circ1
EncodingHelper: Fix circular dependency
2021-04-21 15:49:17 +02:00
Bond_009 499bac5185 EncodingHelper: Fix circular dependency 2021-04-20 23:03:36 +02:00
cvium 8933389753 Respect user settings for transcode and remux 2021-04-19 10:49:52 +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
Patrick Barron 8607b52541 Make device/session code async 2021-04-10 16:57:25 -04:00
Ian Walton 321e383965 Fix setting audio stream in PlaybackInfo for jellyfin-web. 2021-04-09 19:24:41 -04:00
Bond-009 ec0ef1530c
Merge pull request #5602 from Ullmie02/IP-string-IP 2021-04-03 00:32:43 +02:00
BaronGreenback d9a50cb510 Various DLNA Optimizations 2021-04-02 19:06:38 +01:00
Szymon Acedański b1e8a8565f
Update Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2021-03-24 22:46:08 +01:00
Szymon Acedański 136136dea9 Fix incorrect responses for HEAD /audio/<id>/stream
Without this fix my Samsung Soundbar (HW-Q80R) fails to play using DLNA
and returns "Error: Resource not found (716)" instead.

I had a look on tcpdump network logs between Jellyfin and the soundbar
and noticed that the device performs a HEAD request for the media before
responding to the DLNA UPNP control request from Jellyfin (or BubbleUPNP
Android App).

Jellyfin retuns 204 No Content response, which is unusual.  Common web
servers generally return 200 OK if the GET would return content, and
this is not-very-clearly suggested [in HTTP
spec](https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.2.1)

The other patch is to ensure, that invalid Content-Length: 0 is not
returned with the HEAD response in the streaming case.

I think in both cases we still don't return the same headers with HEAD
as with GET (e.g. Content-Length or Accept-Ranges), but at least we
don't return anything misleading.
2021-03-24 20:43:54 +01:00
David 19e4ef82dd Remove conversion from IPAddress to string to IPAddress 2021-03-23 17:16:10 +01:00
Claus Vium 5592967497
Merge pull request #5403 from BaronGreenback/DLNAProfileFix 2021-03-10 11:50:08 +01:00
BaronGreenback 84da57cd48
Update StreamingHelpers.cs
Updated condition
2021-03-10 09:07:11 +00:00
David ece0d67f99 Use FileShare.Read for log files 2021-03-09 17:31:31 +01:00
BaronGreenback 75c9659e05 Fix unreachable code & assign id to each profile. 2021-03-07 14:17:32 +00:00
David 60ffa6f514 Use FileShare.None when creating files 2021-03-07 14:43:28 +01:00
BaronGreenback d819a1d928
Remove Content-Length header from DLNA HEAD request (#5335) 2021-03-03 15:41:18 +01:00
Joshua M. Boniface 7ece3c5523
Merge pull request #5273 from Bond-009/warn31 2021-02-22 21:00:46 -05:00
Bond_009 eba859e33e Minor improvements 2021-02-21 02:49:52 +01:00
Bond_009 141efafd3d Enable TreatWarningsAsErrors for MediaBrowser.Model 2021-02-20 23:29:33 +01:00
dkanada 13d65318eb
Merge pull request #5223 from Bond-009/minor10
Minor improvements
2021-02-20 10:56:55 +09:00
Bond_009 e9f22303a4 Properly forward cancellationTokens 2021-02-15 14:19:17 +01:00
Bond_009 65bab55ca0 Minor improvements 2021-02-13 00:39:18 +01:00
crobibero 223b42aed3 Create BaseItemKind enum 2021-02-10 17:09:23 -07:00
Claus Vium 63be326302
Merge pull request #5117 from jellyfin/fix-framerate-locale
Make FRAME-RATE field culture invariant
2021-01-28 15:35:23 +01:00
nyanmisaka 3ce0d589ba make FRAME-RATE field culture invariant 2021-01-28 01:00:55 +08:00
Bond-009 4a2678e63b
Merge pull request #5097 from Bond-009/cleanup4
Remove useless abstraction and clean up formatting
2021-01-26 17:44:49 +01:00
Bond_009 f6b293203a
Restore weird behaviour 2021-01-24 17:55:25 +01:00
Bond_009 1c2cd7efa0
Remove useless abstraction and clean up formatting 2021-01-24 13:32:29 +01:00
Bond_009 d24e7f60c7
Fix GetOrderBy and add tests 2021-01-24 11:43:05 +01:00
crobibero 55670b91b2 Use ArrayModelBinder for sortBy and sortOrder 2021-01-23 17:32:13 -07:00
BaronGreenback 11700db312
Update StreamingHelpers.cs
Null exception fix
2021-01-01 00:25:47 +00:00
crobibero ca5c20c988 Remove IIsoMounter and IsoMounter 2020-12-03 07:34:15 -07: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
Greenback e41d1773ba changes 2020-11-21 16:14:03 +00:00
Greenback 616caca2b7 Added more comments. 2020-11-21 13:27:27 +00:00
BaronGreenback 7a6063ed41
Merge branch 'master' into NetworkPR2 2020-11-21 00:35:53 +00:00
Joshua M. Boniface 7457c4a95d
Merge pull request #4499 from crobibero/more-param
Reduce RequestHelpers.Split usage and remove RequestHelpers.GetGuids
2020-11-20 12:34:18 -05:00
Joshua M. Boniface 799eb44005
Merge pull request #4514 from Artiume/patch-9
Update FFmpeg log
2020-11-20 12:34:10 -05:00
nyanmisaka b4598bd71b Merge remote-tracking branch 'upstream/master' into fmp4-hls 2020-11-20 10:01:17 +08:00
artiume 6a751251e7
Update Jellyfin.Api/Helpers/TranscodingJobHelper.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-11-19 19:45:26 -05:00
artiume a46b70b169
Truncate GUID to 8 char 2020-11-19 19:23:04 -05:00
artiume 3423bdf53a
Update Jellyfin.Api/Helpers/TranscodingJobHelper.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-11-19 15:51:58 -05:00
Greenback a3e47f3e4e Updated to latest Unstable. 2020-11-19 18:27:18 +00:00
nyanmisaka 51dab0958d changes per suggestions 2020-11-19 22:46:02 +08:00
artiume e6e7295320
oops 2020-11-19 08:58:16 -05:00
artiume 4e07d9d561
Update FFmpeg log 2020-11-19 08:49:21 -05:00
Greenback e51ddd326c Fixes spelling. 2020-11-18 13:23:45 +00:00
Bond_009 4b1c9dc9ea Pass cancellation where possible 2020-11-17 19:43:00 +01:00
crobibero 3cc0dd7e12 Reduce RequestHelpers.Split usage and remove RequestHelpers.GetGuids usage. 2020-11-16 20:29:46 -07:00
BaronGreenback d66f88672c
Merge branch 'master' into NetworkPR2 2020-11-16 16:27:37 +00:00
nyanmisaka 099563cd6b comply with dotnet-5 2020-11-16 12:56:37 +08: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
crobibero 3f313206c6 Suggestions from review 2020-11-15 11:35:36 -07:00
Bond_009 c4bb32f259
Access last element by index where possible 2020-11-14 20:28:14 +01:00
Bond_009 bc7359f87d
Use string.Split(char) where possible instead of string.Split(char[]) 2020-11-14 20:27:48 +01:00
crobibero 73d2cb1c2a Updated based on review feedback 2020-11-13 18:04:06 -07:00
nyanmisaka 8c0778e827 switch ffmpeg to hls muxer for live streaming
segment muxer cannot make fMP4 init file.
'-strict -2' option doesn't work with segment muxer for flac remuxing.
2020-11-14 03:47:54 +08:00
crobibero 95ebb9a55a Use null coalescing when possible 2020-11-13 11:24:46 -07:00
crobibero 5f52a58e78 Convert NullReferenceException to ResourceNotFoundException 2020-11-13 11:14:44 -07:00
crobibero 01355e0498 Fix nullability errors in Jellyfin.Api (part 1) 2020-11-13 09:04:31 -07:00
nyanmisaka 5bd0c2b69d add an option to disable hevc encoding 2020-11-12 11:02:56 +08:00
Claus Vium a7b3880d0e
Merge branch 'master' into fix_and_mildly_improve_similar 2020-11-11 10:47:18 +01:00
nyanmisaka 57e5b59b93 adjust bitrate limit for HLS audio codecs 2020-11-11 17:10:08 +08:00
Nyanmisaka 0b01acbe91
Apply suggestions from code review
Co-authored-by: BaronGreenback <jimcartlidge@yahoo.co.uk>
2020-11-11 02:03:53 +00:00
crobibero 2ce9a56cae Remove GetImageTypes 2020-11-09 15:01:30 -07:00
cvium b99519898d Remove duplicate /Similar endpoints and add poor matching for artists and albums 2020-11-09 20:15:15 +01:00
nyanmisaka babb298b90 fix ci 2020-11-08 09:35:04 +00:00
Claus Vium ec2538a1ba
Merge pull request #4420 from cvium/fix_person_studio_genre_endpoints
Fix Persons, Genres and Studios endpoints
2020-11-08 10:22:18 +01:00
nyanmisaka 5048719a64 minor changes per suggestions 2020-11-08 09:01:58 +00:00
Claus Vium c17f84ae48
Merge pull request #4330 from crobibero/api-key-auth
Fix ApiKey authentication
2020-11-08 08:20:50 +01:00
nyanmisaka 85965741f5 add initial support for HEVC over FMP4-HLS 2020-11-08 01:39:32 +08:00
Claus Vium 8c5e0ddae0
Merge pull request #4401 from nyanmisaka/respect-music-settings
Respect music quality settings when transcoding
2020-11-07 10:57:57 +01:00
Claus Vium 6afd990986
Merge pull request #4424 from jellyfin/minor8
Minor perf improvements
2020-11-06 17:11:01 +01:00
Bond_009 134fd0d960 > -> < 2020-11-06 16:39:41 +01:00
Bond_009 b21919c7f4 Minor perf improvements 2020-11-06 16:15:30 +01:00
cvium 584b4fa41f Fix Persons, Genres and Studios endpoints 2020-11-05 12:27:22 +01:00
BaronGreenback ec245dce90
Merge branch 'master' into NetworkPR2 2020-11-04 20:17:41 +00:00
crobibero b4d52d8009 Apply patch 2020-11-03 16:38:47 -07:00
Bond-009 53b2a2ee22
Merge pull request #4213 from cvium/progressivefilestream
Add ProgressiveFileStream
2020-11-03 09:47:17 +01:00
nyanmisaka 00f0c14d7b respect music quality settings when transcoding 2020-10-31 16:09:22 +08:00
Greenback 6dc2936d9c Merge remote-tracking branch 'upstream/master' into NetworkPR2 2020-10-30 13:54:46 +00:00
Bond-009 9e9431d829
Merge pull request #4384 from nyanmisaka/ios-hls-bitrate
Fix HLS music playback on iOS
2020-10-28 16:29:34 +01:00
crobibero 981f000437 Use proper IsApiKey flag 2020-10-28 08:40:11 -06:00
nyanmisaka c91f42c7a0 Default output audio bitrate to 128k 2020-10-28 22:27:08 +08:00
Stan 3bb8884e16
Merge branch 'master' into bdiso-playback 2020-10-28 13:18:05 +01:00
crobibero 4558c192c7 Merge remote-tracking branch 'upstream/master' into query-image-type 2020-10-27 13:25:57 -06:00
BaronGreenback 0b5ddc90ff
Merge branch 'master' into NetworkPR2 2020-10-26 13:21:48 +00:00
Cody Robibero 163d6b0f1d
Update Jellyfin.Api/Helpers/RequestHelpers.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2020-10-11 06:15:55 -06:00
crobibero 2eafbc03e4 fix build 2020-10-09 18:01:12 -06:00
crobibero 27e753ddb4 Convert image type string to enum. 2020-10-09 17:52:39 -06:00
crobibero 549f2284ad Convert filters string to enum. 2020-10-09 17:41:17 -06:00
Greenback ebe650afa9 Merge remote-tracking branch 'upstream/master' into NetworkPR2 2020-10-09 14:12:41 +01:00
Greenback deb4d27857 Moved all settings across to network.xml 2020-10-08 19:00:55 +01:00