Showing the changes to test/api/encoder_test.cpp (1 of 2 files). Show all
Unified · Split
| @@ -103,78 +103,78 @@ TEST_P (EncoderOutputTest, CompareOutput) { · 102 unmodified lines | ||
| 103 | 103 | static const EncodeFileParam kFileParamArray[] = { |
| 104 | 104 | { |
| 105 | 105 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 106 | − {"c4be9cea9fd012da2efa1247a934d3041cb8e210"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 106 | + {"19dd24f5a3ae9e9582024db5b63696948b8ac82f"}, 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 | − {"0f4638fadc3c688424e3c4708f0c48aed91cf508"}, CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 110 | + {"7acf58ba0e72ffc4725ad897ed45f990b9ab8413"}, 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 | − {"22f317206212ec53c195726a07c157cb54163143"}, CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 114 | + {"d27c6a56efe899528ddd3f8f3b33efb8f3ce2d51"}, 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 | − {"f6f802ea68ecbc313de6327275a7dd92607cb9f8"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_RASTER_SLICE, false, 1, false, false, false // One slice per MB row | |
| 118 | + {"5111d90ce90849020b7ed830cc2f962ccfea4457"}, 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 | − {"5f958ec330026009d5fd47d0acc2f3dd9b38acc0"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false | |
| 122 | + {"91ca058f728a001546ae34ce1b7a00163800faac"}, 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 | 126 | // Allow for different output depending on whether averaging is done |
| 127 | 127 | // vertically or horizontally first when downsampling. |
| 128 | − { "a9b51d700974501807199bc0612054de86a23278", "214059cd68f10da94d0c240624e6364071388d74" }, | |
| 128 | + { "4faa2a17c6629135af43c2392531f4ce954ec92d", "a4c2caccada00189c683cd61c6f0bb995d09aeff" }, | |
| 129 | 129 | CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2, false, false, false |
| 130 | 130 | }, |
| 131 | 131 | { |
| 132 | 132 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 133 | − {"bc95b57efa84595a8e41bfb6e97e5086f4743134"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false | |
| 133 | + {"abd7aa034f916659a9f68b33160b404fb43411dd"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false | |
| 134 | 134 | }, |
| 135 | 135 | { |
| 136 | 136 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 137 | 137 | // Allow for different output depending on whether averaging is done |
| 138 | 138 | // vertically or horizontally first when downsampling. |
| 139 | − { "3b435a98682957cf58b3aa819e6fc6727e0f783d", "d59eb6f7657a82008d60d44f7de95445a35483d7" }, | |
| 139 | + { "291fba557fdfd0e077ff6681425dc81c65704b62", "9e4fb2b503a877c21441545ee4f0cd5416dbe5e9" }, | |
| 140 | 140 | CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4, false, false, false |
| 141 | 141 | }, |
| 142 | 142 | |
| 143 | 143 | // the following values may be adjusted for times since we start tuning the strategy |
| 144 | 144 | { |
| 145 | 145 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 146 | − {"70db2fe49cabaa7a3cef50c1d0b3bc177f655717"}, SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 146 | + {"dd51c2007f944ee752532c74c4d38da1413acd88"}, SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 147 | 147 | }, |
| 148 | 148 | { |
| 149 | 149 | "res/CiscoVT2people_160x96_6fps.yuv", |
| 150 | − {"34de3a5d4dcbeb956722ba42c2dca1b3840dd12a"}, SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 150 | + {"564b0e774f0157c91c7ff3548708f88fb0f3abc6"}, SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 151 | 151 | }, |
| 152 | 152 | { |
| 153 | 153 | "res/Static_152_100.yuv", |
| 154 | − {"49b1e0077eb9698731242890104c67ea170d533c"}, SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 154 | + {"9b88952f0ec5ebf3e25e642b8a9f355854681f57"}, SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 155 | 155 | }, |
| 156 | 156 | { |
| 157 | 157 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 158 | − {"138b205e6c5ceacda38c94e975bb8d861fc12b88"}, SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false | |
| 158 | + {"7db72f0d6f347f57d5137a5cd4de2a3e3fba5b95"}, SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false | |
| 159 | 159 | }, |
| 160 | 160 | //for different strategy |
| 161 | 161 | { |
| 162 | 162 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 163 | − {"5db43d830d7d31549b5ff3d085b5c4a803b23cf4"}, SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, true, true, false | |
| 163 | + {"30b877303081e2c5ee579d8bbeb2094abd2018c1"}, SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, true, true, false | |
| 164 | 164 | }, |
| 165 | 165 | { |
| 166 | 166 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 167 | − {"2bbea8b822405788aa37755bfabfc111bbf807ac"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac | |
| 167 | + {"3c27f9134d79edaa769741005b569565c2367e6f"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac | |
| 168 | 168 | }, |
| 169 | 169 | |
| 170 | 170 | { |
| 171 | 171 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 172 | − {"e2231611b47abee0ebfe861e0d077b2000e633aa"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, true | |
| 172 | + {"e5a91447595a2a3560f7cdabbb62b694134fe4ca"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, true | |
| 173 | 173 | }, |
| 174 | 174 | |
| 175 | 175 | { |
| 176 | 176 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 177 | − {"822071b3d149557b758299178d4146dab0e7022d"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_FIXEDSLCNUM_SLICE, false, 1, false, false, true | |
| 177 | + {"77aa8bc391a84d308a09d4fbb859f4a0e8ae8196"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_FIXEDSLCNUM_SLICE, false, 1, false, false, true | |
| 178 | 178 | }, |
| 179 | 179 | |
| 180 | 180 | }; |