Commit graph

201 commits

Author SHA1 Message Date
Malte Rosenbjerg
0da37cca9f Fix tests
Former-commit-id: 494e38c14a
2020-05-06 21:15:06 +02:00
Malte Rosenbjerg
be932d3e49 Merge branch 'master' into feature/fluent-api
Former-commit-id: fe53609b38
2020-05-06 20:57:26 +02:00
Max Bagryantsev
80622fb16c Merge branch 'master' into feature/piping
Former-commit-id: 2bf113e01a
2020-05-05 15:14:47 +03:00
Malte Rosenbjerg
3e800c7e32 Merge pull request #52 from WeihanLi/fluent-config
config FFMpegOptions with delegate

Former-commit-id: 90ab2d255f
2020-05-03 23:39:58 +02:00
Максим Багрянцев
c7047b6a5f RawVideoPipeDataWriter updated
Former-commit-id: 5ad1a3931a
2020-05-02 13:39:48 +03:00
Максим Багрянцев
b9b13052b9 Changed RawVideoPipeDataWriter StreamFormat, Width, Height to be readonly
Former-commit-id: df63417e11
2020-05-02 13:33:44 +03:00
Weihan Li
955bf08fad Merge branch 'master' into clean-dependency
Former-commit-id: 398184225b
2020-05-02 18:14:03 +08:00
Weihan Li
ee2db4d887 Merge branch 'master' into fluent-config
Former-commit-id: 302ca6f0be
2020-05-02 18:13:44 +08:00
Максим Багрянцев
9e0c15cb64 StreamPipeDataWriter & StreamPipeDataReader using Stream.CopyTo
Former-commit-id: f132a3b731
2020-05-02 13:13:22 +03:00
Максим Багрянцев
ed1284fc31 Fixed VideoInfo ToString when no File is specified
Former-commit-id: b007e9105a
2020-05-02 13:07:34 +03:00
Максим Багрянцев
71bd6f3f88 Merge remote-tracking branch 'fork/master' into feature/piping
Former-commit-id: ee16064f4c
2020-05-02 13:02:01 +03:00
Максим Багрянцев
56fd0495ab Added ContainsOnlyOneOf insted of CountExistedKeys
Former-commit-id: b4dcd9ffb1
2020-05-02 12:41:47 +03:00
weihanli
480a10a13c clean project dependency
Former-commit-id: d6e6f3f36d
2020-05-02 11:41:51 +08:00
weihanli
16a318d664 config FFMpegOptions with delegate
Former-commit-id: 2c63f93b59
2020-05-02 11:26:54 +08:00
Weihan Li
4d156a31c9 Merge branch 'master' into features/raw-argument
Former-commit-id: 1688e0d6e4
2020-05-02 11:07:04 +08:00
weihanli
5a6d61cfe3 rename RawArgument to CustomArgument
Former-commit-id: eb521ae908
2020-05-02 11:05:44 +08:00
Malte Rosenbjerg
6f925f76a7 Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore
Former-commit-id: 1f7e663765
2020-05-01 10:07:43 +02:00
Malte Rosenbjerg
78e3f5e0c5 Add AudioBitrate as separate Argument
Former-commit-id: 4b88229f72
2020-05-01 10:07:40 +02:00
Максим Багрянцев
0ca11ec962 Added DrawTextOptions
Former-commit-id: 240c9bb23b
2020-04-30 15:13:47 +03:00
Максим Багрянцев
64363d2f71 Added Fluent API methods for ArgumentContainer
Former-commit-id: d8b2cbe3ca
2020-04-30 14:46:20 +03:00
Максим Багрянцев
50f353aac7 Added exit code checking to FFProbe stream methods
Former-commit-id: 883185b5ec
2020-04-28 22:43:53 +03:00
Максим Багрянцев
2a6347e1db Updated FFmpeg RunProcess and RunProcessAsyncFunctions
Former-commit-id: 412456857f
2020-04-28 22:40:00 +03:00
Максим Багрянцев
214859aa0b Updated FFProbe
Former-commit-id: 11edbbea2b
2020-04-28 22:39:26 +03:00
Максим Багрянцев
d94065d4b3 Changed ForceFormatArgument and VideoCodecArgument to string arguments
Former-commit-id: 06f5c319ad
2020-04-28 22:36:03 +03:00
Максим Багрянцев
b5361b69b0 Updated Input and Output Pipe arguments. Derived them from PipieArgument
Former-commit-id: b83479e1b6
2020-04-28 22:34:04 +03:00
Максим Багрянцев
e462b424eb Simplified ContainsInputOutput implementation
Former-commit-id: 1d51163a05
2020-04-28 18:50:29 +03:00
Максим Багрянцев
b0aedbad87 Added StreamFormat property to StreamPipeDataWriter
Former-commit-id: 6845fe3bc7
2020-04-28 18:43:54 +03:00
Максим Багрянцев
6bb03f6e14 Renamed IPipeSource to IpipeDataWriter
Former-commit-id: b7099f6709
2020-04-28 18:42:50 +03:00
Максим Багрянцев
9642e4473b Added OutputPipeArgument
Former-commit-id: 8434ffbba6
2020-04-28 18:39:39 +03:00
Максим Багрянцев
f48632c105 FromStream method to Video Info & added comments to FFprobe methods with stream
Former-commit-id: f56ea098a5
2020-04-28 15:44:27 +03:00
Максим Багрянцев
5c437211b2 Added ffprobe stream input
Former-commit-id: cfda0fc9ae
2020-04-28 15:21:48 +03:00
weihanli
985fc0cbc4 return null when file not exits
Former-commit-id: 1e24b0bef4
2020-04-28 19:40:31 +08:00
weihanli
9ffa2cb28a add RawArgument.cs
Former-commit-id: 5643544a3b
2020-04-28 12:31:16 +08:00
Максим Багрянцев
b0f46bc289 Added StreamPipeSource
Former-commit-id: 9903e333e6
2020-04-27 21:22:05 +03:00
Максим Багрянцев
9773828a62 Updated RawVideoPipeSource.cs
Former-commit-id: 9a4d200483
2020-04-27 19:47:56 +03:00
Максим Багрянцев
e21880c4a1 Added some summaries
Former-commit-id: 6f8c7915f8
2020-04-27 19:46:58 +03:00
Максим Багрянцев
f93566e749 Merge remote-tracking branch 'fork/master' into feature/piping
Former-commit-id: 9431f865e3
2020-04-27 19:42:56 +03:00
Максим Багрянцев
12faf7482d Replaced IInputPipe interface with System.IO.Stream
Former-commit-id: 4f51c3d32f
2020-04-27 19:35:53 +03:00
Максим Багрянцев
2c2ceacb41 Added input piping
Former-commit-id: 13d5e3d191
2020-04-27 19:23:31 +03:00
Malte Rosenbjerg
c1393697a3 Add AudioSamplingRateArgument
Former-commit-id: bc76d830d4
2020-04-15 16:46:28 +02:00
Malte Rosenbjerg
2809e0c47b Make output file existence check optional
Former-commit-id: d1a1864aa1
2020-04-15 00:40:51 +02:00
Malte Rosenbjerg
74c1222b9c Minor refactor and add async Convert
Former-commit-id: 7406cd0fa2
2020-03-02 23:48:52 +01:00
Malte Rosenbjerg
418b0e57c7 Fix progress and add unit test
Former-commit-id: 55a7e74817
2020-03-02 22:50:04 +01:00
Malte Rosenbjerg
85b75dfa75 Update dependency
Former-commit-id: 081627ef25
2020-03-01 13:06:48 +01:00
Malte Rosenbjerg
24c3eb475d Make output capacity configureable and set higher default
Fixes #42


