Improved Profile Class (Helper methods, Sortable, Unit tests) (#895)

* Removing legacy profile property. Add new operators for Profile classes (for comparison). Also added new functions to generate different variations of the Profile data (key, short name, long name, long name w/description).

* Add empty constructor for Profile class, and new Profile unit tets

* Adding zero padding to profile Key function, for easier sorting: 01920x1080i2997_16:09

* Clear setfill flag after creating Key() output

* Updating example exe to load an *.osp project file via C++, which makes debugging complex broken projects much easier.

* - Add new unit test to FFmpegWriter to create an animated GIF and verify it can be wrapped with a FrameMapper (with no audio track)
- Improve FrameMapper to ignore missing audio data (i.e. when no audio samples present, don't try and find them or resample them)

* Fix some whitespace issues

* Fix inline documentation mistype

* Fixed missing reuse licensing on new example profile files

* Changing Profile::Key() format to exclude the : character, since Windows file names cannot contain that

* - Large memory leak fixed in FFmpegWriter when closing the video & audio contexts
- Reducing # of cached frames and rescalers to 1, since we no longer use OMP and this is unneeded - we need to refactor much of this code out eventually

* - Fixing whitespace issues
- Code clean-up / line wrapping / etc...
This commit is contained in:
Jonathan Thomas
2023-02-02 16:29:38 -06:00
committed by GitHub
parent 510a7690f6
commit 70e86ef044
11 changed files with 1064 additions and 647 deletions

View File

@@ -20,6 +20,7 @@
#include "FFmpegReader.h"
#include "Fraction.h"
#include "Frame.h"
#include "Timeline.h"
using namespace std;
using namespace openshot;
@@ -183,3 +184,52 @@ TEST_CASE( "DisplayInfo", "[libopenshot][ffmpegwriter]" )
// Compare a [0, expected.size()) substring of output to expected
CHECK(output.str().substr(0, expected.size()) == expected);
}
TEST_CASE( "Gif", "[libopenshot][ffmpegwriter]" )
{
// Reader
std::stringstream path;
path << TEST_MEDIA_PATH << "sintel_trailer-720p.mp4";
// Create Gif Clip
Clip clip_video(path.str());
clip_video.Layer(0);
clip_video.Position(0.0);
clip_video.Open();
// Create Timeline w/ 1 Gif Clip (with 0 sample rate, and 0 channels)
openshot::Timeline t(1280, 720, Fraction(30,1), 0, 0, LAYOUT_MONO);
t.AddClip(&clip_video);
t.Open();
/* WRITER ---------------- */
FFmpegWriter w("output1.gif");
// Set options (no audio options are set)
w.SetVideoOptions(true, "gif", Fraction(24,1), 1280, 720, Fraction(1,1), false, false, 15000000);
// Create streams
w.PrepareStreams();
// Open writer
w.Open();
// Write some frames
w.WriteFrame(&t, 1, 60);
// Close writer & reader
w.Close();
t.Close();
FFmpegReader r1("output1.gif");
r1.Open();
// Verify various settings on new Gif
CHECK(r1.GetFrame(1)->GetAudioChannelsCount() == 0);
CHECK(r1.GetFrame(1)->GetAudioSamplesCount() == 0);
CHECK(r1.info.fps.num == 24);
CHECK(r1.info.fps.den == 1);
// Close reader
r1.Close();
}