Nyanmisaka
df6b303da7
Merge branch 'master' into tonemap
4 years ago
Odd Stråbø
591fcf7ff2
Fix formating
4 years ago
Odd Stråbø
27709c9bb3
Fix embedded subtitles
4 years ago
nyanmisaka
4bdb870d16
Merge remote-tracking branch 'upstream/master' into tonemap
4 years ago
nyanmisaka
7b862bba5a
add Tonemapping relaying on nvdec and ocl
4 years ago
Bond-009
3ff110984a
Merge branch 'master' into readonlyspan
4 years ago
Anthony Lavado
0cb2cd9456
Merge pull request #3576 from HelloWorld017/fix/sami-utf16
...
Fix SAMI UTF-16 Encoding Bug
4 years ago
Joshua M. Boniface
6f2b23b3df
Merge pull request #3613 from Bond-009/regex
...
Replace \d with [0-9] in ffmpeg detection and scan code
4 years ago
Bond-009
323fc576a5
Merge pull request #3521 from sachk/master
...
Fix support for mixed-protocol subtitles
4 years ago
Bond_009
febb6bced6
Review usage of string.Substring (part 1)
...
Reduced allocations by replacing string.Substring with ReadOnlySpan<char>.Slice
4 years ago
Bond_009
e98351b912
Replace \d with [0-9] in ffmpeg detection and scan code
4 years ago
Khinenw
6e069f925b
Fix SAMI UTF-16 Encoding Bug
4 years ago
dkanada
87d7c4a62e
Merge pull request #3500 from nyanmisaka/vpp-qsv
...
Add FFmpeg 4.3 detection and solve the green line on QSV HWA
4 years ago
Sacha Korban
29c4220227
Fix support for mixed-protocol external subtitles
4 years ago
Patrick Barron
6d1b00da64
Use Array.Empty
4 years ago
nyanmisaka
f5c5352861
add FFmpeg 4.3 detection and tests
4 years ago
Max Git
3588ee5229
Merge branch 'master' into feature/ffmpeg-version-check
4 years ago
Neil Burrows
6b532b3da5
User string.Empty instead of ""
...
Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
4 years ago
Neil Burrows
4389773508
Respect FFMpeg path passed via Environment Variable
4 years ago
Max Git
c35c401d65
Merge branch 'master' into feature/ffmpeg-version-check
4 years ago
telans
6556bec646
brace multiline if statements (cont.)
4 years ago
telans
5bb639a59a
newlines after braces
4 years ago
telans
7f307f9082
brace multiline if statements
4 years ago
telans
98db8f72e0
fix SA1503 for one line if statements
4 years ago
telans
8de6452967
fix some documentation periods
4 years ago
Max Git
33f78df051
Merge branch 'master' into feature/ffmpeg-version-check
4 years ago
Bond-009
9af6eda0b4
Merge pull request #3343 from telans/comment-stops
...
Add full stop at end of comments (SA1629)
4 years ago
telans
247f9c61e6
fix SA1513/SA1516
4 years ago
Max Git
e6c197b969
Cleanup
4 years ago
telans
9018f8d8be
Add full stop at end of comments (SA1629)
4 years ago
Max Git
ef3200e178
Remove redundant cast
4 years ago
Max Git
11f3a0dc58
Use Version instead of double. Use correct version number for libavdevice.
4 years ago
dkanada
dabb869a6b
Merge branch 'master' into hwaccel
4 years ago
Max Git
37e737e012
Merge from master & fix conflict
4 years ago
telans
3d9049ef08
fix SA1508
4 years ago
telans
acd4389653
fix SA1005
4 years ago
dkanada
403cd3205f
Merge pull request #3254 from crobibero/ilogger
...
Use typed logger where possible
4 years ago
Max Git
0f69ca8fa9
Merge branch 'master' into feature/ffmpeg-version-check
4 years ago
Max Git
620a1a106d
Merge branch 'master' into feature/ffmpeg-version-check
4 years ago
dependabot[bot]
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
artiume
0476acf5d5
Update EncoderValidator.cs
4 years ago
Vasily
4999831604
Merge remote-tracking branch 'upstream/master' into hwaccel
4 years ago
aled
22a860a806
Fix a small number of compile warnings
4 years ago
crobibero
44957c5a9a
Use typed logger where possible
4 years ago
Max Git
5df00cb2b8
Merge branch 'master' into feature/ffmpeg-version-check
4 years ago
rotvel
480fd0a66a
Update MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
...
Co-authored-by: Cody Robibero <cody@robibe.ro>
4 years ago
Max Git
e103d087d3
Try harder at detecting FFmpeg version and enable the validation
4 years ago
Vasily
aa17a53e83
Skip only line saying "Hardware acceleration methods:" instead of some random one
5 years ago
Vasily
628734931c
Fix missing commas and merge defects
5 years ago
artiume
3c82379759
Update EncoderValidator.cs
5 years ago
artiume
407de0209e
Update MediaEncoder.cs
5 years ago
artiume
1ff95289ef
Update EncoderValidator.cs
5 years ago
nyanmisaka
b4b93995f7
add more separate hw decoding toggles
5 years ago
Bond_009
10e381f66f
Fix some 'bugs' flagged by sonarcloud
5 years ago
dkanada
4b4b50f3ee
Merge pull request #3115 from MrTimscampi/ffprobe
...
Parse color transfer and color primaries from ffprobe, and fix video range
5 years ago
MrTimscampi
9314434bbf
Fix suggestions
5 years ago
MrTimscampi
2e18142bb3
Add color primaries to ffprobe output
5 years ago
MrTimscampi
428e1b04fc
Add color transfer to ffprobe results
5 years ago
MrTimscampi
a262ecd9c7
Add positionning cues to WebVTT writer
5 years ago
Max Git
cee587d6e3
Try harder to find ffmpeg in app directory. While here do some cleanup
5 years ago
Mark Monteiro
8f02fb9a4f
Remove unused usings
...
This addresses the new issues identified in SonarCloud analysis
5 years ago
Bond-009
d744d7d234
Merge branch 'master' into register-services-correctly
5 years ago
Bond-009
c0b3c11b2e
Merge pull request #2846 from jellyfin/azure
...
Remove requirement to build web during server builds
5 years ago
Mark Monteiro
c5f163293f
Add <ProjectGuid> properties to all project files
...
This is required for SonarCloud analysis to run
5 years ago
Mark Monteiro
f815059698
Merge remote-tracking branch 'upstream/master' into register-services-correctly
5 years ago
Bond_009
a73e1f18b6
Minor improvements
5 years ago
Mark Monteiro
9728aa8b0a
Merge branch 'master' into register-services-correctly
5 years ago
Joshua M. Boniface
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
Mark Monteiro
4113288278
Fix style issues
5 years ago
Mark Monteiro
7152b55747
Use a separate line for each property initializer
5 years ago
Mark Monteiro
17e8813378
Use ActivatorUtilities to construct MediaEncoder and update constructor to inject EncodingHelper correctly
5 years ago
Mark Monteiro
e0f40f57d8
Merge remote-tracking branch 'upstream/master' into remove-common-process
5 years ago
Mark Monteiro
0e195d2e49
Add missing call to ConfigureAwait()
5 years ago
Bond-009
f31efce52d
Merge branch 'master' into usings
5 years ago
Bond_009
787049f35f
Merge branch 'master' into minor
5 years ago
Bond-009
ddd5d3aaec
Merge branch 'master' into usings
5 years ago
Vasily
9aefb41512
Merge pull request #2503 from nyanmisaka/vaapi
...
Fix various bugs in HWA subtitle burn-in
5 years ago
nyanmisaka
db23660660
prefer to use libfdk_aac for better audio quality
5 years ago
nyanmisaka
0af353404c
fix the UTF-16 error while burning ass/ssa subtitles
5 years ago
Mark Monteiro
1f5caa46c5
Fix some more issues with disposing Process instances
5 years ago
Mark Monteiro
d705931e81
Dispose of process correctly in AttachmentExtractor
5 years ago
Mark Monteiro
48bbcbb426
Use WaitForExitAsync extension method in AttachmentExtractor
5 years ago
Mark Monteiro
97c36d11d4
Use a TimeSpan instead of ms and support providing a custom CancellationToken
5 years ago
Mark Monteiro
7447ea8960
Make sure Process objects are all disposed correctly
5 years ago
Mark Monteiro
b947d98266
Delete unnecessary ProcessFactory abstraction
5 years ago
Mark Monteiro
ee2f911a2b
Remove unnecessary CommonProcess abstraction
5 years ago
Bond_009
e9d1eabd53
Remove unused usings
5 years ago
Ian Walton
4836d1674b
Don't return closed stream for subtitles. ( jellyfin/jellyfin#2650 )
5 years ago
Bond-009
2c8592fe78
Fix subtitles
5 years ago
Bond_009
a07ee65365
Minor improvements
5 years ago
Ulrich Wagner
d7f199bb1c
#2407 : Prefer MP4-Metadata for episodes
5 years ago
Bond_009
87d2479b78
Fix warnings
5 years ago
Bond_009
2186df8ac4
Update deps
5 years ago
Bond-009
c8409d2ea1
Remove FileSystem.GetStream
5 years ago
Bond-009
f3a1729964
Address comments
5 years ago
Bond-009
e882b03e81
Add back support for DVDs copied as folders
5 years ago
dkanada
4aa0b940e3
Merge pull request #2251 from nyanmisaka/master
...
add support for AMD AMF hardware encoding on Windows & Linux
5 years ago
Nyanmisaka
2c10891b66
turn on indentation.
5 years ago
Bond_009
93ab829df5
Attempt #3
5 years ago
Bond_009
0d6a4c2909
Fix build
5 years ago
Bond_009
e714b9930e
Merge branch 'master' into embytv
5 years ago
Nyanmisaka
e95239e281
add support for AMD h264_amf & hevc_amf
5 years ago
Bond-009
b1af8a4178
Rename function
5 years ago
Bond-009
277e9d2b0b
fix build
5 years ago
Bond-009
c3752b1a30
Merge branch 'master' into scanerrors
5 years ago
dkanada
423d50e978
Merge pull request #1838 from Unhelpful/media-attachments
...
Add support for embedded attachments in media files
5 years ago
dkanada
73fac50e57
rename two properties based on code suggestions
5 years ago
Bond_009
8a0ef41036
Minor improvements
5 years ago
Bond_009
a253fa616d
Fix build and address comments
5 years ago
dkanada
aca31457c0
merge branch master into media-attachments
5 years ago
Bond-009
9dfafb9e9f
Update MediaBrowser.MediaEncoding/Probing/MediaFormatInfo.cs
...
Co-Authored-By: Erwin de Haan <EraYaN@users.noreply.github.com>
5 years ago
Bond-009
49fef5f09c
Update MediaBrowser.MediaEncoding/Probing/MediaChapter.cs
...
Co-Authored-By: Erwin de Haan <EraYaN@users.noreply.github.com>
5 years ago
dkanada
534716d9c9
Merge pull request #2220 from Bond-009/unicode
...
Replace unicode char with its integer value
5 years ago
Bond-009
70210b47a4
Update MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
...
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
5 years ago
Bond_009
09d1f976d9
Replace unicode char with its integer value
5 years ago
Bond-009
59cdfdc2d9
Fix JSON subtitle writer
5 years ago
dkanada
b3963058db
Merge pull request #1891 from stanionascu/bdinfo-uhd
...
Upgrade BDInfo plugin to UHD/Atmos/DTS:X support
5 years ago
Bond_009
a41ec5c9d4
Fix typo
5 years ago
Bond_009
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
Bond_009
0bf8bfbb0c
Merge branch 'master' into mediaencoding
5 years ago
Bond_009
5cab79c839
Clean up Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
5 years ago
ferferga
94ef239de0
Add full Raspberry Pi hardware decoding support
5 years ago
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`)
5 years ago
Joshua M. Boniface
48120d01dc
Merge pull request #1991 from Bond-009/transtemp
...
Don't append transcodes to transcoding temp path
5 years ago
Bond_009
3cf9313c86
Update deps
5 years ago
Bond-009
d4b438791f
Don't append transcodes to transcoding temp path
5 years ago
Stanislav Ionascu
9989b7b68f
Replace BDInfo plugin with nupkg and UHD/Atmos/DTS:X support
5 years ago
Andrew Mahone
dee247453e
Throw InvalidOperationException when attachment extraction exits abnormally or doesn't produce output.
5 years ago
Andrew Mahone
7ea05bb86b
Merge branch 'media-attachments' of github.com:Unhelpful/jellyfin into media-attachments
5 years ago
Andrew Mahone
79858eb26c
Remove use of ProcessFactory, as well as arbitrary timeout in AttachmentExtractor.
5 years ago
Andrew Mahone
3a9bf84e3b
Update MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
...
formatting
Co-Authored-By: Bond-009 <bond.009@outlook.com>
5 years ago
Andrew Mahone
1eb3df1d6c
Update MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
...
formatting / style
Co-Authored-By: Bond-009 <bond.009@outlook.com>
5 years ago
Andrew Mahone
380d023351
Merge branch 'media-attachments' of github.com:Unhelpful/jellyfin into media-attachments
5 years ago
Andrew Mahone
2f728fd2a1
Update MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
...
formatting
Co-Authored-By: Bond-009 <bond.009@outlook.com>
5 years ago
Andrew Mahone
2338a53229
Don't user ILoggerFactory.
5 years ago
Andrew Mahone
492bbc9e13
Update MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
...
String -> string
Co-Authored-By: Bond-009 <bond.009@outlook.com>
5 years ago
Andrew Mahone
92aae268a3
Update MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
...
formatting
Co-Authored-By: Bond-009 <bond.009@outlook.com>
5 years ago
Andrew Mahone
c09eb34708
Check for attachment file before trying to remove it during cleanup.
5 years ago
Andrew Mahone
4f3b883155
Clean up handling of missing source/attachment in AttachmentExtractor.
5 years ago
Andrew Mahone
349310787c
Update MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
...
formatting
Co-Authored-By: Bond-009 <bond.009@outlook.com>
5 years ago
Andrew Mahone
6ca252ba5c
Remove check for "[0]" in codec_tag.
5 years ago
Andrew Mahone
28a6718d8e
Return path of extracted attachment, which is always a file, instead of AttachmentInfo with path and protocol.
5 years ago
Andrew Mahone
04a96788f9
Convert exceptions for missing MediaSource or MediaAttachment to ResourceNotFoundException with appropriate message.
5 years ago
Andrew Mahone
154fb1fe9b
AttachmentExtractor code cleanup.
5 years ago
Andrew Mahone
c7d303a6ae
MediaExtractor logging cleanup.
5 years ago
Andrew Mahone
9eef5f860d
AttachmentExtractor logging cleanup.
5 years ago
Andrew Mahone
e9c893f07e
Fail attachment extraction on non-zero exit code.
5 years ago
Andrew Mahone
1600d5b53f
Merge remote-tracking branch 'origin/master' into media-attachments-clean
5 years ago
dkanada
3bfb36a67d
Merge pull request #1915 from Bond-009/hex
...
Rewrite hex encoder/decoder
5 years ago
Bond_009
3f7836d9eb
Update deps and add MultiThreading analyzer
5 years ago