Commit graph

747 commits

Author SHA1 Message Date
Dimitri Vranken
9646c440bb Fixed code style issues 2023-02-20 13:23:06 +01:00
Dimitri Vranken
790aebba87 Merge branch 'main' into feature/net7-windows-support-v5 2023-02-20 13:18:40 +01:00
Dimitri Vranken
3ae6799ca2 Merge branch 'feature/net7-windows-support-v5' of https://github.com/drasive/FFMpegCore into feature/net7-windows-support-v5 2023-02-20 13:18:17 +01:00
Dimitri Vranken
b63258217d Updated example program to avoid commented-out code 2023-02-20 13:18:14 +01:00
Dimitri Vranken
01a33f9a1f Updated package properties for SkiaSharp 2023-02-20 13:18:01 +01:00
Malte Rosenbjerg
55c90fb081 Fix nupkg directory 2023-02-17 00:27:12 +01:00
Malte Rosenbjerg
19169cd0a6 Merge branch 'main' of https://github.com/rosenbjerg/FFMpegCore 2023-02-17 00:23:23 +01:00
Malte Rosenbjerg
2e9f5f1170 Remove --output build 2023-02-17 00:23:17 +01:00
Malte Rosenbjerg
2bc6c645f2
Merge branch 'main' into feature/net7-windows-support-v5 2023-02-17 00:19:46 +01:00
Malte Rosenbjerg
4d2028a124
Merge pull request #398 from rosenbjerg/Fix-release-pipeline
Add PackageOutputPath
2023-02-17 00:17:27 +01:00
Malte Rosenbjerg
8fff02d8d6 Add --skip-duplicate 2023-02-17 00:14:23 +01:00
Malte Rosenbjerg
daa512c294 Format remaining csproj files 2023-02-17 00:13:34 +01:00
Malte Rosenbjerg
5b34d04a35 Add PackageOutputPath and format 2023-02-17 00:12:32 +01:00
Malte Rosenbjerg
030d0eb304
Merge pull request #397 from rosenbjerg/bugfix/handle-joining-of-non-png-images
[Bugfix] Handle joining of non png images
2023-02-17 00:04:53 +01:00
Malte Rosenbjerg
d6517fa1ef Fix CI trigger after rename 2023-02-16 23:58:20 +01:00
Malte Rosenbjerg
8b69ed104a Remove unused enums 2023-02-16 23:55:28 +01:00
Malte Rosenbjerg
02d2b4261b Add missing usings on tests 2023-02-16 23:55:20 +01:00
Malte Rosenbjerg
ad5dca3cd6 Ensure all images have same file extension and handle that 2023-02-16 23:55:10 +01:00
Dimitri Vranken
7b32ba5a27 Fixed ambiguous method call
The two constructors were causing issues with ambiguous method calls but are a good idea, so this is more of a workaround.
Error message:
The call is ambiguous between the following methods or properties:
'FFMpegCore.Pipes.RawVideoPipeSource.RawVideoPipeSource(System.Collections.Generic.IEnumerator<FFMpegCore.Pipes.IVideoFrame>)' and
'FFMpegCore.Pipes.RawVideoPipeSource.RawVideoPipeSource(System.Collections.Generic.IEnumerable<FFMpegCore.Pipes.IVideoFrame>)'
2023-02-16 14:48:06 +01:00
Dimitri Vranken
f3c7df1ff5 Code formatting 2023-02-16 14:39:14 +01:00
Dimitri Vranken
55b652a77f Added TODO for additional SKColorType support 2023-02-16 14:39:09 +01:00
Dimitri Vranken
a66bdba211 Improved SkiaSharp CreateVideoFrame performance 2023-02-16 14:35:00 +01:00
Dimitri Vranken
2458b4ae9c Adjusted FFMpegCore.Test for separate FFMpegCore.Extensions.SkiaSharp project 2023-02-16 14:34:35 +01:00
Dimitri Vranken
315c1e1a91 Adjusted FFMpegCore.Examples for separate FFMpegCore.Extensions.SkiaSharp project 2023-02-16 10:25:42 +01:00
Dimitri Vranken
cc22d15061 Moved SkiaSharp implemented to its own extension 2023-02-16 09:37:23 +01:00
Dimitri Vranken
8afe1e0c9e Revert "Updated package properties for fork"
This reverts commit fb19f45331.
2023-02-13 12:23:12 +01:00
Dimitri Vranken
db215ff4c7 Revert "Updated package description for SkiaSharp instead of Aspose.Drawing"
This reverts commit c96fdc490a.
2023-02-13 12:23:07 +01:00
Dimitri Vranken
fb19f45331 Updated package properties for fork 2023-02-13 12:22:36 +01:00
Dimitri Vranken
29fc9246d1 Added dependency SkiaSharp.NativeAssets.Linux.NoDependencies
Required for execution on Linux, otherwise we get the following error: Unable to load shared library 'libSkiaSharp' or one of its dependencies
See https://github.com/mono/SkiaSharp/issues/1341 for more information
2023-02-13 12:11:03 +01:00
Dimitri Vranken
bdfe87be16 Enabled windows-only tests on all plattforms
They are now also supported on Linux because we are using SkiaSharp instead of System.Drawing.Common
2023-02-13 12:09:35 +01:00
Dimitri Vranken
f95bba5aa2 Added configuration for running tests in WSL on windows
See https://learn.microsoft.com/en-us/visualstudio/test/remote-testing?view=vs-2022
2023-02-13 11:57:04 +01:00
Dimitri Vranken
6e38b45445 chore: Increased test timeout duration
Required for successful test execution on my rather slow machine
2023-02-13 11:40:11 +01:00
Dimitri Vranken
72c76c20f0 refactor: Centralized test timeout duration
Changes can be made in a single place if neeeded
2023-02-13 11:39:34 +01:00
Dimitri Vranken
7f17d68a52 Updated tests for SkiaSharp 2023-02-13 11:39:03 +01:00
Dimitri Vranken
f464be430b Replaced System.Drawing.Common with SkiaSharp 2023-02-13 11:25:45 +01:00
Dimitri Vranken
c96fdc490a Updated package description for SkiaSharp instead of Aspose.Drawing 2023-02-13 11:07:06 +01:00
Malte Rosenbjerg
e32dd3a7f7 Add IsPackage=false to Examples project
Former-commit-id: 4f1cb92fa9
2023-02-05 00:33:07 +01:00
Malte Rosenbjerg
8943809050 build master branch after merge or push (#390)
* Update ci.yml

* Add codecov

* Remove codecov for now

* Add coverlet.collector and codecov

Former-commit-id: 5bd17dc44f
2023-02-05 00:07:52 +01:00
Malte Rosenbjerg
3837edee8c Init (#389)
Former-commit-id: 4ec200528c
2023-02-04 23:42:13 +01:00
pklaes
737eea3a98 fix: Switch source for rotation property from 'tags/rotate' to 'side_data_list/rotation' (incl. test case) (#388)
Former-commit-id: d051cd06d2
2023-02-04 22:17:39 +01:00
Malte Rosenbjerg
693acabac4 Cleanup after splitting into two packages (#386)
* Move PosterWithAudio to FFMpegCore

* Reduce windows only tests

* Update Directory.Build.props

* Create .editorconfig

* More cleanup

* Enable implicit usings

* Remove unused method

* Apply dotnet format

* Fix unused variable in AudioGateArgument

* Fix boolean conditions in AudioGateArgument

* Merge boolean conditions into pattern

* Use target-typed new

* Add linting to CI

* Add CUDA to HardwareAccelerationDevice enum

* Increase timeout for Video_Join_Image_Sequence

* Adjust Video_Join_Image_Sequence timeout

* Fix expected seconds in Video_Join_Image_Sequence

* Increase timeout for Video_TranscodeToMemory due to macos agents

Former-commit-id: f9f7161686
2023-02-02 21:19:45 +01:00
Tom Bogle
7dfefbdfdb Added ability to retrieve bit depth from media streams for lossless encodings (#359)
* Added ability to retrieve bit depth from media streams for lossless encodings

* Shortened sample AIFF file used in tests

Former-commit-id: db7e1e4995
2023-02-01 08:09:16 +01:00
Malte Rosenbjerg
910ec6c759 Merge pull request #334 from lostmsu/lost
`AddDeviceInput` similar to `AddFileInput` and `FromDeviceInput`

Former-commit-id: ce7ebe0cff
2023-01-31 23:39:49 +01:00
Malte Rosenbjerg
d2658b17c0 Update test
Former-commit-id: d3d6c8c40b
2023-01-31 23:32:30 +01:00
Malte Rosenbjerg
b2847b99e2 Remove unneeded cast
Former-commit-id: 751019a36d
2023-01-31 23:26:18 +01:00
Malte Rosenbjerg
cabfb0b2db Remove PInvoke.Kernel32
Former-commit-id: f0c9993c6e
2023-01-31 23:25:33 +01:00
Victor Nova
28deedc038 a hack to unconditionally kill ffmpeg when parent .NET process exits
Former-commit-id: 5ac61011c4
2023-01-31 23:20:10 +01:00
Victor Nova
0d7bf18832 fixed hwaccel parameter not working in 5.0
Former-commit-id: 7938ec3c0a
2023-01-31 23:19:45 +01:00
Victor Nova
4b79891bb7 AddDeviceInput similar to AddFileInput and FromDeviceInput
Former-commit-id: aced406957
2023-01-31 23:19:45 +01:00
Malte Rosenbjerg
5ebe0bb71d Merge pull request #384 from rosenbjerg/chore/fixes
Minor fixes

Former-commit-id: b8d1c26f4f
2023-01-31 23:16:23 +01:00