Commit graph

1039 commits

Author SHA1 Message Date
Petr Janda
75426d0004 Add logging when force_key_frames is disabled 2019-12-06 17:21:24 +10:30
Petr Janda
70530e1f14 Fix formatting (2) 2019-12-05 19:20:47 +10:30
Petr Janda
89605d4fb1 Fix VAAPI encoding on 10-bit hevc. Update QSV encoding and scaling to take advantage of scale_qsv and overlay_qsv 2019-12-05 17:39:36 +10:30
Bond_009
5cab79c839 Clean up Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs 2019-12-04 21:39:27 +01:00
Bond_009
cc5acf37f7 Make probesize and analyzeduration configurable and simplify circular
dependencies

Makes the probesize and analyzeduration configurable with env args.
(`JELLYFIN_FFmpeg_probesize` and `FFmpeg_analyzeduration`)
2019-11-25 12:07:59 +01:00
Bond_009
3221e837f9 * Add support for multi segment base urls
* Make baseurl case-insensitive
2019-11-25 11:55:24 +01:00
Joshua M. Boniface
48120d01dc
Merge pull request #1991 from Bond-009/transtemp
Don't append transcodes to transcoding temp path
2019-11-24 15:13:50 -05:00
Bond-009
b477b3874e Fix some warnings 2019-11-22 16:15:31 +01:00
Bond-009
d4b438791f Don't append transcodes to transcoding temp path 2019-11-21 16:57:49 +01:00
dkanada
f3ca37e523 minor changes to transcode cleanup scheduled task 2019-11-21 21:55:10 +09:00
Andrew Mahone
a78aec56e3
Format attachment DeliveryURL with CultureInfo.InvariantCulture.
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2019-11-05 08:21:06 -05:00
Andrew Mahone
262a8f47af Remove attachment filenames from attachment URLs. 2019-11-04 11:31:41 -05:00
Andrew Mahone
1600d5b53f Merge remote-tracking branch 'origin/master' into media-attachments-clean 2019-11-04 10:03:18 -05:00
Joshua Boniface
d4474d493b Remove extraneous newline 2019-11-03 12:39:45 -05:00
Vasily
8cf8c36708 Move throwing if cancelled after logging that fact 2019-10-27 16:48:42 +03:00
Vasily
dd7ae7747e
Apply suggestions from code review
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2019-10-27 16:47:00 +03:00
Andrew Mahone
20727906c8 Use attachment filename if available. 2019-10-22 11:54:59 -04:00
Andrew Mahone
01b1c847e9 Provide delivery URLs for attachments in PlaybackInfo. 2019-10-22 11:54:59 -04:00
Vasily
3743137c31 Address Bond-009 review comments 2019-10-21 12:05:49 +03:00
Vasily
ae2b95024f
Update MediaBrowser.Api/Playback/BaseStreamingService.cs
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2019-10-21 11:58:04 +03:00
Vasily
6b6fede2e0 Address review comments 2019-10-16 16:13:59 +03:00
Vasily
adccc18298 Revert "yarn build" as it is fixed in master, fix typo 2019-10-14 14:07:12 +03:00
Vasily
3132280b07 * Make sure force_key_frames expression arguments are properly converted to strings
* Fore usage of keyframe cuts only in HLS
2019-10-14 13:22:53 +03:00
Vasily
2f6879e869 Add limiting max keyframe interval when full transcoding 2019-10-14 13:22:53 +03:00
Vasily
986ea5c636 Fix log message - log args were swapped 2019-10-14 13:22:53 +03:00
Vasily
3740228100 Don't start waiting for a segment which doesn't exist if transcoding is not running 2019-10-14 13:22:52 +03:00
Vasily
7aea9266d0 Stop waiting for a segment to become ready if there's no alive transcode
Remove extra quotes in logging

Fix typo in comment
2019-10-14 13:22:39 +03:00
Vasily
c1f9107b8b Add more logging
Trying to fix hls muxer plus ffmpeg 4.1+ combo

Try to fix waiting for segment being ready

This is needed because hls muxer in ffmpeg >= 4.1 creates the
playlist only when it finishes transcoding.

