Alex/FFMpegCore
1
0
Fork 0
mirror of https://github.com/rosenbjerg/FFMpegCore.git synced 2025-01-19 04:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
588 commits 8 branches 13 tags 107 MiB
Commit graph

337 commits

Author SHA1 Message Date
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
Hmarik
6b294ff510 Fix null reference exception in ParseAudioStream 2020-06-03 20:06:51 +03:00
Malte Rosenbjerg
a778ccd58f Add overload to Join 2020-05-24 19:27:55 +02:00
Malte Rosenbjerg
ac6b203f39 Fix unit test 2020-05-24 19:17:21 +02:00
Malte Rosenbjerg
39dd390e81 Renaming 2020-05-24 19:17:14 +02:00
jianxingwu
0da0b0c156 PrepareSnapshotSize repair 2020-05-15 17:26:34 +08:00
jianxingwu
738176479d FFMpeg.Join error Invalid output file. File extension should be 'mpegts' required. 2020-05-15 17:03:29 +08:00
jianxingwu
74593461d4 PrepareSnapshotSize error : ratio=source.PrimaryVideoStream.Width / 0 
ratio=source.PrimaryVideoStream.Height / 0
 2020-05-15 16:58:56 +08:00
Malte Rosenbjerg
82fc6e92c9 Minor adjustment 2020-05-13 00:11:53 +02:00
Malte Rosenbjerg
b2085c4a8b Make process cancellable 2020-05-12 23:52:07 +02:00
Malte Rosenbjerg
ca89cac2f0 Snapshot improvements 
completely in-memory is now possible
 2020-05-12 22:48:20 +02:00
Malte Rosenbjerg
59f2afd2ca Minor cleanup 2020-05-12 22:47:57 +02:00
Malte Rosenbjerg
708189b837 Change default paths 2020-05-12 21:37:10 +02:00
Malte Rosenbjerg
1dc7524ecd Revert "Cleanup" 
This reverts commit d95f687e46.
 2020-05-12 21:28:50 +02:00
Malte Rosenbjerg
d95f687e46 Cleanup 2020-05-12 21:05:00 +02:00
Malte Rosenbjerg
3855215000 Default to throwing on errors 2020-05-12 17:55:31 +02:00
Malte Rosenbjerg
97d3d15a1f Merge 2020-05-12 17:32:56 +02:00
Malte Rosenbjerg
d9d42d459d Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore 2020-05-12 17:31:41 +02:00
Malte Rosenbjerg
da399a69aa Support custom temp dir and cleanup 2020-05-12 17:30:35 +02:00
Malte Rosenbjerg
ba43feb213
Merge branch 'master' into fix/pix_fmt_order 2020-05-12 17:29:24 +02:00
Максим Багрянцев
29fd4a76c0 Fixed color pallette (#58) 2020-05-12 18:26:52 +03:00
Максим Багрянцев
d76a059a36 Removed empty Enums folder from project 2020-05-12 17:55:17 +03:00
Максим Багрянцев
18cc364fff Renamed files 2020-05-12 17:54:39 +03:00
Максим Багрянцев
17fa6aafee Updated PixelFormat namespace 2020-05-12 17:53:52 +03:00
Максим Багрянцев
bbc9305e2b Added Codec, PixelFormat and ContainerFormat classes 2020-05-12 17:44:14 +03:00
Malte Rosenbjerg
f896ec126f Slight renaming 2020-05-11 00:50:49 +02:00
Malte Rosenbjerg
b854d5b43b Pass cancellation token through all input output tasks 2020-05-11 00:34:17 +02:00
Malte Rosenbjerg
48bb95e178 Add missing using for disposable 2020-05-11 00:04:53 +02:00
Malte Rosenbjerg
f22c506f46 Fix tests 2020-05-11 00:02:35 +02:00
Malte Rosenbjerg
52444d439e
Merge pull request #57 from max619/fix/invariant_culture_parsing 
Fix FormatException in Media Analysis
 2020-05-10 23:57:37 +02:00
Malte Rosenbjerg
673af9b78b QuietArgument -> VerbosityLevelArgument 2020-05-10 23:55:03 +02:00
Malte Rosenbjerg
af77e48f28 QuietArgument -> VerbosityLevelArgument 
More options
 2020-05-10 23:17:30 +02:00
Malte Rosenbjerg
188f37c9ee Use ToLowerInvariant 2020-05-10 23:16:52 +02:00
Максим Багрянцев
54c30c0e1e Fix FormatException when parsing doubles on systems whith ',' whole and fractional parts separator 2020-05-10 18:55:42 +03:00
Malte Rosenbjerg
8583b02687 Outcomment Format48bppRgb tests for now 2020-05-10 14:15:32 +02:00
Malte Rosenbjerg
8d74a3e0d7 Fixes 2020-05-10 11:31:26 +02:00
Malte Rosenbjerg
72366d573a Cleanup 2020-05-09 17:53:03 +02:00
Malte Rosenbjerg
821044f33d Update nuget info 2020-05-08 13:09:31 +02:00
Malte Rosenbjerg
f50ab577ae Fix tests 2020-05-08 13:01:59 +02:00
Malte Rosenbjerg
ec043ef075 Major refactoring 2020-05-08 11:07:51 +02:00
Malte Rosenbjerg
14ea6b1ae1 Init 2020-05-06 23:34:31 +02:00
Malte Rosenbjerg
4abd656b74 Update NuGet info 2020-05-06 22:16:44 +02:00
Malte Rosenbjerg
494e38c14a Fix tests 2020-05-06 21:15:06 +02:00
Malte Rosenbjerg
fe53609b38
Merge branch 'master' into feature/fluent-api 2020-05-06 20:57:26 +02:00
Max Bagryantsev
2bf113e01a
Merge branch 'master' into feature/piping 2020-05-05 15:14:47 +03:00
Malte Rosenbjerg
90ab2d255f
Merge pull request #52 from WeihanLi/fluent-config 
config FFMpegOptions with delegate
 2020-05-03 23:39:58 +02:00
Максим Багрянцев
5ad1a3931a RawVideoPipeDataWriter updated 2020-05-02 13:39:48 +03:00
Максим Багрянцев
df63417e11 Changed RawVideoPipeDataWriter StreamFormat, Width, Height to be readonly 2020-05-02 13:33:44 +03:00
Weihan Li
398184225b
Merge branch 'master' into clean-dependency 2020-05-02 18:14:03 +08:00
Weihan Li
302ca6f0be
Merge branch 'master' into fluent-config 2020-05-02 18:13:44 +08:00
Максим Багрянцев
f132a3b731 StreamPipeDataWriter & StreamPipeDataReader using Stream.CopyTo 2020-05-02 13:13:22 +03:00
Максим Багрянцев
b007e9105a Fixed VideoInfo ToString when no File is specified 2020-05-02 13:07:34 +03:00
Максим Багрянцев
ee16064f4c Merge remote-tracking branch 'fork/master' into feature/piping 2020-05-02 13:02:01 +03:00
Максим Багрянцев
b4dcd9ffb1 Added ContainsOnlyOneOf insted of CountExistedKeys 2020-05-02 12:41:47 +03:00
weihanli
d6e6f3f36d clean project dependency 2020-05-02 11:41:51 +08:00
weihanli
2c63f93b59 config FFMpegOptions with delegate 2020-05-02 11:26:54 +08:00