Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-23 14:10:40 +02:00
Code Issues Packages Projects Releases Wiki Activity
15237 commits 25 branches 76 tags 1.3 GiB
Commit graph

2632 commits

Author SHA1 Message Date
Bond_009 a253fa616d Fix build and address comments 2020-01-08 01:23:57 +09:00
dkanada aca31457c0 merge branch master into media-attachments 2020-01-08 01:21:09 +09:00
Artiume 5b55997984
Merge pull request #6 from jellyfin/master 
nightly
 2020-01-05 11:49:45 -05:00
dkanada 529cff3920
Merge pull request #2153 from dkanada/fix-playlist 
Fix playlist deletion and a few warning fixes
 2020-01-01 15:00:57 +09:00
gnattu 167549f5f1 Let HLS fallback to mpegts in case device reported unsupported container 2019-12-31 22:33:14 -05:00
Artiume 0e920a6d5f
Update MediaInfoService.cs 2019-12-20 23:40:36 -05:00
Artiume 963b69c7b2
Update MediaInfoService.cs 2019-12-20 23:17:01 -05:00
Bond_009 5751d86536 Fix warnings and move to System.Text.Json 2019-12-20 21:49:16 +01:00
Artiume 6a6e02e1ec
Merge pull request #3 from jellyfin/master 
nightly, big one
 2019-12-19 20:51:45 -05:00
Bond-009 bb62dd14c2 Limit size for playbacktest 2019-12-19 17:46:17 +01:00
Vasily 06dfa2e687
Merge pull request #2134 from Bond-009/dlnam3u8 
Fix comparison between different types
 2019-12-19 18:51:51 +03:00
Bond-009 a5cd11735c Minor changes to MediaInfoService 2019-12-19 15:54:27 +01:00
dkanada bc7cbfb21a
Merge pull request #1941 from Bond-009/mediaencoding 
Make probesize and analyzeduration configurable and simplify circular dependencies
 2019-12-18 08:54:40 +09:00
Artiume f3e7c72bac
Update MediaInfoService.cs 2019-12-16 15:22:18 -05:00
Artiume b31f4ccbc2
Update MediaInfoService.cs 2019-12-16 14:53:42 -05:00
Artiume 46442e24f8
Update MediaInfoService.cs 2019-12-16 00:43:03 -05:00
Artiume 3fb7aabfde
Update MediaInfoService.cs 2019-12-16 00:40:25 -05:00
Artiume 64c313a8fb
Update MediaInfoService.cs 2019-12-16 00:27:48 -05:00
Artiume be956dfd02
Update MediaInfoService.cs 2019-12-15 23:52:07 -05:00
dkanada 61b9845e0f
Merge pull request #2099 from cryptobank/master 
Fix VAAPI encoding on 10-bit hevc. Update QSV encoding and scaling to...
 2019-12-15 19:54:20 +09:00
dkanada 1b2453b4e9 fix playlist deletion 2019-12-14 12:51:27 +09:00
cryptobank f18d3ed33b Formatting fix (3) 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-12-14 11:27:41 +10:30
Bond-009 baadb504bb Merge branch 'master' into mediaencoding 2019-12-12 16:34:34 +01:00
dkanada 96a5dda9ff
Merge pull request #2109 from Bond-009/plugin 
Fix plugin installation and correct api behaviour
 2019-12-12 15:40:22 +09:00
Joshua M. Boniface 9744f5aee3
Merge pull request #2118 from chaosinnovator/master 
Add StartIndex result to /Items API query
 2019-12-11 23:42:02 -05:00
Bond_009 0bf8bfbb0c Merge branch 'master' into mediaencoding 2019-12-10 23:00:59 +01:00
chaosinnovator b98e25a07e Add StartIndex result to /Items API query 2019-12-10 09:30:44 -08:00
Bond-009 b20b648659 Fix comparison between different types 2019-12-10 17:25:21 +01:00
Bond-009 19844a2c2a Fix typo 2019-12-10 17:07:23 +01:00
dkanada dee3076eaf
Merge pull request #1923 from Bond-009/random 
Don't shuffle some types by default
 2019-12-10 22:28:44 +09:00
Bond_009 ec70f3ac75 Fix plugin installation and correct api behaviour 
The `/Packages/{Name}` endpoint would return a package that had either
the corrent name or the correct guid. In reality it shoud check if both
are correct.
 2019-12-06 22:06:16 +01:00
cryptobank 5b5d527a09
Use string.Equals instead of of equals operator 
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
 2019-12-07 06:47:57 +10:30
Bond-009 a2c35e6dba Merge remote-tracking branch 'upstream/master' into random 2019-12-06 12:06:13 +01:00
Petr Janda 75426d0004 Add logging when force_key_frames is disabled 2019-12-06 17:21:24 +10:30
Bond-009 5f6bca8aeb Merge remote-tracking branch 'upstream/master' into baseurl 2019-12-05 17:49:15 +01:00
Bond-009 a6f883345f Reduce #lines 2019-12-05 17:44:46 +01:00
Petr Janda 7cde256402 Merge remote-tracking branch 'upstream/master' 2019-12-05 19:29:20 +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 6f45d95951 Minor improvements to network code 2019-11-28 17:46:06 +01:00
Vasily 5263aaa026
Merge pull request #1503 from cvium/webapi_v2 
Move StartupWizard to ASP.NET Web Api
 2019-11-27 11:50:06 +03: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