Also cleaned up logs a bit.

Lower log level for "StartFfmpeg finished" to debug
2019-10-14 13:22:15 +03:00
Vasily
6746f708f2 Revert "Revert "Fix premature stop when streaming""
This reverts commit 575b96d03a.
2019-10-14 13:16:30 +03:00
Joshua M. Boniface
575b96d03a
Revert "Fix premature stop when streaming" 2019-10-01 12:07:09 -04:00
Vasily
4fae733eef Cleaned up move to HLS muxer 2019-09-27 18:22:43 +03:00
Vasily
36a34f911e Replaced "stream" muxer with "hls" trying to fix "premature stop" issue 2019-09-27 16:37:41 +03:00
Erwin de Haan
e8b13ea8a9 Fix culture problem on Windows for segment_time_delta argument. 2019-09-10 16:31:35 +02:00
Bond_009
675754bc5c Possible fix for MrMC 2019-09-08 21:07:29 +02:00
marius
b711ece829 - fix ArgumentOutOfRangeException at MediaBrowser.Api.Playback.BaseStreamingService.ParseTimeSeekHeader (second substring argument is length) 2019-08-28 21:05:17 +03:00
Bond-009
e87d7cfaf3
Merge pull request #1659 from jellyfin/fix_ffmpeg
Fix segment_time_delta value for ffmpeg 4.1
2019-08-25 13:38:11 +02:00
Claus Vium
2e66361482 Move argument to new line 2019-08-24 11:38:33 +02:00
Claus Vium
15b054be94 Fix style issues 2019-08-24 11:17:17 +02:00
Joshua M. Boniface
d95c04787c
Merge branch 'master' into h265 2019-08-19 14:57:48 -04:00
Claus Vium
617f7e8b5b Fix segment_time_delta value for ffmpeg 4.1 2019-08-16 19:52:54 +02:00
whooo
9556561a77
Merge branch 'master' into master 2019-08-11 12:42:19 +02:00
dkanada
b5f3f28f41
Merge pull request #1578 from Bond-009/httpresponse
Replace custom code with Asp.Net Core code
2019-08-09 23:26:10 -07:00
Bond_009
52c1b45feb Fix build 2019-08-09 23:17:54 +02:00
Bond-009
6032f31aa6 Use CultureInvariant string conversion for Guids 2019-08-09 23:17:54 +02:00
Bond_009
9fff4b060e Replace custom code with Asp.Net Core code 2019-08-09 22:36:20 +02:00
Erik Larsson
a1efe4caca Add DLNA headers if requested by the client.
And remove the code which adds the headers as ResponseHelper.WriteToResponse
will do it.
2019-07-27 19:55:18 +02:00
Claus Vium
c05b7c382a Change UsCulture to InvariantCulture 2019-06-05 20:59:06 +02:00
Anthony Lavado
f631b2ecdc
Merge pull request #1159 from Bond-009/streamjob
Trying to make sense of the streaming code
2019-06-04 00:20:43 -04:00
Frank
3ba709fcc3 Fix #1432. Add support for encoding with libx265 and hevc_nvenc. 2019-06-01 15:46:41 -07:00
bugfixin
a827a2fbcc Remove unreachable code and const trySupportSeek within BaseProgressiveStreamingService 2019-04-25 19:14:33 +00:00
Claus Vium
28c2ac528d Re-add content length, semi revert of changes in #1010 (#1287)
* Re-add content length, semi revert of changes in #1010
2019-04-24 14:06:54 +02:00
Bond-009
e89c8dbf76 Use CultureInfo.InvariantCulture 2019-04-17 15:23:03 +02:00
Bond_009
9aaeb19418 Self-documenting code 2019-03-27 17:05:08 +01:00
Bond_009
b647959ec4 Add EnableOutputInSubFolder back 2019-03-27 16:26:33 +01:00
Bond_009
ca37ca291f More style changes 2019-03-26 23:06:38 +01:00
Bond_009
93e535d3a1 Trying to make sense of the streaming code
Mostly small changes as I was looking through the code.