Former-commit-id: cdcecda648
2020-03-01 12:55:57 +01:00
Malte Rosenbjerg
72a4e704ae Add missing using directive
Former-commit-id: c0e1742330
2020-02-27 22:37:58 +01:00
Malte Rosenbjerg
2809defe23 Correct valid transpose values
Former-commit-id: cdade1e73f
2020-02-27 22:31:32 +01:00
Malte Rosenbjerg
3ef90fa13f Add transpose argument
Former-commit-id: 21b35d349e
2020-02-27 21:48:15 +01:00
Malte Rosenbjerg
58c54458fe Add more audio codecs
Former-commit-id: 35a3f9035f
2020-02-27 21:13:18 +01:00
Malte Rosenbjerg
7b2a419c10 Cleanup
Former-commit-id: 46bc75c6d1
2020-02-27 21:12:48 +01:00
Malte Rosenbjerg
ff1c7e070b Use switch expression
Former-commit-id: 6561d0bec1
2020-02-27 20:24:20 +01:00
Malte Rosenbjerg
7d77c33609 Remove ArgumentStringifier + cleanup
No reason to split the responsibility


Former-commit-id: 0e2c788796
2020-02-27 20:16:17 +01:00
Malte Rosenbjerg
616a6d1c7d Move to separate file
Former-commit-id: 293ac4306a
2020-02-27 18:32:45 +01:00
Malte Rosenbjerg
3ff253f744 Add vbr support
Former-commit-id: 098917a5da
2020-02-27 18:31:57 +01:00
Malte Rosenbjerg
cc82f0b3fa Add more AudioQuality presets (enum)
Former-commit-id: 1badd3ba4c
2020-02-27 18:29:27 +01:00
Malte Rosenbjerg
fa3904ea91 Add argument for removing metadata
Former-commit-id: e688bcc674
2020-02-27 18:29:09 +01:00
Malte Rosenbjerg
a5c0eb639c Support for faststart
Former-commit-id: b806f2bbfb
2020-02-27 18:28:55 +01:00
Malte Rosenbjerg
06a046e3fe Support for crf
Former-commit-id: 170aefeb32
2020-02-27 18:28:49 +01:00
Malte Rosenbjerg
e24b652695 Add support for drawtext argument
Former-commit-id: ebd9ff0adc
2020-02-25 23:19:30 +01:00
Malte Rosenbjerg
1ac2664f58 Release branch init
Former-commit-id: 4ea246ee70
2020-02-21 17:40:03 +01:00
Malte Rosenbjerg
889820b32c Prepare nuget info
Former-commit-id: 4ea76c847a
2020-02-21 17:14:07 +01:00
Malte Rosenbjerg
0164c801c1 Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore
Former-commit-id: c41b124588
2020-02-20 23:04:54 +01:00
Malte Rosenbjerg
4dd179c2d4 Refactoring
Former-commit-id: 6e67f77c32
2020-02-20 23:04:51 +01:00
Crydsch
bce2b98d5d Merge branch 'master' into master
Former-commit-id: a2f09b22f1
2020-02-16 17:23:32 +01:00
Malte Rosenbjerg
a7d2102958 Bump versions
Former-commit-id: 16a4726426
2020-02-16 11:08:15 +01:00
Crydsch
703da64f44 Fix NullReferenceException if no duration exists
Former-commit-id: 5daef17b44
2020-02-13 20:58:14 +01:00
Crydsch
073cfee5ea Lift restriction of duration to seconds
Former-commit-id: 0b35935b5d
2020-02-13 17:36:49 +01:00
Cry dsch
ed5fffd7a9 Fix duration parsing of .mkv and .webm files
Former-commit-id: fbd9f3fc89
2020-02-12 21:37:10 +01:00
Cry dsch
68c24621e9 Merge https://github.com/rosenbjerg/FFMpegCore
Former-commit-id: f10c01e667
2020-02-12 21:31:24 +01:00
Cry dsch
37fc05b26b Fix duration parsing of .mkv and .webm files
Former-commit-id: a4c7d87e62
2020-02-12 21:26:27 +01:00
Malte Rosenbjerg
b11be87a45 More cleanup
Former-commit-id: ecf7a711f4
2020-02-12 20:45:16 +01:00
Malte Rosenbjerg
45e170f315 Cleanup begun
Former-commit-id: 8ee92a40ab
2020-02-11 22:45:02 +01:00
Cry dsch
555c618706 Fix progress event output when using the convert(ArgumentContainer) function
Former-commit-id: 16a70ebd72
2020-02-08 20:29:30 +01:00
Tuğrul Elmas
3b289e3fd9 Arguments: DurationArgument
#33 

