Showing the changes to test/api/encoder_test.cpp (1 of 7 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 | − {"e182e21fefc61a5b5460099e0498ff0eac3f6a7e"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 106 | + {"913766b932176ff14943c0581f7c363e4fcb3e7a"}, 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 | − {"ed41e6df5a90721d323d02436da3c968a522d7d6"}, CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 110 | + {"cfc6e738acdc3f8a3a6347d1d7a094ec18a95dcc"}, 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 | − {"c6acd9008d206d81e290115cf71f2e6943605a2b"}, CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 114 | + {"6c735b2de8e40c5d58d104c3d59b816244dcae6f"}, 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 | − {"761f8dbd2642074e90fbe3683f0b2df8a239d802"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_RASTER_SLICE, false, 1, false, false, false // One slice per MB row | |
| 118 | + {"7cd6bc961433a6f0b3839aa31af0eee4cabf5f1f"}, 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 | − {"59b3960a2fd89cb087b45fc6babc2c0114287a8d"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false | |
| 122 | + {"4b916fac735bede22b9596cf7a982913454c9cc4"}, 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 | − { "d2e87f94bf26e33356aa7f0d822f900ea4e7303b", "e51949a93f3076790c50a795541eda9d6e0ae358" }, | |
| 128 | + { "8d289f3416db6f493d2ef9da2359a14f90c4af49", "37c5be6e6008823d3f9649ec0074735bcff7f052" }, | |
| 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 | − {"1980853714ac607a7527ef470dccd78b167032b2"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false | |
| 133 | + {"9467df1227c6ef12e6014a3b340832f424ee1ec3"}, 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 | − { "fe7c5fa35c5c8f1eac0408b93d356a6d0bb7e5bd", "91ba01ef0067b0d211a6fbe5e2f96e82ce319a41" }, | |
| 139 | + { "fd03be5581079e00541a944f848cfbc3886d3017", "ebcbb383478f5e31f5f8ef804c6e404ed7732664" }, | |
| 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 | − {"ae0351f4a664a265504dc46a73b88a0031c31cf2"}, SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 146 | + {"d10ea8f062b4fd1bca401e8265aac061055e358c"}, 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 | − {"3d2b20620721a6c4a303d386258ad89d174deb60"}, SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 150 | + {"ae5114a1a5e32406e97807c454dd89c84d97cda4"}, 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 | − {"d469c43ff9d7eab47a6d865c1739039e35cf1f2a"}, SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 154 | + {"c02a960a710ad414737e8d879e7706804eeaa0e9"}, 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 | − {"d955b29aa7db6688bf273b07858a698f67348d3e"}, SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false | |
| 158 | + {"156d35b56e75a0c90bfcd2d58b652fe56d2d2dcd"}, 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 | − {"24f3fae260b484a6c2e1a80cc7af7cdb43835b4c"}, SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, true, true, false | |
| 163 | + {"a41b5877870f9e66294dcf58d56afdd2b1ff6aee"}, 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 | − {"ab23d0ae245283b3f12db766df155ced7b4a610e"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac | |
| 167 | + {"dcdcadeb437607b50fc22a47753b9763f0f64796"}, 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 | − {"b3c4241720bfa9e149bcd3567d405f0b474edf21"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, true | |
| 172 | + {"72d24512497921fdcd7e0330c256c8cea3e45ace"}, 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 | − {"c82965b5119341b288a7c39135ce44521a6f23e1"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_FIXEDSLCNUM_SLICE, false, 1, false, false, true | |
| 177 | + {"1777abff44723470bb573ea4701cae1938d23ae5"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_FIXEDSLCNUM_SLICE, false, 1, false, false, true | |
| 178 | 178 | }, |
| 179 | 179 | |
| 180 | 180 | }; |