* async void -> async Task
* Properly implemented dispose methods
* Pass the logstream directly to the JobLogger
* Style fixes
2019-03-26 23:00:14 +01:00
Bond-009
decaffed86 Remove EnvironmentInfo
This moved the last bit of usefulness of EnvironmentInfo into a static
class.
2019-03-07 22:41:41 +01:00
Claus Vium
0abe57e930 Merge remote-tracking branch 'remotes/upstream/master' into kestrel_poc 2019-03-07 20:16:51 +01:00
Bond-009
e4c5d51860
Update MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
Co-Authored-By: cvium <cvium@users.noreply.github.com>
2019-03-07 19:04:50 +01:00
Claus Vium
394d23a73a Review comments 2019-03-06 19:14:03 +01:00
Claus Vium
78742b8e4c Switch to HeaderNames instead of hardcoded strings (and other header related fixes) 2019-03-05 19:20:28 +01:00
Xu Fasheng
4951ec9814 Fix rmvb video can not play under DLNA
Or will report "Could not find handler for /videos/xxx/stream.rm" error
in server side.

Test OK with Kodi and gupnp-tools.
2019-02-28 18:00:25 +08:00
Claus Vium
27e7e792b3 Replace some usage of QueryParamCollection 2019-02-27 14:23:39 +01:00
Claus Vium
4db31acff9 Begin removing System.Net sources 2019-02-26 22:11:21 +01:00
William Lees
db4a72df10 Reduce scope of changes 2019-02-12 09:23:51 +11:00
William Lees
250f03d2d9 add httpClient to more constructors 2019-02-12 00:42:33 +11:00
William Lees
d8cb34dbbc add httpClient to appropriate constructors 2019-02-12 00:24:00 +11:00
Claus Vium
0ef2b46106 Remove custom Threading 2019-02-05 16:47:50 +01:00
Bond-009
da2caa2902 await async functions 2019-02-03 10:44:07 +01:00
Bond-009
ab0e851db9 Cleanup streaming services 2019-02-03 10:44:07 +01:00
Bond-009
1ea219bf3f
Merge branch 'master' into culture 2019-01-30 16:57:15 +01:00
Erwin de Haan
b9a111432a Unwrapped all /(Write|Read)All(Text|Bytes)/ functions. 2019-01-28 22:10:50 +01:00
Erwin de Haan
581a7fe078 Unwrapped MoveDirectory, DirectoryExists, FileExists & removed MoveFile 2019-01-28 22:10:00 +01:00
Erwin de Haan
d7c6d16250 Unwrapped CreateDirectory and DeleteDirectory 2019-01-28 22:09:56 +01:00
Erwin de Haan
3a831994f6 Unwrapped GetDirectoryName and DirectorySeperatorChar 2019-01-28 22:06:34 +01:00
Bond_009
a709cbdc64 Fix more analyzer warnings 2019-01-27 12:12:44 +01:00
Andrew Rabert
3d01aa1ae4 Merge pull request #656 from hawken93/more_logging
Do some logging in MediaInfoService
2019-01-22 19:38:43 -05:00
hawken
07cba6cbcf Do some logging in MediaInfoService 2019-01-22 10:24:00 +00:00
Andrew Rabert
13f1ea2c19 Merge pull request #664 from jellyfin/revert-639-ffmpeg4.1
Revert "Fix segment_time_delta for ffmpeg 4.1"
2019-01-21 20:21:36 -05:00
Joshua M. Boniface
b2767eceff Revert "Fix segment_time_delta for ffmpeg 4.1" 2019-01-21 19:29:47 -05:00
Bond_009
73df5bdbe9 Fix NullRef 2019-01-21 23:50:47 +01:00
Andrew Rabert
a1fcf4ea0d Merge pull request #613 from MatMaul/mediaencoding-dev
Update MediaEncoding
2019-01-20 18:11:51 -05:00
Mathieu Velten
da16de48aa Revert back to 10e57ce8d21b4516733894075001819f3cd6db6b for MediaEncoding
Remove some duplicate code that were causing warnings
2019-01-20 22:50:09 +01:00
Bond_009
c27aff1c63 Fix segment_time_delta for ffmpeg 4.1 2019-01-20 21:56:50 +01:00
Erwin de Haan
e867446437 ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Erwin de Haan
65bd052f3e ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
Erwin de Haan
a36658f6f0 ReSharper Reformat: Properties to expression bodied form. 2019-01-13 21:31:14 +01:00
Erwin de Haan
ba610b5094 Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
Erwin de Haan
51ed47f4c4 EditorConfig reformat: Emby.XmlTv, Jellyfin.Server. MediaBrowser.Api, MediaBrowser.Common 2019-01-13 20:30:41 +01:00
Erwin de Haan
b67c1b933e Visual Studio Reformat: MediaBrowser.Api 2019-01-13 20:24:58 +01:00
Erwin de Haan
846456b41e Reformatted the files with notes. 2019-01-12 21:41:08 +01:00
Erwin de Haan
e2751d42e8 Merge branch 'dev' into code-cleanup 2019-01-11 12:50:36 +01:00
Erwin de Haan
ec1f5dc317 Mayor code cleanup
Add Argument*Exceptions now use proper nameof operators.

