From 0e77fbdc3b967b97bed8454cda4fa0e97185e232 Mon Sep 17 00:00:00 2001 From: eisneinechse <42617957+eisneinechse@users.noreply.github.com> Date: Sun, 21 Apr 2019 10:53:53 -0700 Subject: [PATCH] Re-anable the DECODER test --- tests/Settings_Tests.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Settings_Tests.cpp b/tests/Settings_Tests.cpp index bc127805..82690bbe 100644 --- a/tests/Settings_Tests.cpp +++ b/tests/Settings_Tests.cpp @@ -36,7 +36,7 @@ TEST(Settings_Default_Constructor) // Create an empty color Settings *s = Settings::Instance(); - //CHECK_EQUAL(1, s->HARDWARE_DECODER); + CHECK_EQUAL(0, s->HARDWARE_DECODER); // REMOVE_HW_OLD //CHECK_EQUAL(false, s->HARDWARE_ENCODE); CHECK_EQUAL(false, s->HIGH_QUALITY_SCALING); @@ -47,19 +47,19 @@ TEST(Settings_Change_Settings) { // Create an empty color Settings *s = Settings::Instance(); - //s->HARDWARE_DECODER = 1; + s->HARDWARE_DECODER = 1; // REMOVE_HW_OLD //s->HARDWARE_ENCODE = true; s->HIGH_QUALITY_SCALING = true; s->WAIT_FOR_VIDEO_PROCESSING_TASK = true; - //CHECK_EQUAL(1, s->HARDWARE_DECODER); + CHECK_EQUAL(1, s->HARDWARE_DECODER); // REMOVE_HW_OLD //CHECK_EQUAL(true, s->HARDWARE_ENCODE); CHECK_EQUAL(true, s->HIGH_QUALITY_SCALING); CHECK_EQUAL(true, s->WAIT_FOR_VIDEO_PROCESSING_TASK); - //CHECK_EQUAL(1, s->HARDWARE_DECODER); + CHECK_EQUAL(1, s->HARDWARE_DECODER); // REMOVE_HW_OLD //CHECK_EQUAL(true, s->HARDWARE_ENCODE); CHECK_EQUAL(true, Settings::Instance()->HIGH_QUALITY_SCALING);