Showing the changes to test/api/encoder_test.cpp (1 of 7 files). Show all
Unified · Split
| @@ -103,27 +103,27 @@ 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 | "e36b6169dcb5bbb90e64291250ec65995d62c846", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 106 | "bfe882345e17346a76438dad967ecd8a15052e0b", 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 | "04c73f202a29befd57ee49d242688f3e6ddfecbc", CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 110 | "9879c0e65e0f2d166c450c371c95a1e36eadfa4e", 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 | "c959ae52c5469bfc37bb31870c6a7259a1bb1917", CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 114 | "f2a4089dbf7278f9e7204351d6ce93e913d6ea1f", 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 | "f03ca6a679cd12c90542e351eabfce0d902ffad2", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_ROWMB_SLICE, false, 1, false, false, false // One slice per MB row | 118 | "3ea419b2ea341fe548dbe65be0e955ffea59483a", 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 | "c7f37486e00c1f18715c7aaf10444f03111418cf", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false | 122 | "7614af78a3cb16df8187c1db5492f82f3440a63b", 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 | "c493a8087050d2993f39ad1081940dd707e6fb3e", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2, false, false, false | 126 | "833a7ae798720f72d6a0b46e5cd1f046c0fdd758", 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", |
| @@ -131,20 +131,20 @@ static const EncodeFileParam kFileParamArray[] = { · 1 unmodified line | |||
| 131 | }, | 131 | }, |
| 132 | { | 132 | { |
| 133 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", | 133 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 134 | "cd10602a951712c1b93bef82a445415723e52af6", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4, false, false, false | 134 | "40bc1ffec7febdb725ae99954bfa4cb64f070891", 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 | "9b8ba682313ed9cd0512563859e050942a3e776e", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 139 | "6ce04eca6d8a6127ae1a6ee3e0d67977f806f5e2", 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 | "2706c61e9459196b4161f4bbb9444a08308ae8c5", SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 143 | "2a9942d8d67509712828a5268483141bb8c9b30f", 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 | "d8457a47946e91b01310d8de9afa21ac00df8edb", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | 147 | "2041510ebc2810596495d694672ada66f6ec3a0e", 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", |
| @@ -157,7 +157,7 @@ static const EncodeFileParam kFileParamArray[] = { · 6 unmodified lines | |||
| 157 | }, | 157 | }, |
| 158 | { | 158 | { |
| 159 | "res/CiscoVT2people_320x192_12fps.yuv", | 159 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 160 | "7aaab6ef2dc5f95c3a2869979eba59553936e36f", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac | 160 | "aae07cf34b065871921f742cdf25a4bf4d623935", 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", |