Added exception messages to quite a few Argument*Exceptions.

Fixed rethorwing to be proper syntax.

Added a ton of null checkes. (This is only a start, there are about 500 places that need proper null handling)

Added some TODOs to log certain exceptions.

Fix sln again.

Fixed all AssemblyInfo's and added proper copyright (where I could find them)

We live in *current year*.

Fixed the use of braces.

Fixed a ton of properties, and made a fair amount of functions static that should be and can be static.

Made more Methods that should be static static.

You can now use static to find bad functions!

Removed unused variable. And added one more proper XML comment.
2019-01-10 20:38:53 +01:00
hawken
bd169e4fd4 remove trailing whitespace 2019-01-07 23:27:46 +00:00
Vasily
b27315bc08 Merge pull request #307 from drmrbg/fix-chromecast
Fix transcoding of AAC from 5.1 to stereo to support Chromecast
2019-01-06 14:11:09 +03:00
Claus Vium
efa3a234e9 Change null check on UserId to a Guid.Empty check 2019-01-03 07:58:14 +01:00
Bond_009
ea4c914123 Fix exception logging 2018-12-30 22:44:39 +01:00
Bond_009
0c1b9d3bff Rebase 2018-12-30 22:44:38 +01:00
drmrbg
6ffde49760 Attempt to fix Chromecast support 2018-12-28 23:18:06 -08:00
Andrew Rabert
a86b71899e Add GPL modules 2018-12-27 18:27:57 -05:00
Mathieu Velten
1d7d52ff9e Port MediaEncoding and Api.Playback from 10e57ce8d21b4516733894075001819f3cd6db6b 2018-12-14 17:32:54 +01:00
Luke Pulverenti
40442f887b consolidate emby.server.core into emby.server.implementations 2017-08-09 15:56:38 -04:00
Luke Pulverenti
6d78824c8e update components 2017-08-06 19:01:00 -04:00
Luke Pulverenti
d8e2887071 update container value 2017-08-04 16:29:34 -04:00
Luke Pulverenti
d50ffcbfb2 3.2.26.13 2017-08-03 12:26:01 -04:00
Luke Pulverenti
b89af7af43 fixes #2121 - background roku thumbnail generation (or maybe... any scheduled task?) should be "niced" 2017-08-01 15:43:39 -04:00
Luke Pulverenti
d500998d78 pass around encoding options 2017-07-22 21:56:31 -04:00
Luke Pulverenti
1326624d27 strip invalid xml chars 2017-07-19 15:53:47 -04:00
Luke Pulverenti
a0e7cdd2dc support all inclusive direct play profile 2017-07-14 11:57:44 -04:00
Luke Pulverenti
b8d4ef5fc6 add session reporting error handling 2017-07-12 14:54:46 -04:00
Luke Pulverenti
1c1aa7c2c5 3.2.23.1 2017-07-08 03:27:36 -04:00
Luke Pulverenti
6ea8e7868d add live stream params 2017-07-03 13:16:01 -04:00
Luke Pulverenti
15947c2a4c update opening of live streams 2017-07-02 14:58:56 -04:00
Luke Pulverenti
a759b09577 support max audio bit depth 2017-06-26 11:10:52 -04:00
Luke Pulverenti
a107ff0369 capture more transcoding info 2017-06-24 14:33:19 -04:00
Luke Pulverenti
42d0b070b4 update project files 2017-06-04 17:08:56 -04:00
Luke Pulverenti
820b4873fb move methods to base class 2017-06-04 16:28:27 -04:00
Luke Pulverenti
e91f569c15 update live tv startup 2017-06-03 03:36:32 -04:00
Luke Pulverenti
b9935a4643 update hls streams 2017-06-01 00:27:17 -04:00
Luke Pulverenti
5bfcbd4e9e update dlna profiles 2017-05-31 15:21:32 -04:00
Luke Pulverenti
3e15b28b18 add IsInterlaced param 2017-05-29 08:35:59 -04:00
Luke Pulverenti
a76bbcfebe 3.2.17.17 2017-05-27 07:42:25 -04:00
Luke Pulverenti
33014f77aa update GetItems method 2017-05-26 02:48:54 -04:00
Luke Pulverenti
2f93d4498b update query fields 2017-05-23 12:43:24 -04:00
Luke Pulverenti
54cf0da758 update query fields 2017-05-22 00:54:02 -04:00
Luke Pulverenti
5137e3abf6 update live streams 2017-05-20 12:42:47 -04:00
Luke Pulverenti
47fc7c6aee add GenreItems property 2017-05-18 17:05:47 -04:00
Luke Pulverenti
bcf28f3e9c update file options 2017-05-14 14:56:06 -04:00
Luke Pulverenti
0beb803aed add sample rate condition 2017-05-13 15:31:25 -04:00
Luke Pulverenti
92eeee0fc5 support additional encoding switches 2017-05-11 10:54:41 -04:00
Luke Pulverenti
198cb1bc9c update file responses 2017-05-09 14:51:26 -04:00
Luke Pulverenti
3a8b567f14 update file responses 2017-05-05 13:55:38 -04:00
Luke Pulverenti
696a6b34ea improve smb support 2017-05-04 14:14:45 -04:00
Luke Pulverenti
53024bd149 removed dead code 2017-05-04 03:01:35 -04:00
Luke Pulverenti
af4473e27f add error handling 2017-04-28 15:17:26 -04:00
Luke Pulverenti
0f07d97031 3.2.13.5 2017-04-27 14:24:04 -04:00
Luke Pulverenti
fc7ab45fb3 unify audio conversion 2017-04-27 14:13:16 -04:00
Luke Pulverenti
28e6f8cbd8 update hls authentication 2017-04-25 14:23:38 -04:00
Luke Pulverenti
463b41354f restore missing file 2017-04-22 15:32:24 -04:00
Luke Pulverenti
561028c907 update automated checkins 2017-04-17 15:01:16 -04:00
Luke Pulverenti
8eb4c034b4 update audio sync params 2017-04-15 15:45:33 -04:00
Luke Pulverenti
e56faea17a update vsync 2017-04-09 17:38:59 -04:00
Luke Pulverenti
8c487250e0 update segment responses 2017-04-09 15:49:18 -04:00
Luke Pulverenti
fd71890247 update segment handler 2017-04-06 16:07:07 -04:00
Luke Pulverenti
463cb3e354 update live stream management 2017-04-04 02:01:20 -04:00
Luke Pulverenti
3b06092f69 hls seek fixes 2017-04-04 01:20:50 -04:00
Luke Pulverenti
99417105a6 update subtitle embedding 2017-04-04 01:20:07 -04:00
Luke Pulverenti
8d1ca8ca27 improve direct play to transcoding fallback 2017-03-31 15:50:55 -04:00
Luke Pulverenti
06394d1a9f add break on non keyframes 2017-03-31 15:05:19 -04:00
Luke Pulverenti
04b6f23473 3.2.9.1 2017-03-29 02:26:48 -04:00