* added format provider to correctly parse the video's duration

* added DurationArgument


Former-commit-id: ec03bfe4a6
2020-01-29 16:33:15 +02:00
Vlad Jerca
87c4db19da chore: bump version
Former-commit-id: acf6b10fab
2020-01-29 13:03:20 +02:00
Tuğrul Elmas
ce16d9103c FFProbe: add format provider to correctly parse the video's duration
#31 

Former-commit-id: d599592084
2020-01-29 12:54:30 +02:00
Malte Rosenbjerg
a5aad904e7 FFProbe: expose async methods
#30 

Former-commit-id: 7b9b8afac8
2020-01-29 12:53:36 +02:00
Vlad Jerca
efe61e8bad chore: bump version
Former-commit-id: 8a8b8a968f
2019-09-30 14:15:24 +03:00
Richkovskiy Lev
19bfbb5154 InputArgument: use the AbsolutUri value for URLs
If i want to download video from video server i use this code:
string textLinkVideo = "https://vk.com/video_hls.php?dirs%5B240%5D=https%3A%2F%2Fcs531220.vkuservideo.net%2F5%2Fe15NTMyPzc3MA%2Fvideos%2F&dirs%5B360%5D=https%3A%2F%2Fcs531220.vkuservideo.net%2F5%2Fe15NTMyPzc3MA%2Fvideos%2F&path=5%2Fe15NTMyPzc3MA%2Fvideos%2F&extra=6jU8MLGkIpMxHqpAViGv7wXJofsIDdlwBNfwnjifdOnsHTv8e-h7LsyFJabx26lyLTsNfDBDy4u5H2HU0w9fT6114_FzHvFU2l2A-H9B23gan3k48_L60B68aDHTA_CLGKJEesUqTlEgyLlYoQiQiOg&c_extra=w0ZgeFZ-2ZoxqYTYlfwL5LZA5o2enfF0CqLyrQQVEk2owWZFaD2hfnPrzvLWrQfU81A8u5rCXw_CIe_8TDfITX3Cl12YwhBIfVCR4gmDNPYUbB-2tarthA-mOpY5WK77GAOZHs7gwx65i02-wHjGwIA&video=-7865622_456240009&tag=042ea140e4&c_tag=860d1761765a&hash=848f2afe36a72db4ff&lang_id=0&viewer_id=17403755";
FFMpegModel FFMpegModel = new FFMpegModel();
FFMpegModel.DownloadVideoVk(textLinkVideo, filePath);

