Commit graph

392 commits

Author SHA1 Message Date
Fedor Zhilkin
86ea16c432 Fix params order 2021-08-11 15:54:58 +03:00
Malte Rosenbjerg
fc9db2c04a
Merge branch 'master' into master 2021-08-11 00:43:03 +02:00
Fedor Zhilkin
562a50d874 Nullable streamIndex and inputFileIndex 2021-08-11 01:21:06 +03:00
Warrick Wilson
ac2b358fad Added CodecTag and CodecTagString properties to info derived from an FFProbe.Analyse() call. This allows for specific codecs to be identified to check compatibility with hardware limitations. 2021-08-09 14:52:39 -05:00
Malte Rosenbjerg
e363440118 Load config file, if found, on first use 2021-08-07 16:39:10 +02:00
Malte Rosenbjerg
0efaf686f3 Specify README.md as nuget readme 2021-08-07 14:54:48 +02:00
Malte Rosenbjerg
914003ee32 Move Loop(1) to image FileInput. Fix for #206 2021-08-07 14:40:58 +02:00
Malte Rosenbjerg
28278301dc Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore 2021-08-06 11:13:45 +02:00
Malte Rosenbjerg
3888a07ab2
Merge branch 'master' into master 2021-08-06 08:10:37 +02:00
alex6dj
14d457b946 Use long option for stream index for better clarity 2021-08-05 15:14:37 -04:00
alex6dj
6247bf6ea4 Document parameters 2021-08-05 15:11:23 -04:00
alex6dj
3a89062384 Subtitle hard-burn implementation. 2021-08-05 14:37:32 -04:00
Malte Rosenbjerg
fc23456eb1 Fix PcmAudioSampleWrapper namespace 2021-08-05 13:21:57 +02:00
Fedor Zhilkin
c30cf4c7ad Style guide fixes and minor refactoring 2021-08-03 21:58:40 +03:00
Fedor Zhilkin
37109bab34 Merge branch 'master' of github.com:rosenbjerg/FFMpegCore 2021-08-03 21:57:30 +03:00
alex6dj
f80d1fa3a6 Basic ffprobe subtitle support 2021-07-31 15:34:47 -04:00
Malte Rosenbjerg
0c9c526e2a Update nuget info 2021-07-16 01:10:54 +02:00
Malte Rosenbjerg
27fb37700c Improve ffprobe exceptions 2021-07-16 01:02:38 +02:00
cephei
ab82e3cc0f support specific StandardOutputEncoding & StandardErrorEncoding for ffprobe 2021-07-08 20:17:09 +08:00
Patrick Krämer
3efc34565a Support cancellation token for cancelling FFMPEG processes 2021-07-07 20:16:14 +02:00
Malte Rosenbjerg
d5e8444cb8 Update nuget info 2021-06-08 19:10:30 +02:00
Malte Rosenbjerg
f8692abc57
Merge branch 'master' into add-pcm-wrapper 2021-06-08 18:55:09 +02:00
Malte Rosenbjerg
366a1cd6c0 Remove -y 2021-06-08 18:49:22 +02:00
Julien Loir
acd462a527 Add test for the new audio pipe 2021-05-25 16:14:40 +02:00
Malte Rosenbjerg
be32a14619 Reorder using directives 2021-05-15 11:19:22 +02:00
Malte Rosenbjerg
e56521b2bb
Merge branch 'master' into add-pcm-wrapper 2021-05-15 11:17:46 +02:00
Malte Rosenbjerg
6c3129d417 Cleanup in using directives 2021-05-15 11:17:12 +02:00
Malte Rosenbjerg
9632bf5b30
Merge branch 'master' into add-pcm-wrapper 2021-05-15 11:14:44 +02:00
Malte Rosenbjerg
811471ed77 Update nuget meta 2021-05-14 01:08:01 +02:00
Malte Rosenbjerg
27a2219b8e Fixes, renames and missing stuff 2021-05-14 01:02:00 +02:00
Julien Loir
d8810682ef Add simple support for PCM audio source wrapping 2021-04-12 13:50:27 +02:00
Julien Loir
1711f98bd5 Add support for Format16bppRgb555 in Bitmap wrapper 2021-04-12 13:49:36 +02:00
Julien Loir
e10657169e Move System.IO in usings on some classes 2021-04-12 13:48:55 +02:00
Victor Horobchuk
4e6ecda884 update 2021-03-22 12:25:13 +02:00
Victor Horobchuk
4e85482988 Update 2021-03-18 21:37:02 +02:00
Victor Horobchuk
ab8be5cd57 Update 2021-03-17 09:58:01 +02:00
Victor Horobchuk
ec1b8a6b07 Add mirror and default ForceFormat for OutputPipeArgument 2021-03-17 00:09:56 +02:00
Malte Rosenbjerg
97fe2cce60 Update FFMpegCore.csproj 2021-03-15 23:44:31 +01:00
Malte Rosenbjerg
277f11d06e Update nuget meta 2021-03-15 23:43:28 +01:00
Malte Rosenbjerg
1d6517796f Fix tests 2021-03-15 23:43:22 +01:00
Malte Rosenbjerg
5a2ebcf0f3
Merge branch 'master' into master 2021-03-15 23:20:27 +01:00
Malte Rosenbjerg
8a314f02ae Move MediaAnalysis parsing helper methods to static class 2021-03-15 23:17:56 +01:00
Malte Rosenbjerg
0a146251e7 Update nuget meta 2021-03-15 23:06:34 +01:00
Malte Rosenbjerg
fc2802d5fb Renaming to OutputUrlArgument 2021-03-15 23:04:59 +01:00
Malte Rosenbjerg
340400966d Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore 2021-03-15 22:53:51 +01:00
Malte Rosenbjerg
ce7eb9228b
Merge pull request #179 from Codinlab/OutputStream
Add OutputStreamArgument
2021-03-15 22:53:42 +01:00
Malte Rosenbjerg
0face0b6e4 Bump nuget dependencies 2021-03-15 22:48:53 +01:00
Malte Rosenbjerg
6882284593 Move extension method from Bitmap to Image 2021-03-15 22:48:43 +01:00
Maxim Bagryantsev
bbd9b7f55c Moved Debug.WriteLine to Pipe disconnect 2021-03-15 20:44:48 +03:00
Maxim Bagryantsev
fe646752d3 Fixed process hang on pipe images format mismatch 2021-03-15 20:37:18 +03:00
Malte Rosenbjerg
df0205fb11 Cleanup 2021-03-07 00:26:08 +01:00
Malte Rosenbjerg
7444899106 reorder method 2021-03-06 23:33:48 +01:00
Malte Rosenbjerg
cfda317883 change FrameRate on RawVideoPipeSource to double 2021-03-06 23:26:15 +01:00
Malte Rosenbjerg
f40479e697 Update nuget info 2021-03-06 23:17:23 +01:00
Malte Rosenbjerg
a12c322de9 Add ConfigureAwait(false) 2021-03-06 23:05:38 +01:00
Malte Rosenbjerg
e49290b217 Fix tests 2021-03-06 21:25:17 +01:00
Malte Rosenbjerg
8452672ee6 Merge branch 'master' into refactor-video-filter-args 2021-03-05 18:06:50 +01:00
Malte Rosenbjerg
4f28983972 Init 2021-03-05 18:06:40 +01:00
Malte Rosenbjerg
47779dce4d
Merge pull request #180 from Codinlab/CancelTimeout
Add cancel timeout
2021-03-05 18:00:38 +01:00
Thierry Fleury
9672713e63 Add cancel timeout
(cherry picked from commit 6383164f267516fbd50d50b2a511c15c25a168dc)
2021-03-02 19:43:24 +01:00
Thierry Fleury
157a53690f Add OutputStreamArgument
(cherry picked from commit 0c64c4d81d7055a582d8377123dbc3b7ba86e444)
2021-03-02 19:40:50 +01:00
Thierry Fleury
73531b3947 Add InputDeviceArgument 2021-02-28 14:50:55 +01:00
crypton
bb08076db4 Format -ss timespan argument to calculate hours 2021-02-12 22:16:55 -08:00
crypton
35ca34c0b0 ffprobe duration parsing
- on large recordings (e.g. radio transmissions), ffprobe might return number of hours which is too large for TimeSpan.Parse (exception: The TimeSpan string '149:07:50.911750' could not be parsed because at least one of the numeric components is out of range or contains too many digits.)
- use regex groups to extract components (hours/minutes/seconds/millis) then parse/create new timespan from that
- NOTICE: this will discard microseconds provided by ffprobe, not sure if this is significant
- ffprobe has inconsitencies with how it represents millisecond component. Sometimes it may return just `82` for 820 milliseconds, so padding with 0s is required on the left. Likewise, sometimes it might return microseconds past milliseconds (first 3 significant figures); this is currently discarded
- Added InternalsVisibleTo to help with unit testing *just* the duration parsing function
2021-02-06 16:50:12 -08:00
Malte Rosenbjerg
6874ace962
Merge branch 'master' into master 2021-02-04 00:13:02 +01:00
Malte Rosenbjerg
4cb80432f6 Update FFMpegCore.csproj 2021-02-03 23:20:26 +01:00
Malte Rosenbjerg
66cdb302ef Return null when no format detected during analysis 2021-02-03 23:20:12 +01:00
Malte Rosenbjerg
8d2251c136
Merge pull request #165 from hey-red/expose-tags
Add tags on media stream and format
2021-01-29 17:50:39 +01:00
hey-red
f603163e25 Add tags on media stream and format 2021-01-29 16:03:59 +03:00
hey-red
d16efbda31 Fix incorrect condition 2021-01-23 05:40:03 +03:00
Malte Rosenbjerg
cfee86199b Add NotifyOnOutput 2020-12-18 00:40:09 +01:00
Malte Rosenbjerg
a4aba666cd Support specifying output encoding for ffmpeg and ffprobe output 2020-12-09 17:07:41 +01:00
Malte Rosenbjerg
de689dbb50
Merge branch 'master' into master 2020-12-09 11:02:26 +01:00
Malte Rosenbjerg
6bdf9da683 Also include output data on non-zero ffmpeg exitcode 2020-12-09 10:58:21 +01:00
Malte Rosenbjerg
f648a4b234 Include ffprobe std output in exception 2020-12-08 23:30:10 +01:00
Malte Rosenbjerg
fb2e1e00aa Init 2020-12-08 23:27:25 +01:00
Malte Rosenbjerg
02877f6326 Update FFMpegCore.csproj 2020-12-07 21:07:00 +01:00
Malte Rosenbjerg
418cb943ff Run post after ffmpeg has completed 2020-12-07 17:25:54 +01:00
Malte Rosenbjerg
203da6300b Fix 2020-12-07 01:20:13 +01:00
Malte Rosenbjerg
7fd7ae369d Merge branch 'master' into refactor-tests 2020-12-07 01:14:19 +01:00
Malte Rosenbjerg
57258c6f5c Only post in continuation 2020-12-07 01:13:32 +01:00
Malte Rosenbjerg
6c51f634c2 Merge branch 'dev/fixes' into refactor-tests 2020-12-07 01:11:17 +01:00
Malte Rosenbjerg
8e2b146f95 Partial revert 2020-12-07 01:11:09 +01:00
Malte Rosenbjerg
3ad127a682 Dump 2020-12-07 00:47:47 +01:00
Malte Rosenbjerg
25c650f7fc Return clone to avoid problems with disposing original memorystream 2020-12-06 01:15:16 +01:00
Malte Rosenbjerg
01b1dd228e Only disconnect if pipe not already disposed 2020-12-06 01:06:31 +01:00
Malte Rosenbjerg
224126ce75 Update nuget info 2020-12-06 00:34:59 +01:00
Malte Rosenbjerg
db95448b14 Skip disconnect on cancelled 2020-12-06 00:34:50 +01:00
Malte Rosenbjerg
fd723e06a9 Add debug info 2020-12-06 00:34:27 +01:00
Malte Rosenbjerg
8b45a6b680 Init 2020-12-03 20:47:20 +01:00
Malte Rosenbjerg
96e0a03630 Add license expression 2020-11-25 16:18:39 +01:00
Malte Rosenbjerg
5ba2ed97cf Update dependencies and add StreamPipeSink constructor 2020-11-25 16:15:16 +01:00
Fedor Zhilkin
c47214b7aa Refactoring 2020-11-13 02:09:52 +03:00
Fedor Zhilkin
c6bdf55a77 Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore 2020-11-13 01:36:00 +03:00
Malte Rosenbjerg
179cb15ba8 Fix cancellation 2020-10-28 19:26:33 +01:00
Malte Rosenbjerg
c79bc51bca
Merge branch 'release' into master 2020-10-27 01:01:12 +01:00
Malte Rosenbjerg
d4d0e9f3c2 Update nuget info 2020-10-27 00:57:06 +01:00
Malte Rosenbjerg
9feb9f5a22 Fix output pipe hanging on unix sockets 2020-10-27 00:49:49 +01:00
Malte Rosenbjerg
6b1e411bfe Cleanup 2020-10-27 00:49:28 +01:00
Malte Rosenbjerg
31685da18a Cancel on exit 2020-10-25 18:23:55 +01:00
Malte Rosenbjerg
26f5b0f4f4 Use /tmp folder for unix sockets 2020-10-25 17:50:28 +01:00
Malte Rosenbjerg
564a9e6cfd Fix build warning 2020-10-25 17:44:09 +01:00
Malte Rosenbjerg
61387fa5be Check for existence before analysing with ffprobe 2020-10-25 17:12:16 +01:00
Malte Rosenbjerg
d105ec4731 Remove unused files 2020-10-24 23:33:52 +02:00
Malte Rosenbjerg
5fb2305b5b Add HardwareAccelerationArgument 2020-10-24 23:33:44 +02:00
Malte Rosenbjerg
010e9947e9 New API 2020-10-24 22:31:54 +02:00
Malte Rosenbjerg
0136d49edf Check ffmpeg/ffprobe availability #75 2020-10-24 22:18:16 +02:00
Malte Rosenbjerg
3d50530c74 Fix unix socket naming 2020-10-24 22:17:33 +02:00
Ibrahim Islam
fc988b3bbe fixes typo 2020-10-20 06:53:24 +07:00
Ibrahim Islam
462069cefe refactors to use string interpolation 2020-10-20 06:35:51 +07:00
Ibrahim Islam
577776f30f shortens unique id generation 2020-10-20 06:31:01 +07:00
Jochen Kühner
ed537e6ab2
Update FrameRateArgument.cs
Bugfix framerate need "." as decimal seperator
2020-10-15 00:15:40 +02:00
Fedor Zhilkin
981b3294c5 Use map filtering
Use map filtering  doing snapshot
2020-09-17 20:56:28 +03:00
Fedor Zhilkin
e60fb71ff8 -map filtering
Add map filtering to choose videostream
2020-09-17 20:50:38 +03:00
Malte Rosenbjerg
76107fb93e #94 2020-08-27 17:22:23 +02:00
Malte Rosenbjerg
eea6adc6f1 Fix #97 2020-08-27 17:22:04 +02:00
Malte Rosenbjerg
78919dcdcf Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore 2020-08-27 16:38:10 +02:00
Malte Rosenbjerg
32e7f16979 Add creation-time getter property 2020-08-27 16:38:07 +02:00
Konstantin
e99b1b106f
Add using System.IO 2020-08-21 21:39:28 +09:00
Konstantin
4ecf05ec79
Fix pipe path for unix.
Replace fixed '/tmp' with Path.GetTempPath().
2020-08-21 20:10:57 +09:00
Rafael Carvalho
1c79e139fd Update MediaAnalysis's access modifier to internal 2020-08-12 17:22:32 +12:00
Rafael Carvalho
37a04a37cd Update existing references to use IMediaAnalysis 2020-08-12 17:22:10 +12:00
Rafael Carvalho
725c8b31ee Implement IMediaAnalysis in MediaAnalysis class 2020-08-12 17:18:10 +12:00
Rafael Carvalho
8c77ce0cdf Add IMediaAnalysis interface 2020-08-12 17:17:34 +12:00
Malte Rosenbjerg
e6139805a8 Update nuget info 2020-08-11 00:48:38 +02:00
Malte Rosenbjerg
3b5f677a2c Handle video frame rotation #84 2020-08-11 00:46:44 +02:00
Malte Rosenbjerg
0c19874be3 Make tags more flexible (dictionary) 2020-08-11 00:46:08 +02:00
Malte Rosenbjerg
a54a83589c Update nuget info 2020-08-08 20:13:57 +02:00
Malte Rosenbjerg
9bf2093517 Add snapshot overloads 2020-08-08 20:13:50 +02:00
xxbiohazrdxx
cb2a9a8334
Update DemuxConcatArgument.cs
Typo
2020-07-31 11:51:16 -04:00
xxbiohazrdxx
91b39b41a8 Change DemuxConcatArgument output to match FFmpeg format 2020-07-31 11:46:12 -04:00
Malte Rosenbjerg
ef49542de0 Changed input for SeekedFileInputArgument 2020-07-26 02:55:42 +02:00
Malte Rosenbjerg
59abdd2343 Add SeekedFileInputArgument and such 2020-07-26 02:45:14 +02:00
Malte Rosenbjerg
8576154d3f Clean unused using directives 2020-07-20 15:26:34 +02:00
Malte Rosenbjerg
c4c02d6d21 Write output messages to debug 2020-07-20 15:26:20 +02:00
Malte Rosenbjerg
06d5d199f8 Upgrade nuget dependencies 2020-07-20 15:25:48 +02:00
Malte Rosenbjerg
29d8829d48 Fix warnings 2020-07-13 23:56:12 +02:00
Malte Rosenbjerg
3785179a87 Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore 2020-07-13 23:54:49 +02:00
Malte Rosenbjerg
442e69ce1d Base file extension on video container info from ffmpeg 2020-07-13 23:54:46 +02:00
Mike Cochran
24f79fe3c8 Added audio codec profile to AudioStream
Added the audio codec profile and accompanying test.
2020-07-06 16:33:50 -05:00
Malte Rosenbjerg
2320217315 Update FFMpegCore.csproj 2020-06-21 21:23:59 +02:00
Malte Rosenbjerg
f3c99dffb6 Fix NullRefException in ParseFormat 2020-06-21 21:23:16 +02:00
Malte Rosenbjerg
b7b15079eb Parse Format from FFProbe show_format 2020-06-20 14:50:46 +02:00
Malte Rosenbjerg
f0b83a8941 Update FFMpegCore.csproj 2020-06-18 22:23:25 +02:00
Malte Rosenbjerg
19856923c6 .NET Standard 2.0 support 2020-06-18 21:44:45 +02:00
Malte Rosenbjerg
01d4474595 Move to separate files 2020-06-18 21:37:12 +02:00
Malte Rosenbjerg
552b5d811a Move to separate files 2020-06-18 21:36:59 +02:00
Malte Rosenbjerg
4e5d464753 Add demux concat 2020-06-16 07:42:35 +02:00
Malte Rosenbjerg
9be3fc5a07 trim excess fractions of duration tag 2020-06-16 07:42:14 +02:00
Malte Rosenbjerg
257c63b385 Update FFMpegCore.csproj 2020-06-06 15:38:19 +02:00