diff options
| author | Lajos Molnar <lajos@google.com> | 2015-06-26 15:40:37 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2015-07-10 15:58:07 -0700 |
| commit | 9903589eacc655481acebc5b85632b3b84418bc9 (patch) | |
| tree | 687ed88adab53df8ac26fe559c2aae2448d78dea /media/libstagefright/tests | |
| parent | 14ae2c0d1aa6e32e97cbb62dabb604820e1e5152 (diff) | |
| download | frameworks_av-9903589eacc655481acebc5b85632b3b84418bc9.zip frameworks_av-9903589eacc655481acebc5b85632b3b84418bc9.tar.gz frameworks_av-9903589eacc655481acebc5b85632b3b84418bc9.tar.bz2 | |
stagefright: allow controlling experiments from property
Bug: 20894667
Change-Id: Icb2209e12ed6a1820b8f33626ca02aabcff03321
Diffstat (limited to 'media/libstagefright/tests')
| -rw-r--r-- | media/libstagefright/tests/Utils_test.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/media/libstagefright/tests/Utils_test.cpp b/media/libstagefright/tests/Utils_test.cpp index c1e663c..d736501 100644 --- a/media/libstagefright/tests/Utils_test.cpp +++ b/media/libstagefright/tests/Utils_test.cpp @@ -109,21 +109,21 @@ TEST_F(UtilsTest, TestStringUtils) { TEST_F(UtilsTest, TestDebug) { #define LVL(x) (ADebug::Level)(x) - ASSERT_EQ(ADebug::GetDebugLevelFromString("video", "", LVL(5)), LVL(5)); - ASSERT_EQ(ADebug::GetDebugLevelFromString("video", " \t \n ", LVL(2)), LVL(2)); - ASSERT_EQ(ADebug::GetDebugLevelFromString("video", "3", LVL(5)), LVL(3)); - ASSERT_EQ(ADebug::GetDebugLevelFromString("video", "3:*deo", LVL(5)), LVL(3)); - ASSERT_EQ(ADebug::GetDebugLevelFromString( + ASSERT_EQ(ADebug::GetLevelFromSettingsString("video", "", LVL(5)), LVL(5)); + ASSERT_EQ(ADebug::GetLevelFromSettingsString("video", " \t \n ", LVL(2)), LVL(2)); + ASSERT_EQ(ADebug::GetLevelFromSettingsString("video", "3", LVL(5)), LVL(3)); + ASSERT_EQ(ADebug::GetLevelFromSettingsString("video", "3:*deo", LVL(5)), LVL(3)); + ASSERT_EQ(ADebug::GetLevelFromSettingsString( "video", "\t\n 3 \t\n:\t\n video \t\n", LVL(5)), LVL(3)); - ASSERT_EQ(ADebug::GetDebugLevelFromString("video", "3:*deo,2:vid*", LVL(5)), LVL(2)); - ASSERT_EQ(ADebug::GetDebugLevelFromString( + ASSERT_EQ(ADebug::GetLevelFromSettingsString("video", "3:*deo,2:vid*", LVL(5)), LVL(2)); + ASSERT_EQ(ADebug::GetLevelFromSettingsString( "avideo", "\t\n 3 \t\n:\t\n avideo \t\n,\t\n 2 \t\n:\t\n video \t\n", LVL(5)), LVL(3)); - ASSERT_EQ(ADebug::GetDebugLevelFromString( + ASSERT_EQ(ADebug::GetLevelFromSettingsString( "audio.omx", "4:*omx,3:*d*o*,2:audio*", LVL(5)), LVL(2)); - ASSERT_EQ(ADebug::GetDebugLevelFromString( + ASSERT_EQ(ADebug::GetLevelFromSettingsString( "video.omx", "4:*omx,3:*d*o*,2:audio*", LVL(5)), LVL(3)); - ASSERT_EQ(ADebug::GetDebugLevelFromString("video", "4:*omx,3:*d*o*,2:audio*", LVL(5)), LVL(3)); - ASSERT_EQ(ADebug::GetDebugLevelFromString("omx", "4:*omx,3:*d*o*,2:audio*", LVL(5)), LVL(4)); + ASSERT_EQ(ADebug::GetLevelFromSettingsString("video", "4:*omx,3:*d*o*,2:audio*", LVL(5)), LVL(3)); + ASSERT_EQ(ADebug::GetLevelFromSettingsString("omx", "4:*omx,3:*d*o*,2:audio*", LVL(5)), LVL(4)); #undef LVL } |