37e737e012
Merge from master & fix conflict
4 years ago
3d9049ef08
fix SA1508
4 years ago
acd4389653
fix SA1005
4 years ago
403cd3205f
Merge pull request #3254 from crobibero/ilogger
...
Use typed logger where possible
4 years ago
0f69ca8fa9
Merge branch 'master' into feature/ffmpeg-version-check
4 years ago
620a1a106d
Merge branch 'master' into feature/ffmpeg-version-check
4 years ago
33f70bd5f0
Bump System.Text.Encoding.CodePages from 4.7.0 to 4.7.1
...
Bumps [System.Text.Encoding.CodePages](https://github.com/dotnet/corefx ) from 4.7.0 to 4.7.1.
- [Release notes](https://github.com/dotnet/corefx/releases )
- [Commits](https://github.com/dotnet/corefx/commits )
Signed-off-by: dependabot[bot] <support@github.com>
4 years ago
0476acf5d5
Update EncoderValidator.cs
4 years ago
4999831604
Merge remote-tracking branch 'upstream/master' into hwaccel
4 years ago
22a860a806
Fix a small number of compile warnings
4 years ago
44957c5a9a
Use typed logger where possible
4 years ago
5df00cb2b8
Merge branch 'master' into feature/ffmpeg-version-check
4 years ago
480fd0a66a
Update MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
...
Co-authored-by: Cody Robibero <cody@robibe.ro>
4 years ago
e103d087d3
Try harder at detecting FFmpeg version and enable the validation
4 years ago
aa17a53e83
Skip only line saying "Hardware acceleration methods:" instead of some random one
5 years ago
628734931c
Fix missing commas and merge defects
5 years ago
3c82379759
Update EncoderValidator.cs
5 years ago
407de0209e
Update MediaEncoder.cs
5 years ago
1ff95289ef
Update EncoderValidator.cs
5 years ago
b4b93995f7
add more separate hw decoding toggles
5 years ago
10e381f66f
Fix some 'bugs' flagged by sonarcloud
5 years ago
4b4b50f3ee
Merge pull request #3115 from MrTimscampi/ffprobe
...
Parse color transfer and color primaries from ffprobe, and fix video range
5 years ago
9314434bbf
Fix suggestions
5 years ago
2e18142bb3
Add color primaries to ffprobe output
5 years ago
428e1b04fc
Add color transfer to ffprobe results
5 years ago
a262ecd9c7
Add positionning cues to WebVTT writer
5 years ago
cee587d6e3
Try harder to find ffmpeg in app directory. While here do some cleanup
5 years ago
8f02fb9a4f
Remove unused usings
...
This addresses the new issues identified in SonarCloud analysis
5 years ago
d744d7d234
Merge branch 'master' into register-services-correctly
5 years ago
c0b3c11b2e
Merge pull request #2846 from jellyfin/azure
...
Remove requirement to build web during server builds
5 years ago
c5f163293f
Add <ProjectGuid> properties to all project files
...
This is required for SonarCloud analysis to run
5 years ago
f815059698
Merge remote-tracking branch 'upstream/master' into register-services-correctly
5 years ago
a73e1f18b6
Minor improvements
5 years ago
9728aa8b0a
Merge branch 'master' into register-services-correctly
5 years ago
bf92694f8b
Merge pull request #2715 from nyanmisaka/libfdk-aac
...
Prefer to use libfdk_aac encoder for better audio quality when it is available
5 years ago
4113288278
Fix style issues
5 years ago
7152b55747
Use a separate line for each property initializer
5 years ago
17e8813378
Use ActivatorUtilities to construct MediaEncoder and update constructor to inject EncodingHelper correctly
5 years ago
e0f40f57d8
Merge remote-tracking branch 'upstream/master' into remove-common-process
5 years ago
0e195d2e49
Add missing call to ConfigureAwait()
5 years ago
f31efce52d
Merge branch 'master' into usings
5 years ago
787049f35f
Merge branch 'master' into minor
5 years ago
ddd5d3aaec
Merge branch 'master' into usings
5 years ago
9aefb41512
Merge pull request #2503 from nyanmisaka/vaapi
...
Fix various bugs in HWA subtitle burn-in
5 years ago
db23660660
prefer to use libfdk_aac for better audio quality
5 years ago
0af353404c
fix the UTF-16 error while burning ass/ssa subtitles
5 years ago
1f5caa46c5
Fix some more issues with disposing Process instances
5 years ago
d705931e81
Dispose of process correctly in AttachmentExtractor
5 years ago
48bbcbb426
Use WaitForExitAsync extension method in AttachmentExtractor
5 years ago
97c36d11d4
Use a TimeSpan instead of ms and support providing a custom CancellationToken
5 years ago
7447ea8960
Make sure Process objects are all disposed correctly
5 years ago
b947d98266
Delete unnecessary ProcessFactory abstraction
5 years ago
ee2f911a2b
Remove unnecessary CommonProcess abstraction
5 years ago
e9d1eabd53
Remove unused usings
5 years ago
4836d1674b
Don't return closed stream for subtitles. ( jellyfin/jellyfin#2650 )
5 years ago
2c8592fe78
Fix subtitles
5 years ago
a07ee65365
Minor improvements
5 years ago
d7f199bb1c
#2407 : Prefer MP4-Metadata for episodes
5 years ago
87d2479b78
Fix warnings
5 years ago
2186df8ac4
Update deps
5 years ago
c8409d2ea1
Remove FileSystem.GetStream
5 years ago
f3a1729964
Address comments
5 years ago
e882b03e81
Add back support for DVDs copied as folders
5 years ago
4aa0b940e3
Merge pull request #2251 from nyanmisaka/master
...
add support for AMD AMF hardware encoding on Windows & Linux
5 years ago
2c10891b66
turn on indentation.
5 years ago
93ab829df5
Attempt #3
5 years ago
0d6a4c2909
Fix build
5 years ago
e714b9930e
Merge branch 'master' into embytv
5 years ago
e95239e281
add support for AMD h264_amf & hevc_amf
5 years ago
b1af8a4178
Rename function
5 years ago
277e9d2b0b
fix build
5 years ago
c3752b1a30
Merge branch 'master' into scanerrors
5 years ago
423d50e978
Merge pull request #1838 from Unhelpful/media-attachments
...
Add support for embedded attachments in media files
5 years ago
73fac50e57
rename two properties based on code suggestions
5 years ago
8a0ef41036
Minor improvements
5 years ago
a253fa616d
Fix build and address comments
5 years ago
aca31457c0
merge branch master into media-attachments
5 years ago
9dfafb9e9f
Update MediaBrowser.MediaEncoding/Probing/MediaFormatInfo.cs
...
Co-Authored-By: Erwin de Haan <EraYaN@users.noreply.github.com>
5 years ago
49fef5f09c
Update MediaBrowser.MediaEncoding/Probing/MediaChapter.cs
...
Co-Authored-By: Erwin de Haan <EraYaN@users.noreply.github.com>
5 years ago
534716d9c9
Merge pull request #2220 from Bond-009/unicode
...
Replace unicode char with its integer value
5 years ago
70210b47a4
Update MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
...
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
5 years ago
09d1f976d9
Replace unicode char with its integer value
5 years ago
59cdfdc2d9
Fix JSON subtitle writer
5 years ago
b3963058db
Merge pull request #1891 from stanionascu/bdinfo-uhd
...
Upgrade BDInfo plugin to UHD/Atmos/DTS:X support
5 years ago
a41ec5c9d4
Fix typo
5 years ago
cf2e2a3f30
Fix exceptions while scanning
...
Fixes these exceptions:
```
[2019-12-22 20:48:14.779 +01:00] [ERR] Error in WaitForExit
System.InvalidOperationException: No process is associated with this object.
at System.Diagnostics.Process.EnsureState(State state)
at System.Diagnostics.Process.EnsureState(State state)
at System.Diagnostics.Process.GetWaitState()
at System.Diagnostics.Process.WaitForExitCore(Int32 milliseconds)
at System.Diagnostics.Process.WaitForExit(Int32 milliseconds)
at Emby.Server.Implementations.Diagnostics.CommonProcess.WaitForExit(Int32 timeMs) in /home/pi/dev/jellyfin/Emby.Server.Implementations/Diagnostics/CommonProcess.cs:line 100
at MediaBrowser.MediaEncoding.Encoder.MediaEncoder.StopProcess(ProcessWrapper process, Int32 waitTimeMs) in /home/pi/dev/jellyfin/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs:line 785
[2019-12-22 20:48:14.790 +01:00] [INF] Killing ffmpeg process
[2019-12-22 20:48:14.795 +01:00] [ERR] Error killing process
System.InvalidOperationException: No process is associated with this object.
at System.Diagnostics.Process.EnsureState(State state)
at System.Diagnostics.Process.EnsureState(State state)
at System.Diagnostics.Process.Kill()
at Emby.Server.Implementations.Diagnostics.CommonProcess.Kill() in /home/pi/dev/jellyfin/Emby.Server.Implementations/Diagnostics/CommonProcess.cs:line 95
at MediaBrowser.MediaEncoding.Encoder.MediaEncoder.StopProcess(ProcessWrapper process, Int32 waitTimeMs) in /home/pi/dev/jellyfin/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs:line 799
[2019-12-22 20:48:14.808 +01:00] [ERR] Error in "ffprobe"
System.Text.Json.JsonException: The JSON value could not be converted to System.String. Path: $.streams[0].start_pts | LineNumber: 32 | BytePositionInLine: 26.
---> System.InvalidOperationException: Cannot get the value of a token type 'Number' as a string.
at System.Text.Json.Utf8JsonReader.GetString()
at System.Text.Json.Serialization.Converters.JsonConverterString.Read(Utf8JsonReader& reader, Type typeToConvert, JsonSerializerOptions options)
at System.Text.Json.JsonPropertyInfoNotNullable`4.OnRead(JsonTokenType tokenType, ReadStack& state, Utf8JsonReader& reader)
at System.Text.Json.JsonPropertyInfo.Read(JsonTokenType tokenType, ReadStack& state, Utf8JsonReader& reader)
at System.Text.Json.JsonSerializer.HandleValue(JsonTokenType tokenType, JsonSerializerOptions options, Utf8JsonReader& reader, ReadStack& state)
at System.Text.Json.JsonSerializer.ReadCore(JsonSerializerOptions options, Utf8JsonReader& reader, ReadStack& readStack)
--- End of inner exception stack trace ---
at System.Text.Json.ThrowHelper.ReThrowWithPath(ReadStack& readStack, Utf8JsonReader& reader, Exception ex)
at System.Text.Json.JsonSerializer.ReadCore(JsonSerializerOptions options, Utf8JsonReader& reader, ReadStack& readStack)
at System.Text.Json.JsonSerializer.ReadCore(JsonReaderState& readerState, Boolean isFinalBlock, ReadOnlySpan`1 buffer, JsonSerializerOptions options, ReadStack& readStack)
at System.Text.Json.JsonSerializer.ReadAsync[TValue](Stream utf8Json, Type returnType, JsonSerializerOptions options, CancellationToken cancellationToken)
at MediaBrowser.MediaEncoding.Encoder.MediaEncoder.GetMediaInfoInternal(String inputPath, String primaryPath, MediaProtocol protocol, Boolean extractChapters, String probeSizeArgument, Boolean isAudio, Nullable`1 videoType, Boolean forceEnableLogging, CancellationToken cancellationToken) in /home/pi/dev/jellyfin/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs:line 399
at MediaBrowser.Providers.MediaInfo.FFProbeVideoInfo.ProbeVideo[T](T item, MetadataRefreshOptions options, CancellationToken cancellationToken) in /home/pi/dev/jellyfin/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs:line 122
at MediaBrowser.Providers.Manager.MetadataService`2.RunCustomProvider(ICustomMetadataProvider`1 provider, TItemType item, String logName, MetadataRefreshOptions options, RefreshResult refreshResult, CancellationToken cancellationToken) in /home/pi/dev/jellyfin/MediaBrowser.Providers/Manager/MetadataService.cs:line 815
```
5 years ago
0bf8bfbb0c
Merge branch 'master' into mediaencoding
5 years ago
5cab79c839
Clean up Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
5 years ago
94ef239de0
Add full Raspberry Pi hardware decoding support
5 years ago
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`)
5 years ago
48120d01dc
Merge pull request #1991 from Bond-009/transtemp
...
Don't append transcodes to transcoding temp path
5 years ago
3cf9313c86
Update deps
5 years ago
d4b438791f
Don't append transcodes to transcoding temp path
5 years ago
9989b7b68f
Replace BDInfo plugin with nupkg and UHD/Atmos/DTS:X support
5 years ago
dee247453e
Throw InvalidOperationException when attachment extraction exits abnormally or doesn't produce output.
5 years ago
7ea05bb86b
Merge branch 'media-attachments' of github.com:Unhelpful/jellyfin into media-attachments
5 years ago
79858eb26c
Remove use of ProcessFactory, as well as arbitrary timeout in AttachmentExtractor.
5 years ago
3a9bf84e3b
Update MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
...
formatting
Co-Authored-By: Bond-009 <bond.009@outlook.com>
5 years ago
1eb3df1d6c
Update MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
...
formatting / style
Co-Authored-By: Bond-009 <bond.009@outlook.com>
5 years ago
380d023351
Merge branch 'media-attachments' of github.com:Unhelpful/jellyfin into media-attachments
5 years ago
2f728fd2a1
Update MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
...
formatting
Co-Authored-By: Bond-009 <bond.009@outlook.com>
5 years ago
2338a53229
Don't user ILoggerFactory.
5 years ago
492bbc9e13
Update MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
...
String -> string
Co-Authored-By: Bond-009 <bond.009@outlook.com>
5 years ago
92aae268a3
Update MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
...
formatting
Co-Authored-By: Bond-009 <bond.009@outlook.com>
5 years ago
c09eb34708
Check for attachment file before trying to remove it during cleanup.
5 years ago
4f3b883155
Clean up handling of missing source/attachment in AttachmentExtractor.
5 years ago
349310787c
Update MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
...
formatting
Co-Authored-By: Bond-009 <bond.009@outlook.com>
5 years ago
6ca252ba5c
Remove check for "[0]" in codec_tag.
5 years ago
28a6718d8e
Return path of extracted attachment, which is always a file, instead of AttachmentInfo with path and protocol.
5 years ago
04a96788f9
Convert exceptions for missing MediaSource or MediaAttachment to ResourceNotFoundException with appropriate message.
5 years ago
154fb1fe9b
AttachmentExtractor code cleanup.
5 years ago
c7d303a6ae
MediaExtractor logging cleanup.
5 years ago
9eef5f860d
AttachmentExtractor logging cleanup.
5 years ago
e9c893f07e
Fail attachment extraction on non-zero exit code.
5 years ago
1600d5b53f
Merge remote-tracking branch 'origin/master' into media-attachments-clean
5 years ago
3bfb36a67d
Merge pull request #1915 from Bond-009/hex
...
Rewrite hex encoder/decoder
5 years ago
3f7836d9eb
Update deps and add MultiThreading analyzer
5 years ago
a245f5a0d4
Rewrite hex encoder/decoder
5 years ago
12f752d8b1
FFMPEG extractor for attachments.
5 years ago
321e5cba60
Add new MediaAttachment to store attachments found during media probing.
5 years ago
3e1aab6b29
Fix ffmpeg version check for unknown versions
5 years ago
1b01a6ece1
Add tests for EncoderValidator
...
* Add support for ffmpeg 4.2
* Parse the complete ffmpeg version instead of only the first 2 digits
* Make max and min version optional
* Remove max limitation (for now)
* Style improvements
5 years ago
c9820d30ed
Fix multiple mistakes and warnings
5 years ago
2919cf28ea
Update deps ( #1735 )
5 years ago
1616f24cee
Fix more warnings
5 years ago
bb04545068
Merge pull request #1614 from Bond-009/docs2
...
Document all public/internal members of Emby.Drawing
5 years ago
838e5d05d5
Document all public/internal members of Emby.Drawing
...
Forces all new public/internal members to be documented.
Enables TreatWarningsAsErrors for Emby.Drawing
5 years ago
003238ef5e
Update deps + document startup project
...
* Fixed the release build
* Documented all public/internal members of Jellyfin.Server
* Enable TreatWarningsAsErrors for debug builds for Jellyfin.Server
This will ensure that any new public/internal members of Jellyfin.Server
are documented
5 years ago
59518ec87e
Fixed SMI to SRT UTF-16 Encoding bug
5 years ago
dbc2cda9d4
Merge pull request #1369 from teacupx/master
...
Enable Exynos MFC encoder and fix transcoding bitrate control
5 years ago
5554595255
Update deps
5 years ago
5c1fbfca03
Stop path substitution in SubtitleEncoder
...
This fixes jellyfin/jellyfin#1446 . I am not an expert in this section of
code, but I cannot think of a need to do path substitution during
subtitle encoding.
5 years ago
5d85076ad5
Enable Exynos V4L2-m2m HW encoder
6 years ago
91cd7d2f6b
Limit amount of ffmpeg processes extracting images at once
6 years ago
a7e31ef31f
applied changes to just also search jellyfin base dir
6 years ago
480a6607e2
Merge branch 'master' into subtitle-display-title
6 years ago
427688a0a0
Change subtitles DisplayTitle behavior
6 years ago
21cc38fcf4
Adjusted AssemblyCopyright attribute values.
6 years ago
ee7bf86e0f
Adjusted the Product Name so the User Agent is correct/better.
6 years ago
605bf0e8c3
Merge pull request #1100 from ploughpuff/rmprobeswitch
...
Finalise removal of --ffprobe switch
6 years ago
89e2af6b57
Merge pull request #1096 from dkanada/opensubs
...
Remove open subtitles from the server
6 years ago
b864e9da2a
Finalise removal of --ffprobe switch
...
Removed --ffprobe from src files and server/docker scripts.
6 years ago
3ddbda9aca
Merge branch 'master' into xml
6 years ago
715ddbb3b0
remove open subtitles from the server
6 years ago
ab9859ecef
Address comment
6 years ago
37ea50a572
Reduce the amount of exceptions thrown
6 years ago
a4b52b7264
Merge pull request #844 from ploughpuff/ffmpeg
...
Reworked FFmpeg path discovery and always display to user
6 years ago
ffd6dac03a
Remove useless comments
6 years ago
2242c8d793
Merge pull request #915 from cvium/remove_encryptionmanager
...
Remove IEncryptionManager
6 years ago
2617a49b78
Renamed Init() to SetFFmpegPath()
6 years ago
Max Git
telans
dkanada
dependabot[bot]
artiume
Vasily
aled
crobibero
nyanmisaka
Bond_009
MrTimscampi
Mark Monteiro
Joshua M. Boniface
Vasily
Ian Walton
Ulrich Wagner
Nyanmisaka
ferferga
Stanislav Ionascu
Andrew Mahone
Khinenw
Tristan McCann
JMCC
Phallacy
redSpoutnik
Erwin de Haan
PloughPuff