pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,042 Commits 28 Branches 75 Tags 1.3 GiB
Commit Graph

4185 Commits

Author SHA1 Message Date
jkhsjdhjs 547d97d602
Use `eof_action=pass` when overlaying subtitles 
The previous behavior using `eof_action=endall` and `shortest=1` would
end the video stream if one of the input stream (video, subtitle) ends.
In some cases the duration of the overlayed subtitles is shorter than the
video stream, causing the output to end when the subtitles end and dropping
the remaining video stream.

This commit changes this behavior so `eof_action=pass` is used instead,
which continues passing the video stream through even if the subtitles end
earlier [1]. `shortest=1` is also removed, as this option implies
`eof_action=endall`.

If the subtitle stream has a higher duration than the video stream, the output
will also end with the video stream without `shortest=1`, as the video stream
is the primary input to the `overlay` filter.

Fix #10698

[1] https://ffmpeg.org/ffmpeg-filters.html#Options-for-filters-with-several-inputs-_0028framesync_0029
 2023-12-13 13:11:42 +01:00
Patrick Barron 0d5bbfda32
Remove unused DLNA models (#10685) 
* Remove unused DLNA models

* Remove IDlnaManager
 2023-12-06 16:06:42 -07:00
Claus Vium 0be2817ccb
Merge pull request #10371 from Pithaya/feat/book-persons 
Allow persons on books
 2023-11-23 23:09:06 +01:00
Bond_009 faa22cdb84 Update deps 
* Removes SourceLink as it should work automagically with .NET 8
 2023-11-16 00:50:48 +01:00
Bond_009 b62b0ec2b5 Fix warnings 2023-11-14 21:14:21 +01:00
Bond_009 eb022c49cc Update to .NET 8 2023-11-14 21:12:16 +01:00
Pithaya eb2bcc91c5
Merge branch 'master' into feat/book-persons 2023-11-13 18:07:23 +01:00
Bond-009 fc694289a9
Merge pull request #10557 from barronpm/dlna-plugin 
Move DLNA to Plugin (Part 1)
 2023-11-12 16:23:11 +01:00
Patrick Barron 1e1e1560a4 Add IServerApplicationHost parameter to IPluginServiceRegistrator 2023-11-10 07:43:46 -05:00
Cody Robibero 892973a9e3
Merge branch 'master' into media-type 2023-11-09 22:03:55 -07:00
Cody Robibero 906f701fa8
Convert CollectionType, SpecialFolderType to enum (#9764) 
* Convert CollectionType, SpecialFolderType to enum

* Hide internal enum CollectionType values

* Apply suggestions from code review

Co-authored-by: Shadowghost <Shadowghost@users.noreply.github.com>

* Fix recent change

* Update Jellyfin.Data/Attributes/OpenApiIgnoreEnumAttribute.cs

Co-authored-by: Patrick Barron <barronpm@gmail.com>

---------

Co-authored-by: Shadowghost <Shadowghost@users.noreply.github.com>
Co-authored-by: Patrick Barron <barronpm@gmail.com>
 2023-11-09 14:00:29 -07:00
Cody Robibero c7a94d48ae
Convert ItemSortBy to enum (#9765) 
* Convert ItemSortBy to enum

* Rename Unknown to Default
 2023-11-09 14:00:13 -07:00
Bond_009 a9ef103c95 Add IDisposableAnalyzers to more projects 2023-11-05 02:01:14 +01:00
Claus Vium 0973f1e0ba
Merge pull request #10357 from herby2212/kill-inactive-streams-v2 
Add auto close of an inactive session after X minutes
 2023-10-27 09:47:43 +02:00
nyanmisaka 9c270b149c Fix mismatch between intel VAAPI UMD/KMD in rare cases 
Signed-off-by: nyanmisaka <nst799610810@gmail.com>
 2023-10-22 19:06:35 +08:00
herby2212 27ceee8b6c update to current master to resolve merge conflict 2023-10-21 01:20:59 +02:00
Nick cd662506a1 Merge branch 'master' into trickplay 2023-10-18 19:27:05 -07:00
Stepan Goremykin 38d962242a Merge branch 'master' into fix-resharper-warnings 
# Conflicts:
#	Emby.Server.Implementations/Updates/InstallationManager.cs
#	tests/Jellyfin.Server.Integration.Tests/OpenApiSpecTests.cs
 2023-10-14 00:45:52 +02:00
Stepan Goremykin 8d7e4229ca Merge branch 'master' into fix-resharper-warnings 
# Conflicts:
#	Emby.Server.Implementations/Net/SocketFactory.cs
#	RSSDP/SsdpCommunicationsServer.cs
#	RSSDP/SsdpDeviceLocator.cs
#	RSSDP/SsdpDevicePublisher.cs
 2023-10-12 20:11:16 +02:00
Bond_009 d7748cfa04 Multiple Stream changes 
* Remove useless MemoryStream in DlnaHttpClient
* Use HttpContent.ReadFromJsonAsync extension
* Call ConfigureAwait for IAsyncDisposable
* Use HttpContent.CopyToAsync where possible
 2023-10-11 18:32:57 +02:00
Cody Robibero 2920611ffc Convert string MediaType to enum MediaType 2023-10-10 15:57:15 -06:00
Patrick Barron 1ce49b4a04
Merge branch 'master' into xml-parsing-cleanup 2023-10-10 12:00:45 -04:00
Bond-009 6b06a43c3f
Merge pull request #10347 from Bond-009/drawing 2023-10-10 13:12:53 +02:00
Bond-009 fc1f0a31a1
Merge pull request #10337 from barronpm/system-manager 2023-10-10 13:12:43 +02:00
Bond_009 c707baed83 Jellyfin.Drawing minor improvements 
Reduce duplicate/dead code
 2023-10-08 17:10:04 +02:00
Bond-009 0b31997b2f
Merge pull request #10348 from Bond-009/strings 2023-10-08 14:07:30 +02:00
Stepan Goremykin fdef9356b9 Use null propagation 2023-10-08 01:25:37 +02:00
Stepan Goremykin 2d7835c848 Join declaration and assignment 2023-10-08 01:16:43 +02:00
Pithaya cc590f82b9 Allow people on books 2023-10-08 01:08:03 +02:00
Stepan Goremykin 6512f85ccb Pass cancellation token 2023-10-08 00:55:14 +02:00
Stepan Goremykin f84469d500 Remove redundant using directives 2023-10-08 00:50:02 +02:00
Stepan Goremykin 526f9a825c Make files readonly 2023-10-08 00:40:58 +02:00
Stepan Goremykin 8ea812b65d Reduce string literal length by using verbatim string 2023-10-08 00:26:12 +02:00
herby2212 db5c2f738e integrate development from v1 2023-10-07 21:18:21 +02:00
Bond-009 1141883f77
Merge pull request #10321 from feilongfl/master 2023-10-07 00:15:01 +02:00
Patrick Barron c38fbece03 Remove unnecessary Trim() from GetPersonFromXmlNode 2023-10-06 16:57:36 -04:00
Patrick Barron 40e1c5f4c6 Remove logger parameter from XmlReaderExtensions.TryReadDateTime 2023-10-06 16:56:50 -04:00
Patrick Barron 1dd6442e89 Use extension methods in GetPersonFromXmlNode 2023-10-06 16:43:50 -04:00
Patrick Barron 0e51ffa169 Add TryReadInt to XmlReaderExtensions 2023-10-06 15:35:26 -04:00
Patrick Barron 8a7a1cc723 Add ReadNormalizedString to XmlReaderExtensions 2023-10-06 15:12:49 -04:00
Patrick Barron 99832642ce Add TryParseDateTime and TryParseDateTimeExact to XmlReaderExtensions 2023-10-06 14:18:56 -04:00
Patrick Barron 1a6ec2c740 Add GetStringArray and GetPersonArray to XmlReaderExtensions 2023-10-06 13:40:08 -04:00
Patrick Barron bdca4ed322 Add XmlReader.GetPersonFromXmlNode 2023-10-06 12:46:35 -04:00
Claus Vium 6593aa1255
Merge pull request #10135 from 0x25CBFC4F/fix/ffmpeg-probesize 
Fixed probesize argument passing to FFmpeg
 2023-10-06 11:38:31 +02:00
Claus Vium a18b3fbe70
simplify the if 2023-10-06 10:49:20 +02:00
Bond_009 b176beb88e Reduce string allocations 
Some simple changes to reduce the number of allocated strings
 2023-10-06 01:04:25 +02:00
fei long 33b3331c72
change Substring to AsSpan 
Co-authored-by: Bond-009 <bond.009@outlook.com>
 2023-10-06 06:26:52 +08:00
Patrick Barron 6f7413812f Add SystemManager service 2023-10-04 14:40:00 -04:00
Claus Vium 467aa40d21
Merge pull request #10222 from Bond-009/photos 2023-10-03 19:23:35 +02:00
Bond-009 14b06ecbe2
Merge pull request #10261 from barronpm/ihostlifetime 2023-10-03 11:05:10 +02:00