Showing the changes to test/api/encoder_test.cpp (1 of 3 files). Show all
Unified · Split
| @@ -103,59 +103,59 @@ TEST_P (EncoderOutputTest, CompareOutput) { · 102 unmodified lines | |||
| 103 | static const EncodeFileParam kFileParamArray[] = { | 103 | static const EncodeFileParam kFileParamArray[] = { |
| 104 | { | 104 | { |
| 105 | "res/CiscoVT2people_320x192_12fps.yuv", | 105 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 106 | {"4370a847a8d680a29176489f3194b6e7bd2fc468"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 106 | {"c4be9cea9fd012da2efa1247a934d3041cb8e210"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false |
| 107 | }, | 107 | }, |
| 108 | { | 108 | { |
| 109 | "res/CiscoVT2people_160x96_6fps.yuv", | 109 | "res/CiscoVT2people_160x96_6fps.yuv", |
| 110 | {"3ba799ac78194154d990836db529325c0c42f62a"}, CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 110 | {"0f4638fadc3c688424e3c4708f0c48aed91cf508"}, CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false |
| 111 | }, | 111 | }, |
| 112 | { | 112 | { |
| 113 | "res/Static_152_100.yuv", | 113 | "res/Static_152_100.yuv", |
| 114 | {"ba5a3f7cce2fd2e692bb07a25e288edaee3c220d"}, CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 114 | {"22f317206212ec53c195726a07c157cb54163143"}, CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false |
| 115 | }, | 115 | }, |
| 116 | { | 116 | { |
| 117 | "res/CiscoVT2people_320x192_12fps.yuv", | 117 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 118 | {"b608de962bd4eb127f96fe91cb4a15435aff35c8"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_RASTER_SLICE, false, 1, false, false, false // One slice per MB row | 118 | {"f6f802ea68ecbc313de6327275a7dd92607cb9f8"}, 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 | "res/CiscoVT2people_320x192_12fps.yuv", | 121 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 122 | {"1a7dd104095dca7bac8ef495bdb0f5f2da2019a3"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false | 122 | {"5f958ec330026009d5fd47d0acc2f3dd9b38acc0"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false |
| 123 | }, | 123 | }, |
| 124 | { | 124 | { |
| 125 | "res/CiscoVT2people_320x192_12fps.yuv", | 125 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 126 | // Allow for different output depending on whether averaging is done | 126 | // Allow for different output depending on whether averaging is done |
| 127 | // vertically or horizontally first when downsampling. | 127 | // vertically or horizontally first when downsampling. |
| 128 | { "82b27ea447a0c0a426dba76711a4b97ef154689c", "919c4d846b39fcbe8550d747f80673880fde5769" }, | 128 | { "a9b51d700974501807199bc0612054de86a23278", "214059cd68f10da94d0c240624e6364071388d74" }, |
| 129 | CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2, false, false, false | 129 | CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2, false, false, false |
| 130 | }, | 130 | }, |
| 131 | { | 131 | { |
| 132 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", | 132 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 133 | {"16edc874e6994f9d7fc8cec38ad7bd7dc1a0d974"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false | 133 | {"bc95b57efa84595a8e41bfb6e97e5086f4743134"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false |
| 134 | }, | 134 | }, |
| 135 | { | 135 | { |
| 136 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", | 136 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 137 | // Allow for different output depending on whether averaging is done | 137 | // Allow for different output depending on whether averaging is done |
| 138 | // vertically or horizontally first when downsampling. | 138 | // vertically or horizontally first when downsampling. |
| 139 | { "5814c0e9415ebfe2b7eba3600676d5848874dc30", "448f56278c42282015c428e193b9e34cb91571d3" }, | 139 | { "3b435a98682957cf58b3aa819e6fc6727e0f783d", "d59eb6f7657a82008d60d44f7de95445a35483d7" }, |
| 140 | CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4, false, false, false | 140 | CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4, false, false, false |
| 141 | }, | 141 | }, |
| 142 | 142 | ||
| 143 | // the following values may be adjusted for times since we start tuning the strategy | 143 | // the following values may be adjusted for times since we start tuning the strategy |
| 144 | { | 144 | { |
| 145 | "res/CiscoVT2people_320x192_12fps.yuv", | 145 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 146 | {"37d574d7e2ddffd9341f9c1f99ffcab81dc252ee"}, SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 146 | {"70db2fe49cabaa7a3cef50c1d0b3bc177f655717"}, SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false |
| 147 | }, | 147 | }, |
| 148 | { | 148 | { |
| 149 | "res/CiscoVT2people_160x96_6fps.yuv", | 149 | "res/CiscoVT2people_160x96_6fps.yuv", |
| 150 | {"e467d01f8bbf25bd286d67b44d6509cede7f3687"}, SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 150 | {"34de3a5d4dcbeb956722ba42c2dca1b3840dd12a"}, SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false |
| 151 | }, | 151 | }, |
| 152 | { | 152 | { |
| 153 | "res/Static_152_100.yuv", | 153 | "res/Static_152_100.yuv", |
| 154 | {"c714036e6ca3474b5248d79080d210299e7ef29d"}, SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 154 | {"49b1e0077eb9698731242890104c67ea170d533c"}, SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false |
| 155 | }, | 155 | }, |
| 156 | { | 156 | { |
| 157 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", | 157 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 158 | {"797964a31fc536256fd7cc90381b5299161a10c5"}, SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false | 158 | {"138b205e6c5ceacda38c94e975bb8d861fc12b88"}, SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false |
| 159 | }, | 159 | }, |
| 160 | //for different strategy | 160 | //for different strategy |
| 161 | { | 161 | { |
| @@ -164,17 +164,17 @@ static const EncodeFileParam kFileParamArray[] = { · 2 unmodified lines | |||
| 164 | }, | 164 | }, |
| 165 | { | 165 | { |
| 166 | "res/CiscoVT2people_320x192_12fps.yuv", | 166 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 167 | {"057fcce24ffbcffab3abf9bb73eae5fe668efb30"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac | 167 | {"2bbea8b822405788aa37755bfabfc111bbf807ac"}, 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 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", | 171 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 172 | {"328e077a54f20879ee90f4b59103f92b3a3adc40"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, true | 172 | {"e2231611b47abee0ebfe861e0d077b2000e633aa"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, true |
| 173 | }, | 173 | }, |
| 174 | 174 | ||
| 175 | { | 175 | { |
| 176 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", | 176 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 177 | {"1ef77079f2c8099f3bb734e696c73df9448424cf"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_FIXEDSLCNUM_SLICE, false, 1, false, false, true | 177 | {"822071b3d149557b758299178d4146dab0e7022d"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_FIXEDSLCNUM_SLICE, false, 1, false, false, true |
| 178 | }, | 178 | }, |
| 179 | 179 | ||
| 180 | }; | 180 | }; |