From cf5ce26db8fd07988d562e99ba09d3789b9cd4a0 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sun, 16 Feb 2020 20:42:10 +0100 Subject: [PATCH 1/9] Update ffmpeg.config.json Former-commit-id: 83894a842e9ee1bd84e0719712989d0539a9d79f --- FFMpegCore.Test/ffmpeg.config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FFMpegCore.Test/ffmpeg.config.json b/FFMpegCore.Test/ffmpeg.config.json index b9c9a56..b27484e 100644 --- a/FFMpegCore.Test/ffmpeg.config.json +++ b/FFMpegCore.Test/ffmpeg.config.json @@ -1,3 +1,3 @@ { - "RootDirectory": "" + "RootDirectory": "/usr/bin/ffmpeg/bin" } \ No newline at end of file From e61646cf7d8808e55e9f115321a339ffb955ca12 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sun, 16 Feb 2020 20:50:41 +0100 Subject: [PATCH 2/9] Update ffmpeg.config.json Former-commit-id: 32a892e7d98e996167e84f1767e41d63e786e72b --- FFMpegCore.Test/ffmpeg.config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FFMpegCore.Test/ffmpeg.config.json b/FFMpegCore.Test/ffmpeg.config.json index b27484e..8b07c89 100644 --- a/FFMpegCore.Test/ffmpeg.config.json +++ b/FFMpegCore.Test/ffmpeg.config.json @@ -1,3 +1,3 @@ { - "RootDirectory": "/usr/bin/ffmpeg/bin" + "RootDirectory": "/usr/local/bin/ffmpeg/bin" } \ No newline at end of file From 7426e1091af41e1f660a0431c611e03ad1aa6ad6 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sun, 16 Feb 2020 20:55:06 +0100 Subject: [PATCH 3/9] Update ffmpeg.config.json Former-commit-id: bdd826f650fe8449c396041986858396ad1eac04 --- FFMpegCore.Test/ffmpeg.config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FFMpegCore.Test/ffmpeg.config.json b/FFMpegCore.Test/ffmpeg.config.json index 8b07c89..d80b26e 100644 --- a/FFMpegCore.Test/ffmpeg.config.json +++ b/FFMpegCore.Test/ffmpeg.config.json @@ -1,3 +1,3 @@ { - "RootDirectory": "/usr/local/bin/ffmpeg/bin" + "RootDirectory": "/usr/bin" } \ No newline at end of file From 51d2a078c94dd15adfae02a7c5a166fc3f4cd560 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sun, 16 Feb 2020 20:59:59 +0100 Subject: [PATCH 4/9] Fix unit test Former-commit-id: 5c15d90641b6236fc0558a8d729d6d015e5c2c07 --- FFMpegCore.Test/VideoTest.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/FFMpegCore.Test/VideoTest.cs b/FFMpegCore.Test/VideoTest.cs index 88510e6..281fe7d 100644 --- a/FFMpegCore.Test/VideoTest.cs +++ b/FFMpegCore.Test/VideoTest.cs @@ -314,10 +314,10 @@ public void Video_Join_Image_Sequence() public void Video_With_Only_Audio_Should_Extract_Metadata() { var video = VideoInfo.FromFileInfo(VideoLibrary.LocalVideoAudioOnly); - Assert.AreEqual(video.VideoFormat, "none"); - Assert.AreEqual(video.AudioFormat, "aac"); - Assert.AreEqual(video.Duration.TotalSeconds, 79); - Assert.AreEqual(video.Size, 1.25); + Assert.AreEqual("none", video.VideoFormat); + Assert.AreEqual("aac", video.AudioFormat); + Assert.AreEqual(79, (int)video.Duration.TotalSeconds); + Assert.AreEqual(1.25, video.Size); } [TestMethod] From 2c08a4a72b9b26a6feeb6e962831104d30f06ef2 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sun, 16 Feb 2020 21:00:50 +0100 Subject: [PATCH 5/9] Update VideoTest.cs Former-commit-id: 3f61ac0104374116100b95a9fab0a2531dc5813f --- FFMpegCore.Test/VideoTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FFMpegCore.Test/VideoTest.cs b/FFMpegCore.Test/VideoTest.cs index 281fe7d..d469d67 100644 --- a/FFMpegCore.Test/VideoTest.cs +++ b/FFMpegCore.Test/VideoTest.cs @@ -316,7 +316,7 @@ public void Video_With_Only_Audio_Should_Extract_Metadata() var video = VideoInfo.FromFileInfo(VideoLibrary.LocalVideoAudioOnly); Assert.AreEqual("none", video.VideoFormat); Assert.AreEqual("aac", video.AudioFormat); - Assert.AreEqual(79, (int)video.Duration.TotalSeconds); + Assert.AreEqual(79.0, video.Duration.TotalSeconds, 0.1); Assert.AreEqual(1.25, video.Size); } From 9542d68543bb5fa7c6d17daea4d4e4a7263defcb Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sun, 16 Feb 2020 21:05:33 +0100 Subject: [PATCH 6/9] Update README.md Former-commit-id: d5c568b79e45e3d337ee264ed31fd8d929bc1909 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c87ad1..6fddd05 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # FFMpegCore [![NuGet Badge](https://buildstats.info/nuget/FFMpegCore)](https://www.nuget.org/packages/FFMpegCore/) -[![Build Status](https://travis-ci.org/rosenbjerg/FFMpegCore.svg)](https://travis-ci.org/vladjerca/FFMpegCore) +![CI](https://github.com/rosenbjerg/FFMpegCore/workflows/CI/badge.svg) # Setup From 003ca8b95c87e24b67d0bff2c287eb46ad8c66d8 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sun, 16 Feb 2020 21:07:01 +0100 Subject: [PATCH 7/9] Update ci.yml Former-commit-id: 5baae8c4f962c8fbd65dbc7fda99e66d7d97c784 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a49128..bf58e95 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,5 @@ name: CI -on: [push, pull_request] +on: pull_request jobs: build: runs-on: ubuntu-latest From 916ff3ae3152c8b830bf79ef0527e6f3ee815799 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sun, 16 Feb 2020 21:09:04 +0100 Subject: [PATCH 8/9] Delete .travis.yml Former-commit-id: 007c042d3efc7a0a83699678a6c7e1737804711e --- .travis.yml | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 1cb2185..0000000 --- a/.travis.yml +++ /dev/null @@ -1,26 +0,0 @@ -language: csharp -mono: none -dotnet: 3.1 -os: - - linux - - osx -dist: trusty -before_install: - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:mc3man/trusty-media; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -y ffmpeg libgdiplus; fi - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install ffmpeg mono-libgdiplus; fi - - ffmpeg -hwaccels -script: - - nvm install --lts - - nvm use --lts - - node ./.build/travis-ffmpeg-config.js - - dotnet restore - - dotnet build ./FFMpegCore/ - - dotnet test ./FFMpegCore.Test/ -branches: - only: - - master - - /fix\/.+/ - - /feature\/.+/ From 8e575efca6c080220aecaa7e3d30fa3c448e90ed Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sun, 16 Feb 2020 21:09:24 +0100 Subject: [PATCH 9/9] Delete travis-ffmpeg-config.js Former-commit-id: 5d8ce56b47ba214f4c920554a1d64a258a54a385 --- .build/travis-ffmpeg-config.js | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 .build/travis-ffmpeg-config.js diff --git a/.build/travis-ffmpeg-config.js b/.build/travis-ffmpeg-config.js deleted file mode 100644 index bcfe8ea..0000000 --- a/.build/travis-ffmpeg-config.js +++ /dev/null @@ -1,14 +0,0 @@ -const fs = require('fs'); -const path = require('path'); - -const CONFIG_PATH = path.resolve('./FFMpegCore.Test/ffmpeg.config.json'); - -console.log('--- Configuring ffmpeg binary path for:', process.env.TRAVIS_OS_NAME); - -let data = require(CONFIG_PATH); - -data.RootDirectory = process.env.TRAVIS_OS_NAME === 'linux' ? - '/usr/bin' : - '/usr/local/bin'; - -fs.writeFileSync(CONFIG_PATH, JSON.stringify(data, null, 4));