With AbsolutePath this method return /video_hls.php
With AbsoluteUri this.method return full url

Former-commit-id: b5ae935025
2019-09-30 00:10:08 +03:00
Vlad Jerca
0ed52fec9f chore: bump version
Former-commit-id: 085fa78bf0
2019-05-20 11:16:22 +03:00
Vlad Jerca
88a29895d2 FFMpegOptions: build paths using the Combine util
#12

Former-commit-id: 3448a2044b
2019-05-20 11:00:10 +03:00
Vlad Jerca
7980823aab chore bump version
Former-commit-id: 22f1f574bd
2019-05-11 06:43:46 +03:00
Vlad Jerca
214d68d369 FFMpegCore: remove binaries from repository (use choco)
- improve binary path detection

Former-commit-id: 4d75640a16
2019-05-10 20:25:57 +03:00
Vlad Jerca
dd60e90124 Chore: Bump version
Former-commit-id: f25c8f5525
2019-05-03 16:57:13 +03:00
Joshua Hatzenbuehler
f92652690e FFMpegCore: use Path.DirectorySeparatorChar instead of \\, for non windows based platform dont use target, for non windows based platform dont use .exe
Former-commit-id: 61d455b831
2019-05-02 10:11:00 -05:00
Vlad Jerca
0eb5abb7b1 chore: bump version
Former-commit-id: c3206e218d
2019-04-01 12:59:41 +03:00
Vlad Jerca
567c9e7390 FFProbe: improve metadata extraction
#3

Former-commit-id: 3e856845ae
2019-04-01 12:56:36 +03:00
Vlad Jerca
3ba3ee405a Chore: bump version
Former-commit-id: 5e8bb1c185
2019-03-28 01:21:36 +02:00
Kyriakos Ioannou
b3c08dd890 Modify snapshot method (#4)
* When a snapshot is needeed, it's overkill to create the image on the filesystem, then delete it, and then create the image on the filesystem again. With this feature we can avoid this scenario and actually persist the created image on disk

* Apply requested changes by author. Added unit test for persist snapshot


Former-commit-id: c2a0c3b942
2019-03-28 00:51:41 +02:00
Vlad Jerca
7547c48927 FFMpegCore: Rethink options configuration
Former-commit-id: a0de4c1cf6
2019-03-04 23:05:01 +02:00
Vlad Jerca
e24c0a523a HotFix: propagate ctor options in child classes
Former-commit-id: 1c8ab3b1da
2019-03-03 01:17:35 +02:00
Vlad Jerca
7c25a5e8e7 Merge pull request #2 from vladjerca/feature/configure_root_ctor
FFMpegCore:  enable root configuration view ctor
Former-commit-id: 0e95615261
2019-03-01 20:52:06 +02:00
Vlad Jerca
2fe729832e FFMpegCore: enable root configuration view ctor
Former-commit-id: 02ac7c5ac0
2019-03-01 20:45:47 +02:00
Vlad Jerca
0cb4f0e660 HotFix: invalid progress
Former-commit-id: 7dca87a73f
2019-02-26 23:39:00 +02:00
Vlad Jerca
fe9a8f9232 Chore: bump release version and stop packing binaries
Former-commit-id: eab069dbf0
2019-02-26 23:01:04 +02:00
Vlad Jerca
46a77a9440 FFMpegCore: report progress when converting
Former-commit-id: 7c36ffc873
2019-02-26 21:59:43 +02:00
Vlad Jerca
9287cb3418 FFMpegCore: support configuration via ffmpeg.config.json
Former-commit-id: aed33a3d5c
2019-02-26 21:49:08 +02:00
Vlad Jerca
5f524bbc07 FFMpegCore: move argument implementations to seperate folder
Former-commit-id: 8272dc9c94
2019-02-26 21:46:48 +02:00
Vlad Jerca
b0c2a7ea92 FFMpegCore: use the argument builder in the ffmpeg methods
Former-commit-id: 3729d65e24
2019-02-08 22:41:40 +02:00
Vlad Jerca
9b855736ab FFMpegCore: port lib to .net standard
Former-commit-id: c215191bf5
2019-02-08 22:41:40 +02:00
Vlad Jerca
b6b0624aaf FFMpeg: add binaries
Former-commit-id: b52fbdf53d
2019-02-08 22:37:58 +02:00