Showing the changes to test/api/encoder_test.cpp (1 of 6 files). Show all
Unified · Split
| @@ -103,65 +103,65 @@ 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 | "bfe882345e17346a76438dad967ecd8a15052e0b", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 106 | "03d992976d9b9c3dd7f9803883d3f7b7614b47bf", 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 | "9879c0e65e0f2d166c450c371c95a1e36eadfa4e", CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 110 | "f7ccdadc446f87927d63f9a1fe78c72344a920cb", 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 | "f2a4089dbf7278f9e7204351d6ce93e913d6ea1f", CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 114 | "c25d6d8c45de417cb42d861ee71a42d0ebfb6da9", 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 | "3ea419b2ea341fe548dbe65be0e955ffea59483a", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_ROWMB_SLICE, false, 1, false, false, false // One slice per MB row | 118 | "21dbfaaf4f09af735298434c1f97cf95a464165b", 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 | "res/CiscoVT2people_320x192_12fps.yuv", | 121 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 122 | "7614af78a3cb16df8187c1db5492f82f3440a63b", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false | 122 | "a37f67d6050fe113ccfb65e562a6c32086a29eb3", 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 | "833a7ae798720f72d6a0b46e5cd1f046c0fdd758", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2, false, false, false | 126 | "4f12d2b08af761b8bb61a5b25f96ad6a321a43fa", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2, false, false, false |
| 127 | }, | 127 | }, |
| 128 | { | 128 | { |
| 129 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", | 129 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 130 | "6cc7d08b2a80fc2836396808f919f9b5d4ee1d97", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false | 130 | "9006ccba6d9d90815bd42ba850b344919fa399f4", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false |
| 131 | }, | 131 | }, |
| 132 | { | 132 | { |
| 133 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", | 133 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 134 | "40bc1ffec7febdb725ae99954bfa4cb64f070891", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4, false, false, false | 134 | "a4707845cacc437fb52010eb020fca6d4bc1102d", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4, false, false, false |
| 135 | }, | 135 | }, |
| 136 | // the following values may be adjusted for times since we start tuning the strategy | 136 | // the following values may be adjusted for times since we start tuning the strategy |
| 137 | { | 137 | { |
| 138 | "res/CiscoVT2people_320x192_12fps.yuv", | 138 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 139 | "6ce04eca6d8a6127ae1a6ee3e0d67977f806f5e2", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 139 | "a731f20ec06d5591142f80e0d0e3edff88167d19", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false |
| 140 | }, | 140 | }, |
| 141 | { | 141 | { |
| 142 | "res/CiscoVT2people_160x96_6fps.yuv", | 142 | "res/CiscoVT2people_160x96_6fps.yuv", |
| 143 | "2a9942d8d67509712828a5268483141bb8c9b30f", SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 143 | "3a472cf6fbfa474c73fabaeb6e68c07112a2f5d2", SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false |
| 144 | }, | 144 | }, |
| 145 | { | 145 | { |
| 146 | "res/Static_152_100.yuv", | 146 | "res/Static_152_100.yuv", |
| 147 | "2041510ebc2810596495d694672ada66f6ec3a0e", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 147 | "43e0ea83028ea51eb41f29633af50fff7137024a", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false |
| 148 | }, | 148 | }, |
| 149 | { | 149 | { |
| 150 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", | 150 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 151 | "116663b5a00f000ab40e95b6202563e3cb4ce488", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false | 151 | "aa0aaca96475c65d66e90e513618fa814b098dff", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false |
| 152 | }, | 152 | }, |
| 153 | //for different strategy | 153 | //for different strategy |
| 154 | { | 154 | { |
| 155 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", | 155 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 156 | "6b981e68a6e0b03a8b769fdd39ec5838380bc4d2", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, true, true, false | 156 | "5622722316eed2482bf78520eda7e448312e340e", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, true, true, false |
| 157 | }, | 157 | }, |
| 158 | { | 158 | { |
| 159 | "res/CiscoVT2people_320x192_12fps.yuv", | 159 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 160 | "aae07cf34b065871921f742cdf25a4bf4d623935", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac | 160 | "cd9716c92c595f5492a46adf33f07bedf98db408", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac |
| 161 | }, | 161 | }, |
| 162 | { | 162 | { |
| 163 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", | 163 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 164 | "bb8ee13f829fa593b77760afdeb1215d0a577ee1", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, true | 164 | "dfd4666f9b90d5d77647454e2a06d546adac6a7c", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, true |
| 165 | }, | 165 | }, |
| 166 | }; | 166 | }; |
| 167 | 167 | ||