Avoid X86_ASM ifdef. Ideally, we may want to update all routines to average vertically first, which would make this unnecessary. In the interim, this enables the tests to run successfully on x86 without SSSE3 support again.
Showing the changes to test/api/encoder_test.cpp (1 of 3 files). Show all
Unified · Split
| @@ -28,7 +28,7 @@ TEST_F (EncoderInitTest, JustInit) {} · 27 unmodified lines | ||
| 28 | 28 | |
| 29 | 29 | struct EncodeFileParam { |
| 30 | 30 | const char* pkcFileName; |
| 31 | − const char* pkcHashStr; | |
| 31 | + const char* pkcHashStr[2]; | |
| 32 | 32 | EUsageType eUsageType; |
| 33 | 33 | int iWidth; |
| 34 | 34 | int iHeight; |
| @@ -97,89 +97,81 @@ TEST_P (EncoderOutputTest, CompareOutput) { · 62 unmodified lines | ||
| 97 | 97 | unsigned char digest[SHA_DIGEST_LENGTH]; |
| 98 | 98 | SHA1Result (&ctx_, digest); |
| 99 | 99 | if (!HasFatalFailure()) { |
| 100 | − CompareHash (digest, p.pkcHashStr); | |
| 100 | + CompareHashAnyOf (digest, p.pkcHashStr, sizeof p.pkcHashStr / sizeof *p.pkcHashStr); | |
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | static const EncodeFileParam kFileParamArray[] = { |
| 104 | 104 | { |
| 105 | 105 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 106 | − "ee97bab09041362fbe8aed16f69a55f16b106f92", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 106 | + {"ee97bab09041362fbe8aed16f69a55f16b106f92"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 107 | 107 | }, |
| 108 | 108 | { |
| 109 | 109 | "res/CiscoVT2people_160x96_6fps.yuv", |
| 110 | − "37b4f5b7b77b362dee9a74ac4b2bc043537f2dd0", CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 110 | + {"37b4f5b7b77b362dee9a74ac4b2bc043537f2dd0"}, CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 111 | 111 | }, |
| 112 | 112 | { |
| 113 | 113 | "res/Static_152_100.yuv", |
| 114 | − "b220be0163974e36fbd6662236d4e05566a21546", CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 114 | + {"b220be0163974e36fbd6662236d4e05566a21546"}, CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 115 | 115 | }, |
| 116 | 116 | { |
| 117 | 117 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 118 | − "21dbfaaf4f09af735298434c1f97cf95a464165b", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_RASTER_SLICE, false, 1, false, false, false // One slice per MB row | |
| 118 | + {"21dbfaaf4f09af735298434c1f97cf95a464165b"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_RASTER_SLICE, false, 1, false, false, false // One slice per MB row | |
| 119 | 119 | }, |
| 120 | 120 | { |
| 121 | 121 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 122 | − "409ced068a5a313cad7c654d27ab7a2edaed4630", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false | |
| 122 | + {"409ced068a5a313cad7c654d27ab7a2edaed4630"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false | |
| 123 | 123 | }, |
| 124 | 124 | { |
| 125 | 125 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 126 | −// X86_ASM downsampling routines average vertically first, as opposed to | |
| 127 | −// horizontally first, which results in different output. | |
| 128 | −#ifdef X86_ASM | |
| 129 | − "a5341d588b769809c1f1d983e5a0fcef7362f3ad", | |
| 130 | −#else | |
| 131 | − "73156dfc1dc45924349b5b79f8debcac13d7231d", | |
| 132 | −#endif | |
| 126 | + // Allow for different output depending on whether averaging is done | |
| 127 | + // vertically or horizontally first when downsampling. | |
| 128 | + { "a5341d588b769809c1f1d983e5a0fcef7362f3ad", "73156dfc1dc45924349b5b79f8debcac13d7231d" }, | |
| 133 | 129 | CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2, false, false, false |
| 134 | 130 | }, |
| 135 | 131 | { |
| 136 | 132 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 137 | − "8bc8813ee262b356e53eec6dbdc3c88d7d2b7b5c", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false | |
| 133 | + {"8bc8813ee262b356e53eec6dbdc3c88d7d2b7b5c"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false | |
| 138 | 134 | }, |
| 139 | 135 | { |
| 140 | 136 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 141 | −// X86_ASM downsampling routines average vertically first, as opposed to | |
| 142 | −// horizontally first, which results in different output. | |
| 143 | −#ifdef X86_ASM | |
| 144 | − "ec9d776a7d92cf0f6640065aee8af2450af0e993", | |
| 145 | −#else | |
| 146 | − "3943145545a2bd27a642b2045d4e3dbae55c6870", | |
| 147 | −#endif | |
| 137 | + // Allow for different output depending on whether averaging is done | |
| 138 | + // vertically or horizontally first when downsampling. | |
| 139 | + { "ec9d776a7d92cf0f6640065aee8af2450af0e993", "3943145545a2bd27a642b2045d4e3dbae55c6870" }, | |
| 148 | 140 | CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4, false, false, false |
| 149 | 141 | }, |
| 150 | 142 | // the following values may be adjusted for times since we start tuning the strategy |
| 151 | 143 | { |
| 152 | 144 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 153 | − "c384a0dafc46573d02a38d8323304c5e1309d9d0", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 145 | + {"c384a0dafc46573d02a38d8323304c5e1309d9d0"}, SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 154 | 146 | }, |
| 155 | 147 | { |
| 156 | 148 | "res/CiscoVT2people_160x96_6fps.yuv", |
| 157 | − "637d50652f9bb8750359c4b418f30a039908d56d", SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 149 | + {"637d50652f9bb8750359c4b418f30a039908d56d"}, SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 158 | 150 | }, |
| 159 | 151 | { |
| 160 | 152 | "res/Static_152_100.yuv", |
| 161 | − "77a140c6bd80a6479ee13aecd2a8dac0a17cf03d", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 153 | + {"77a140c6bd80a6479ee13aecd2a8dac0a17cf03d"}, SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 162 | 154 | }, |
| 163 | 155 | { |
| 164 | 156 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 165 | − "9e35aac6ee12b4516fbee114bc532faae23df76d", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false | |
| 157 | + {"9e35aac6ee12b4516fbee114bc532faae23df76d"}, SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false | |
| 166 | 158 | }, |
| 167 | 159 | //for different strategy |
| 168 | 160 | { |
| 169 | 161 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 170 | − "1a6dc4f84cada651c4c8b24f879c858e35c2e813", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, true, true, false | |
| 162 | + {"1a6dc4f84cada651c4c8b24f879c858e35c2e813"}, SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, true, true, false | |
| 171 | 163 | }, |
| 172 | 164 | { |
| 173 | 165 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 174 | − "04ad01bb3872f7dae055c1ec661218f41a020dac", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac | |
| 166 | + {"04ad01bb3872f7dae055c1ec661218f41a020dac"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac | |
| 175 | 167 | }, |
| 176 | 168 | { |
| 177 | 169 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 178 | − "f5a92b7a0c00691e04bf1306c8251a74f989e4e2", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, true | |
| 170 | + {"f5a92b7a0c00691e04bf1306c8251a74f989e4e2"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, true | |
| 179 | 171 | }, |
| 180 | 172 | { |
| 181 | 173 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 182 | − "a27539982433279faa9975c96eaec28df770223e", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_FIXEDSLCNUM_SLICE, false, 1, false, false, true | |
| 174 | + {"a27539982433279faa9975c96eaec28df770223e"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_FIXEDSLCNUM_SLICE, false, 1, false, false, true | |
| 183 | 175 | }, |
| 184 | 176 | }; |
| 185 | 177 | |