Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Various unit tests: Increase coverage #586

Merged
merged 7 commits into from
Nov 5, 2020
Merged

Various unit tests: Increase coverage #586

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
68f54bd
FrameMapper_Tests: Use SUITE, create no-op test
ferdnyc Nov 3, 2020
98d6eb4
FrameMapper_Tests: Correct for reader duration
ferdnyc Nov 3, 2020
d54871a
FrameMapper_tests: Add more coverage
ferdnyc Nov 3, 2020
97cd270
Color_Tests: Increase coverage
ferdnyc Nov 4, 2020
db738ce
Point_Tests: Increase coverage
ferdnyc Nov 4, 2020
4d2bbe4
Codecov: Update ignore list in YAML
ferdnyc Nov 4, 2020
6b4ed3a
Color_Tests: Remove commented code, be const
ferdnyc Nov 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
57 changes: 31 additions & 26 deletions tests/FrameMapper_Tests.cpp
View file
Open in desktop
Expand Up @@ -31,33 +31,35 @@
#include "UnitTest++.h"
// Prevent name clashes with juce::UnitTest
#define DONT_SET_USING_JUCE_NAMESPACE 1
#include "OpenShot.h"
#include "CacheMemory.h"
#include "Clip.h"
#include "DummyReader.h"
#include "FFmpegReader.h"
#include "Fraction.h"
#include "Frame.h"
#include "FrameMapper.h"
#include "Timeline.h"

using namespace std;
using namespace openshot;

TEST(FrameMapper_Get_Valid_Frame)
SUITE(FrameMapper) {
TEST(NoOp_GetMappedFrame)
{
// Create a reader
DummyReader r(Fraction(24,1), 720, 480, 22000, 2, 5.0);

// Create mapping between 24 fps and 29.97 fps using classic pulldown
FrameMapper mapping(&r, Fraction(30000, 1001), PULLDOWN_CLASSIC, 22000, 2, LAYOUT_STEREO);
// Create mapping between 24 fps and 24 fps without pulldown
FrameMapper mapping(&r, Fraction(24, 1), PULLDOWN_NONE, 22000, 2, LAYOUT_STEREO);
CHECK_EQUAL("FrameMapper", mapping.Name());

try
{
// Should find this frame
MappedFrame f = mapping.GetMappedFrame(125);
CHECK(true); // success
}
catch (OutOfBoundsFrame &e)
{
// Unexpected failure to find frame
CHECK(false);
}
// Should find this frame
MappedFrame f = mapping.GetMappedFrame(125);
CHECK_EQUAL(125, f.Odd.Frame);
CHECK_EQUAL(125, f.Even.Frame);
ferdnyc marked this conversation as resolved.
Show resolved Hide resolved
}

TEST(FrameMapper_Invalid_Frame_Too_Small)
TEST(Invalid_Frame_Too_Small)
{
// Create a reader
DummyReader r(Fraction(24,1), 720, 480, 22000, 2, 5.0);
Expand All @@ -70,7 +72,7 @@ TEST(FrameMapper_Invalid_Frame_Too_Small)

}

TEST(FrameMapper_24_fps_to_30_fps_Pulldown_Classic)
TEST(24_fps_to_30_fps_Pulldown_Classic)
{
// Create a reader
DummyReader r(Fraction(24,1), 720, 480, 22000, 2, 5.0);
Expand All @@ -87,7 +89,7 @@ TEST(FrameMapper_24_fps_to_30_fps_Pulldown_Classic)
CHECK_EQUAL(3, frame3.Even.Frame);
}

TEST(FrameMapper_24_fps_to_30_fps_Pulldown_Advanced)
TEST(24_fps_to_30_fps_Pulldown_Advanced)
{
// Create a reader
DummyReader r(Fraction(24,1), 720, 480, 22000, 2, 5.0);
Expand All @@ -107,7 +109,7 @@ TEST(FrameMapper_24_fps_to_30_fps_Pulldown_Advanced)
CHECK_EQUAL(3, frame4.Even.Frame);
}

TEST(FrameMapper_24_fps_to_30_fps_Pulldown_None)
TEST(24_fps_to_30_fps_Pulldown_None)
{
// Create a reader
DummyReader r(Fraction(24,1), 720, 480, 22000, 2, 5.0);
Expand All @@ -124,7 +126,7 @@ TEST(FrameMapper_24_fps_to_30_fps_Pulldown_None)
CHECK_EQUAL(4, frame5.Even.Frame);
}

TEST(FrameMapper_30_fps_to_24_fps_Pulldown_Classic)
TEST(30_fps_to_24_fps_Pulldown_Classic)
{
// Create a reader
DummyReader r(Fraction(30, 1), 720, 480, 22000, 2, 5.0);
Expand All @@ -144,7 +146,7 @@ TEST(FrameMapper_30_fps_to_24_fps_Pulldown_Classic)
CHECK_EQUAL(6, frame5.Even.Frame);
}

TEST(FrameMapper_30_fps_to_24_fps_Pulldown_Advanced)
TEST(30_fps_to_24_fps_Pulldown_Advanced)
{
// Create a reader
DummyReader r(Fraction(30, 1), 720, 480, 22000, 2, 5.0);
Expand All @@ -164,7 +166,7 @@ TEST(FrameMapper_30_fps_to_24_fps_Pulldown_Advanced)
CHECK_EQUAL(5, frame4.Even.Frame);
}

TEST(FrameMapper_30_fps_to_24_fps_Pulldown_None)
TEST(30_fps_to_24_fps_Pulldown_None)
{
// Create a reader
DummyReader r(Fraction(30, 1), 720, 480, 22000, 2, 5.0);
Expand All @@ -181,7 +183,7 @@ TEST(FrameMapper_30_fps_to_24_fps_Pulldown_None)
CHECK_EQUAL(6, frame5.Even.Frame);
}

TEST(FrameMapper_resample_audio_48000_to_41000)
TEST(resample_audio_48000_to_41000)
{
// Create a reader: 24 fps, 2 channels, 48000 sample rate
stringstream path;
Expand Down Expand Up @@ -211,7 +213,7 @@ TEST(FrameMapper_resample_audio_48000_to_41000)
map.Close();
}

TEST (FrameMapper_resample_audio_mapper) {
TEST(resample_audio_mapper) {
// This test verifies that audio data can be resampled on FrameMapper
// instances, even on frame rates that do not divide evenly, and that no audio data is misplaced
// or duplicated. We verify this by creating a SIN wave, add those data points to a DummyReader,
Expand Down Expand Up @@ -350,7 +352,7 @@ TEST (FrameMapper_resample_audio_mapper) {
r.Close();
}

TEST (FrameMapper_redistribute_samples_per_frame) {
TEST(redistribute_samples_per_frame) {
// This test verifies that audio data is correctly aligned on
// FrameMapper instances. We do this by creating 2 Clips based on the same parent reader
// (i.e. same exact audio sample data). We use a Timeline to overlap these clips
Expand Down Expand Up @@ -471,4 +473,7 @@ TEST (FrameMapper_redistribute_samples_per_frame) {
// Clean up
cache.Clear();
r.Close();
}
}

} // SUITE