Showing the changes to test/api/encoder_test.cpp (1 of 10 files). Show all
Unified · Split
| @@ -103,65 +103,65 @@ TEST_P (EncoderOutputTest, CompareOutput) { · 102 unmodified lines | ||
| 103 | 103 | static const EncodeFileParam kFileParamArray[] = { |
| 104 | 104 | { |
| 105 | 105 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 106 | − "fda5fa8f44241c0ef300eed5d986359cc2f71647", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 106 | + "16b145cf76a677d87240ef6c8efff0ff8d3a2f3a", 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 | − "ce17d7f4ca7750d70dc070a28242edbe98441f5d", CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 110 | + "874ab77ba13f199d70b67cd75f8e23baf482c1ed", 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 | − "816285029e7ffd76d16b77c9fafb5d3a40878fd0", CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 114 | + "73b40ad71e1f1ffbbd5425de2b094ccbdfa798a6", 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 | − "b3ceb5a53399736894dfe612013b72b3fc16bf4b", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_ROWMB_SLICE, false, 1, false, false, false // One slice per MB row | |
| 118 | + "c1b187be92a35ac8f4f9724b594559e0394c1df8", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_ROWMB_SLICE, false, 1, false, false, false // One slice per MB row | |
| 119 | 119 | }, |
| 120 | 120 | { |
| 121 | 121 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 122 | − "d178cb03b4ce65de7238ab4e72d967d99fae2be7", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false | |
| 122 | + "959a94ea684bf37eaf39909f6460e02b50ad0a5f", 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 | − "73f87a9826d6e110355dc29699a74543e7ac82b0", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2, false, false, false | |
| 126 | + "684e6d141ada776892bdb01ee93efe475983ed36", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2, false, false, false | |
| 127 | 127 | }, |
| 128 | 128 | { |
| 129 | 129 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 130 | − "31ab47b2db6686b22c0aec4d486be38217d9ffed", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false | |
| 130 | + "27a595af0e9598feb4dc1403fd99affddfa51f46", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false | |
| 131 | 131 | }, |
| 132 | 132 | { |
| 133 | 133 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 134 | − "db934bc11f7f8e18ac6ff96bdbabe2083ec5f023", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4, false, false, false | |
| 134 | + "68c3220e49b7a57d563faf7c99a870ab34a23400", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4, false, false, false | |
| 135 | 135 | }, |
| 136 | 136 | // the following values may be adjusted for times since we start tuning the strategy |
| 137 | 137 | { |
| 138 | 138 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 139 | − "6da36dc5d40cb8180df378bac8980e4b136833b3", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 139 | + "1645c417562c5249e58b49b6e467d8b53febb226", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 140 | 140 | }, |
| 141 | 141 | { |
| 142 | 142 | "res/CiscoVT2people_160x96_6fps.yuv", |
| 143 | − "c0ac176c09390bd1db9b38c4dbd2eba10b8e05df", SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 143 | + "51fc38d467509f94e85f9678f11429220e46d862", SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 144 | 144 | }, |
| 145 | 145 | { |
| 146 | 146 | "res/Static_152_100.yuv", |
| 147 | − "065e07a60ca7361b28b6f3cd9d124a2234169874", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 147 | + "1af33ad3d8c40756ef1f6074c019a06535c35ab0", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 148 | 148 | }, |
| 149 | 149 | { |
| 150 | 150 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 151 | − "5f25b1427f4209664720a7655ba50de4726cd003", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false | |
| 151 | + "e032f8f8b153f37e614676735074cdce843032de", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false | |
| 152 | 152 | }, |
| 153 | 153 | //for different strategy |
| 154 | 154 | { |
| 155 | 155 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 156 | − "abf089cc5357f8a208e2c99fbcdbd53d6d1638c8", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, true, true, false | |
| 156 | + "28e290b204257eae5c735b2b96491358ec14221e", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, true, true, false | |
| 157 | 157 | }, |
| 158 | 158 | { |
| 159 | 159 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 160 | − "0eaa62f8e311d529674808c02dc9688c4a0952dd", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac | |
| 160 | + "59e51ffc741172df4a729d7fc1f85645885311a5", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac | |
| 161 | 161 | }, |
| 162 | 162 | { |
| 163 | 163 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 164 | − "e95de674383f2541502b2bd2b4d13f724c3b9bd8", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, true | |
| 164 | + "f4361779554ae66ce62308f1e01218369ca0edf4", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, true | |
| 165 | 165 | }, |
| 166 | 166 | }; |
| 167 | 167 | |