Showing the changes to test/api/encoder_test.cpp (1 of 10 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 | − {"913766b932176ff14943c0581f7c363e4fcb3e7a"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 106 | + {"4370a847a8d680a29176489f3194b6e7bd2fc468"}, 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 | − {"cfc6e738acdc3f8a3a6347d1d7a094ec18a95dcc"}, CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 110 | + {"3ba799ac78194154d990836db529325c0c42f62a"}, 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 | − {"6c735b2de8e40c5d58d104c3d59b816244dcae6f"}, CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 114 | + {"ba5a3f7cce2fd2e692bb07a25e288edaee3c220d"}, 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 | − {"7cd6bc961433a6f0b3839aa31af0eee4cabf5f1f"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_RASTER_SLICE, false, 1, false, false, false // One slice per MB row | |
| 118 | + {"b608de962bd4eb127f96fe91cb4a15435aff35c8"}, 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 | − {"4b916fac735bede22b9596cf7a982913454c9cc4"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false | |
| 122 | + {"d151b7e8755b4dceece593db0f0eb5806174e1fd"}, 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 | − { "4001d718054e4f65d64f0a2bd32a99ba2033cd8a", "cd78b0dfee319d4460e9ab1509343ffe59593e45" }, | |
| 128 | + { "82b27ea447a0c0a426dba76711a4b97ef154689c", "919c4d846b39fcbe8550d747f80673880fde5769" }, | |
| 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 | − {"c04ff7e9d4317e7881ecd83012e31b073c96e295"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false | |
| 133 | + {"16edc874e6994f9d7fc8cec38ad7bd7dc1a0d974"}, 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 | − { "466028ee74639279eac329d5dcfa25f52e93323a", "26675f545566fa9603468fd04990fa7d0c28705e" }, | |
| 139 | + { "5814c0e9415ebfe2b7eba3600676d5848874dc30", "448f56278c42282015c428e193b9e34cb91571d3" }, | |
| 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 | − {"774efc987d3d43405500c1d7d47315fa1871e525"}, SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 146 | + {"f097076fddadffe6f7234db373d7cbe976e8926c"}, 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 | − {"ae5114a1a5e32406e97807c454dd89c84d97cda4"}, SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 150 | + {"0362e5e4f86332d172d8e287f376786cda4b64c0"}, 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 | − {"c02a960a710ad414737e8d879e7706804eeaa0e9"}, SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 154 | + {"2a51fd383d676be8ec05b7b1d25818de03ae04ee"}, 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 | − {"e0367bfda7c1a7ab9a5e6c1661dc5d149c0bad3e"}, SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false | |
| 158 | + {"092db0f526d56d852099a6aeafddff197187ad04"}, 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 | − {"e7b43e8c8dfd7c90981caec494b0f1beb95fadd7"}, SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, true, true, false | |
| 163 | + {"7fa798b0cdd9ff90f1624a86f6e7e18f22e95363"}, 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 | − {"dcdcadeb437607b50fc22a47753b9763f0f64796"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac | |
| 167 | + {"057fcce24ffbcffab3abf9bb73eae5fe668efb30"}, 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 | − {"a8e429366ee8b591be156ab651c4b4b77dc1dfb4"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, true | |
| 172 | + {"328e077a54f20879ee90f4b59103f92b3a3adc40"}, 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 | − {"3531e331d390a3a45ace24164c1b33a71ea9ba65"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_FIXEDSLCNUM_SLICE, false, 1, false, false, true | |
| 177 | + {"1ef77079f2c8099f3bb734e696c73df9448424cf"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_FIXEDSLCNUM_SLICE, false, 1, false, false, true | |
| 178 | 178 | }, |
| 179 | 179 | |
| 180 | 180 | }; |