Commit graph

687 commits

Author SHA1 Message Date
Malte Rosenbjerg
922e9c5811 Merge branch 'master' into master
Former-commit-id: 779de04ee0
2020-02-18 18:21:10 +01:00
Malte Rosenbjerg
662377903b Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore
Former-commit-id: 919ddd1fa9
2020-02-18 17:19:29 +01:00
Malte Rosenbjerg
bdeb395189 Larger epsilon needed
Former-commit-id: f6bb998ee2
2020-02-18 17:17:59 +01:00
Malte Rosenbjerg
e4c360761b Update ci.yml
Former-commit-id: 6cdd8a643f
2020-02-18 17:07:48 +01:00
Malte Rosenbjerg
084fb71a93 Fix unit test
FFProbe says 1:19.48 so there about should be good


Former-commit-id: 6d6c54aa12
2020-02-18 17:06:29 +01:00
Malte Rosenbjerg
2b0d2c4b44 Merge branch 'master' into master
Former-commit-id: ba863ae255
2020-02-18 16:55:04 +01:00
Malte Rosenbjerg
8e575efca6 Delete travis-ffmpeg-config.js
Former-commit-id: 5d8ce56b47
2020-02-16 21:09:24 +01:00
Malte Rosenbjerg
916ff3ae31 Delete .travis.yml
Former-commit-id: 007c042d3e
2020-02-16 21:09:04 +01:00
Malte Rosenbjerg
003ca8b95c Update ci.yml
Former-commit-id: 5baae8c4f9
2020-02-16 21:07:01 +01:00
Malte Rosenbjerg
9542d68543 Update README.md
Former-commit-id: d5c568b79e
2020-02-16 21:05:33 +01:00
Malte Rosenbjerg
2c08a4a72b Update VideoTest.cs
Former-commit-id: 3f61ac0104
2020-02-16 21:00:50 +01:00
Malte Rosenbjerg
51d2a078c9 Fix unit test
Former-commit-id: 5c15d90641
2020-02-16 20:59:59 +01:00
Malte Rosenbjerg
7426e1091a Update ffmpeg.config.json
Former-commit-id: bdd826f650
2020-02-16 20:55:06 +01:00
Malte Rosenbjerg
e61646cf7d Update ffmpeg.config.json
Former-commit-id: 32a892e7d9
2020-02-16 20:50:41 +01:00
Malte Rosenbjerg
fb339c889a Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore
Former-commit-id: c783861aeb
2020-02-16 20:48:25 +01:00
Malte Rosenbjerg
cf5ce26db8 Update ffmpeg.config.json
Former-commit-id: 83894a842e
2020-02-16 20:42:10 +01:00
Crydsch
bce2b98d5d Merge branch 'master' into master
Former-commit-id: a2f09b22f1
2020-02-16 17:23:32 +01:00
Malte Rosenbjerg
41e1a871ac Update ci.yml
Former-commit-id: a1c5a9fc60
2020-02-16 11:16:28 +01:00
Malte Rosenbjerg
3ef25ab48b Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore
Former-commit-id: f949fad7e6
2020-02-16 11:14:55 +01:00
Malte Rosenbjerg
dda016040f Change test path
Former-commit-id: 757d23a99b
2020-02-16 11:14:01 +01:00
Malte Rosenbjerg
949458bf03 Update ci.yml
Former-commit-id: b680302e99
2020-02-16 11:13:21 +01:00
Malte Rosenbjerg
9e05259fb4 Merge branch 'master' of https://github.com/rosenbjerg/FFMpegCore
Former-commit-id: f2dae96a03
2020-02-16 11:08:29 +01:00
Malte Rosenbjerg
a7d2102958 Bump versions
Former-commit-id: 16a4726426
2020-02-16 11:08:15 +01:00
Malte Rosenbjerg
980fe8d74c Update .travis.yml
Former-commit-id: 32fb4ec835
2020-02-16 11:03:51 +01:00
Malte Rosenbjerg
0d6acfebc8 Update ci.yml
Former-commit-id: b222340dcc
2020-02-16 11:02:59 +01:00
Malte Rosenbjerg
f89a3e2ef3 Update ci.yml
Former-commit-id: 95e5578bff
2020-02-16 10:59:08 +01:00
Malte Rosenbjerg
c7eddb91c3 Update .travis.yml
Former-commit-id: d6aa7151d3
2020-02-16 10:55:09 +01:00
Malte Rosenbjerg
c9dc111f17 Update ci.yml
Former-commit-id: 90727eb228
2020-02-16 10:46:58 +01:00
Malte Rosenbjerg
55dd041961 Update ci.yml
Former-commit-id: a7e2478862
2020-02-16 10:46:30 +01:00
Malte Rosenbjerg
17d0d718af Create ci.yml
Former-commit-id: d97a081813
2020-02-16 10:36:38 +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
Malte Rosenbjerg
3ed5c7b314 Merge pull request #36 from Crydsch/master
Fix progress event output

Former-commit-id: 09f1d6e655
2020-02-11 18:06:23 +01:00
Crydsch
1f381ba403 Merge branch 'master' into master
Former-commit-id: 0dc3e2bab6
2020-02-09 21:11:33 +01:00
Malte Rosenbjerg
d5b25a69c5 Update README.md
Former-commit-id: e98aed4abd
2020-02-09 20:02:58 +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
Vlad Jerca
e19bc03334 Update README.md
Former-commit-id: de5c55c028
2020-01-29 16:40:17 +02: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
116775eb2b Merge pull request #13 from vladjerca/fix/path_resolution
FFMpegOptions: build paths using the `Combine` util
Former-commit-id: 7438f497ad
2019-05-20 11:13:57 +03:00