Commit Graph

147 Commits

Author SHA1 Message Date
dkanada
423d50e978
Merge pull request #1838 from Unhelpful/media-attachments
Add support for embedded attachments in media files
2020-01-08 11:04:21 +09:00
dkanada
73fac50e57 rename two properties based on code suggestions 2020-01-08 10:52:48 +09:00
Bond-009
9dfafb9e9f
Update MediaBrowser.MediaEncoding/Probing/MediaFormatInfo.cs
Co-Authored-By: Erwin de Haan <EraYaN@users.noreply.github.com>
2020-01-07 11:13:47 +01:00
Bond-009
49fef5f09c
Update MediaBrowser.MediaEncoding/Probing/MediaChapter.cs
Co-Authored-By: Erwin de Haan <EraYaN@users.noreply.github.com>
2020-01-07 11:13:11 +01:00
Bond-009
70210b47a4
Update MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
2020-01-06 10:39:01 +01:00
Bond_009
09d1f976d9 Replace unicode char with its integer value 2020-01-02 20:19:01 +01:00
Bond_009
a41ec5c9d4 Fix typo 2019-12-23 15:29:30 +01:00
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
```
2019-12-22 22:09:09 +01:00
Andrew Mahone
6ca252ba5c Remove check for "[0]" in codec_tag. 2019-11-05 07:09:55 -05:00
Andrew Mahone
321e5cba60 Add new MediaAttachment to store attachments found during media probing. 2019-10-22 10:30:55 -04:00
redSpoutnik
480a6607e2
Merge branch 'master' into subtitle-display-title 2019-03-16 17:54:57 +01:00
redSpoutnik
427688a0a0 Change subtitles DisplayTitle behavior 2019-03-14 22:31:51 +01:00
Bond_009
ffd6dac03a Remove useless comments 2019-03-07 12:24:44 +01:00
Erwin de Haan
38f96af079 Reformat JustAMan review pt2 changes
Refs #575
2019-01-17 20:24:39 +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
8f41ba4d3a Find+Sed BOM removal *.cs: MediaBrowser.LocalMetadata-MediaBrowser.Model 2019-01-13 21:02:23 +01:00
Erwin de Haan
f2e50f50bd Visual Studio Reformat: MediaBrowser.MediaEncoding 2019-01-13 20:26:04 +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
Bond_009
c99b45dbe0 Remove some warnings 2019-01-02 02:35:40 +03: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
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
d8e2887071 update container value 2017-08-04 16:29:34 -04:00
Luke Pulverenti
33014f77aa update GetItems method 2017-05-26 02:48:54 -04:00
Luke Pulverenti
e915ceda1b dummy up audio bitrates when needed 2017-05-10 22:57:48 -04:00
Luke Pulverenti
abc54d1ea3 determine interlaced from ffprobe data 2017-03-26 00:20:00 -04:00
Luke Pulverenti
1f63a30ee7 update mjpeg stream detection 2017-03-07 14:05:44 -05:00
Luke Pulverenti
3ff216f05a update ShortOverview 2017-01-26 15:27:12 -05:00
Luke Pulverenti
045fdaf387 update live stream bitrates 2017-01-26 01:26:58 -05:00
Luke Pulverenti
2ebcbdece8 update now playing screen 2017-01-24 00:52:47 -05:00
Luke Pulverenti
27c4c30082 update media info bitrate 2016-12-20 00:23:33 -05:00
Luke Pulverenti
7ed6c67db0 update xml parsing 2016-12-03 18:57:34 -05:00
Luke Pulverenti
83ad945015 update xml readers 2016-12-03 16:46:06 -05:00
Luke Pulverenti
f5467021b0 update probing 2016-12-03 15:00:41 -05:00
Luke Pulverenti
232da3f17b fixes #2324 - [BUG] FFProbe: StartIndex cannot be less than zero 2016-12-03 14:42:34 -05:00
Luke Pulverenti
52227ce00d update save methods 2016-11-19 03:40:13 -05:00
Luke Pulverenti
a8b340cbb2 update portable projects 2016-11-08 13:44:23 -05:00
Luke Pulverenti
eefab227cc update xml parsing 2016-11-02 13:08:20 -04:00
Luke Pulverenti
3952360ce8 reduce imported people 2016-11-01 14:28:36 -04:00
Luke Pulverenti
3094cd7ff3 update project targets 2016-10-30 03:11:37 -04:00
Luke Pulverenti
bfe2b501a6 normalize subtitle names 2016-10-29 16:02:31 -04:00
Luke Pulverenti
ef6b90b8e6 make controller project portable 2016-10-25 15:02:04 -04:00
Luke Pulverenti
07791d46a5 rework scheduled tasks in preparation of common project going portable 2016-10-23 15:14:57 -04:00
Luke Pulverenti
a69ca6c55b avoid buffering http responses 2016-10-06 14:55:01 -04:00
Luke Pulverenti
5ca29f0fba normalize subtitle names 2016-09-20 11:21:09 -04:00
Luke Pulverenti
845c4a0d62 update item by name validators 2016-08-18 11:13:18 -04:00
Luke Pulverenti
112d5d6348 try to detect 3d type 2016-08-09 01:08:36 -04:00
Luke Pulverenti
407d82ea11 support mp4 subtitles 2016-08-05 16:35:11 -04:00
Luke Pulverenti
19ee883ca2 record time base 2016-06-06 17:13:00 -04:00
Luke Pulverenti
995c34437e update tabs 2016-05-15 12:30:32 -04:00
Luke Pulverenti
ff980dc42c add DisplayTitle to media streams 2016-05-14 14:02:06 -04:00
Luke Pulverenti
dfa2557874 record IsAvc 2016-04-27 15:23:05 -04:00
Luke Pulverenti
2b4dece54a record nal length size 2016-04-17 23:50:44 -04:00
Luke Pulverenti
b0379ec7f8 improve embedded image extraction 2016-04-13 16:49:16 -04:00
Luke Pulverenti
425948359a handle empty album artists 2016-03-30 14:30:04 -04:00
Luke
7a5c453749 Merge pull request #1605 from SvenVandenbrande/dev
Remove unused code...
2016-03-28 13:09:42 -04:00
Luke Pulverenti
68a398da3e rework nav drawer 2016-03-27 23:37:33 -04:00
Sven Van den brande
168587b2a0 Remove unused code... 2016-03-27 23:11:27 +02:00
Luke Pulverenti
d4dd1cbf7f fix audio tracks 2016-02-25 01:09:10 -05:00
Luke Pulverenti
5ca2ae6395 support parsing itunes info 2016-02-24 15:20:22 -05:00
Luke Pulverenti
b52e9091bb improve support for embedded mp4 info 2016-02-24 14:29:49 -05:00
Luke Pulverenti
55d556863c switch to jquery slim 2016-02-22 15:29:24 -05:00
vicpa
147a4dc602 music lyricist, writer 2016-02-21 11:42:56 -05:00
Luke Pulverenti
f1745245ba add comment 2016-02-17 22:18:35 -05:00
Luke Pulverenti
76eb1c46e3 support more embedded video metadata 2016-02-17 21:55:15 -05:00
Luke Pulverenti
9f6fcc9e05 capture conductor 2016-01-12 15:49:33 -05:00
Luke Pulverenti
81fb823c02 record mediastream comment 2016-01-11 11:52:22 -05:00
Luke Pulverenti
ce59f19bc0 separate artists with semi-colon 2016-01-05 12:05:30 -05:00
Luke Pulverenti
d59e4ff357 update bit depth probe 2015-12-27 01:05:37 -05:00
Luke Pulverenti
c68a03b3ab capture bit depth with ffprobe 2015-12-26 21:39:11 -05:00
Luke Pulverenti
fae4079a69 restore changes 2015-12-19 23:37:59 -05:00
Luke Pulverenti
5c610d71f6 remove call from probe result normalizer 2015-12-19 11:46:32 -05:00
Luke Pulverenti
6414fc9486 remove MediaInfo 2015-12-19 10:51:38 -05:00
Luke Pulverenti
91ccbd95fc add error handling when parsing bitrate 2015-12-02 23:33:25 -05:00
Luke Pulverenti
a050f20ac5 extract ref frame count using ffprobe 2015-10-30 11:26:36 -04:00
Luke Pulverenti
51c3f270ae add codec tag value 2015-10-19 12:05:03 -04:00
Luke Pulverenti
4ad96e4ff5 update logging levels 2015-10-04 18:04:56 -04:00
Luke Pulverenti
078277ebc2 continue file system rework 2015-10-04 00:23:11 -04:00
Luke
e9317f3cbc Merge pull request #1173 from Schtek/patch-1
MusicBrainz ids as Vorbis Comments
2015-09-05 14:27:17 -04:00
RoliePolieOlie
f91bfe0dab Probe for MB-ids as generated by MB Picard 2015-09-02 17:01:27 +02:00
Luke Pulverenti
6c07e29882 update polymer 2015-08-08 12:16:34 -04:00
Luke Pulverenti
8c52c065fb update people sorting 2015-07-14 15:04:16 -04:00
Luke Pulverenti
b14ee63635 improve probing of ogg 2015-06-03 01:29:00 -04:00
Luke Pulverenti
c7171177b9 lazy load scripts 2015-05-22 15:16:14 -04:00
Luke Pulverenti
94a2cfa9f5 updated translations 2015-05-16 23:17:23 -04:00
Luke Pulverenti
5b8d3d1f25 fix embedded image resolving as video track 2015-05-13 00:16:13 -04:00
Luke Pulverenti
1e7b3af9c2 update naming project 2015-05-10 00:29:04 -04:00
Luke Pulverenti
d274d1d807 update library menu 2015-04-27 13:55:57 -04:00
Luke Pulverenti
25cdbf014e fix refFrames not being recorded 2015-04-24 23:30:44 -04:00
Luke Pulverenti
84ec2aab95 fix video probing 2015-04-07 13:51:14 -04:00
Luke Pulverenti
3cc0ad2a35 add notification services tab 2015-04-05 23:47:01 -04:00
Luke Pulverenti
30104bd8de probe live streams after opening 2015-04-05 11:01:57 -04:00
Luke Pulverenti
2b7a80cfb5 improve direct play of live streams 2015-04-04 15:35:29 -04:00