Joshua M. Boniface db581c4d9b
Merge pull request #2045 from Bond-009/baseurlfix2 
Fix baseurl issues part 2
 2019-11-24 13:25:52 -05:00
dkanada 47ad21b6e3
Merge pull request #2039 from Bond-009/fixcondition 
Fix always false condition
 2019-11-24 21:41:19 +09:00
Bond_009 602ebe3fdb Fix baseurl (attempt #2) 2019-11-23 22:50:37 +01:00
dkanada 51cdc6ea16
Merge pull request #1926 from Bond-009/auth 
Add clearer exceptions, warnings and docs
 2019-11-23 01:14:32 +09:00
Bond_009 d884ed353f Fix always false condition 2019-11-22 16:19:19 +01: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
Claus Vium e5d57bd82f Move StartupWizard to ASP.NET Web Api 2019-11-19 21:48:16 +01:00
Bond_009 5ee070eb29 Remove leading / from baseurl 2019-11-17 19:53:12 +01:00
Bond-009 d161b9cbfc Fix GetPathValue function for DLNA service 2019-11-13 16:40:34 +01:00
Bond-009 aea4ef9471 Fix logic 2019-11-13 16:32:33 +01:00
Bond-009 b14d6d0417 Fix GetPathValue function 2019-11-13 16:32:33 +01:00
Andrew Mahone 4b75e6518e
Update MediaBrowser.Api/Attachments/AttachmentService.cs 
formatting

Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-11-07 11:21:40 -05:00
Bond-009 983d38a43b Merge branch 'master' into installationmanager 2019-11-07 10:50:55 +01:00
dkanada ad852ffd9a
Merge pull request #1973 from EraYaN/docs-warning-fixes 
Fix the last of the docs warnings
 2019-11-07 18:12:26 +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 bd545891c0 Indentation fix. 2019-11-04 10:38:53 -05:00
Andrew Mahone 1600d5b53f Merge remote-tracking branch 'origin/master' into media-attachments-clean 2019-11-04 10:03:18 -05:00
Joshua M. Boniface a460814182
Merge pull request #1904 from JustAMan/hls-move-2 
Switch ffmpeg to hls muxer (from segment) to fix premature stop on non-patched ffmpeg
 2019-11-03 14:36:34 -05:00
Joshua Boniface d4474d493b Remove extraneous newline 2019-11-03 12:39:45 -05:00
Erwin de Haan 387051c409 Fix the last docs warnings. 2019-11-03 15:52:10 +01:00
Bond_009 d529f81cd9 Improve IInstallationManager interface 2019-11-01 17:57:19 +01:00
Bond_009 a245f5a0d4 Rewrite hex encoder/decoder 2019-11-01 17:52:29 +01:00
dkanada 89a21c96c0
Merge pull request #1852 from Bond-009/warn9 
Fix some more warnings
 2019-11-02 01:24:44 +09:00
Bond_009 d9a03c9bb1 Fix more warnings 2019-10-29 17:55:16 +01: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
grafixeyehero 752cf08e5c update persons service 2019-10-23 01:54:32 +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
Andrew Mahone 8c89d89932 Attachment service. 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
Bond_009 fef35d0505 Add clearer exceptions, warnings and docs 2019-10-20 21:12:03 +02:00
Bond_009 bbc0875387 Don't shuffle some types by default 2019-10-20 16:08:40 +02: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
Bill Thornton 80dccdef22 Add using block and HexHelper 2019-10-02 09:51:53 -04:00
Bill Thornton 119041a425 Fix SchedulesDirect authentication 2019-10-02 01:35:28 -04:00
Joshua M. Boniface 575b96d03a
Revert "Fix premature stop when streaming" 2019-10-01 12:07:09 -04:00
Andrew Rabert fd1bdad0e2 Ignore exception when attempting to kill ffmpeg that has exited 
A race condition where this code attempts to kill an already exited
ffmpeg process is possible. This results in unnecessary error logging.

This change replaces the generic exception handling with the above
mentioned exception. No log output is produced.
 2019-09-29 19:19:53 -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
Bond_009 c9820d30ed Fix multiple mistakes and warnings 2019-09-23 20:32:44 +02:00
Bond-009 6f17a0b7af Remove legacy auth code (#1677) 
* Remove legacy auth code

* Adds tests so we don't break PasswordHash (again)
* Clean up interfaces
* Remove duplicate code

* Use auto properties

* static using

* Don't use 'this'

* Fix build
 2019-09-17 12:07:15 -04:00
Erwin de Haan e8b13ea8a9 Fix culture problem on Windows for segment_time_delta argument. 2019-09-10 16:31:35 +02:00