History

turn off aq and don't use default max/min qp in RC_QUALITY_MODE

Karina committed 10 years ago

Commit 69a6c271 parent 5b5134e3 files · +23 −22Browse files

Showing the changes to test/api/encoder_test.cpp (1 of 3 files). Show all

Unified · Split

test/api/encoder_test.cpp+16−16
@@ -103,75 +103,75 @@ TEST_P (EncoderOutputTest, CompareOutput) { · 102 unmodified lines
103static const EncodeFileParam kFileParamArray[] = {103static const EncodeFileParam kFileParamArray[] = {
104 {104 {
105 "res/CiscoVT2people_320x192_12fps.yuv",105 "res/CiscoVT2people_320x192_12fps.yuv",
106 {"6426c5d4d8d65ddd4c540f41c629a25450a2b7e0"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false106 {"eb6cd4d17368be148de36af04d419c4c8cdb238f"}, 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 {"24c9968cda12fdc522fd711ceb80d82b8e3df78e"}, CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false110 {"4e6e6dd3c9ef9c9f2ea19c90006b7e1561c2554f"}, 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 {"60630b2b10f0d339ae94464777a64a068401bdd5"}, CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false114 {"9b1eea9e9c4d58b02644a3b9d6cac32ad7174ce8"}, 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 {"27ad06d87e71bc5aa19877338e6d00774d5ec307"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_RASTER_SLICE, false, 1, false, false, false // One slice per MB row118 {"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 "res/CiscoVT2people_320x192_12fps.yuv",121 "res/CiscoVT2people_320x192_12fps.yuv",
122 {"2cd791e7a176618d83b35fc014d6ac2eebb630d2"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false122 {"8d2ed78f0ebb54fece701403675dcd36e9222fc2"}, 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 done126 // 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 { "bf8be81e370bec0866e3a7851ef853efec2698ee", "a70ed5995fcb021ee2a1e2f731894a26b041a868" },128 { "24177466a3433d73f0110e72ee0fcaf731e80e88", "1867a20126d80ae8d4812bd5a9cc172945e4785a" },
129 CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2, false, false, false129 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 {"102b4ad80578d3fad3f8ab72f4903670f23065be"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false133 {"ce0cbb3d13af5b6e0932ae6393415700d751b374"}, 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 done137 // 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 { "2f4bc88c79771b6e197e215ab6a9d3064f02c2aa", "5af0d6e97f039b5252cf2433c54ec68f354a4115" },139 { "093eac26331dc016cef1ea22214904d32344ad76", "e1d01d767e2c9f3b0fb761e1572539121a2d13b9" },
140 CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4, false, false, false140 CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4, false, false, false
141 },141 },
142 // the following values may be adjusted for times since we start tuning the strategy142 // the following values may be adjusted for times since we start tuning the strategy
143 {143 {
144 "res/CiscoVT2people_320x192_12fps.yuv",144 "res/CiscoVT2people_320x192_12fps.yuv",
145 {"a075c04a33bc4e326ae4cc60a8f45938dbfa8b24"}, SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false145 {"21eb4a21bb6b2974ffe078b00a574c6f7269e5eb"}, SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false
146 },146 },
147 {147 {
148 "res/CiscoVT2people_160x96_6fps.yuv",148 "res/CiscoVT2people_160x96_6fps.yuv",
149 {"7b7fa895ea1099402ce4c0c4edc92e383e7badce"}, SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false149 {"962fe7aca514e409106b517149cbd332b9784ed3"}, SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false
150 },150 },
151 {151 {
152 "res/Static_152_100.yuv",152 "res/Static_152_100.yuv",
153 {"04ab90de551f81d0900b7c661925f6922e36befe"}, SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false153 {"e69b7dc98c5c0934700517ef79e8377f3f683998"}, SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false
154 },154 },
155 {155 {
156 "res/Cisco_Absolute_Power_1280x720_30fps.yuv",156 "res/Cisco_Absolute_Power_1280x720_30fps.yuv",
157 {"9e35aac6ee12b4516fbee114bc532faae23df76d"}, SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false157 {"8bb3041ef447a9171ee0f016b64908119804bd31"}, SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false
158 },158 },
159 //for different strategy159 //for different strategy
160 {160 {
161 "res/Cisco_Absolute_Power_1280x720_30fps.yuv",161 "res/Cisco_Absolute_Power_1280x720_30fps.yuv",
162 {"1a6dc4f84cada651c4c8b24f879c858e35c2e813"}, SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, true, true, false162 {"e62d5f1cce92633203bf65984089f471b530652b"}, SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, true, true, false
163 },163 },
164 {164 {
165 "res/CiscoVT2people_320x192_12fps.yuv",165 "res/CiscoVT2people_320x192_12fps.yuv",
166 {"1103db3a06f10d3456919f41a5e1552d42c3b172"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac166 {"f006aa3569829d8ebebdd4a8a1f7cd6d31628a45"}, CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac
167 },167 },
168 {168 {
169 "res/Cisco_Absolute_Power_1280x720_30fps.yuv",169 "res/Cisco_Absolute_Power_1280x720_30fps.yuv",
170 {"18d9a8b390c705e804e184caf95a802e24c9f0b9"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, true170 {"08e03852d6354a5b852f3c350dd5a844ffc60b33"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, true
171 },171 },
172 {172 {
173 "res/Cisco_Absolute_Power_1280x720_30fps.yuv",173 "res/Cisco_Absolute_Power_1280x720_30fps.yuv",
174 {"904da3557751bab4f0e2f0acfe12963b03acc108"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_FIXEDSLCNUM_SLICE, false, 1, false, false, true174 {"752aa204be96efbf5f838e35164fa5341a464420"}, CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_FIXEDSLCNUM_SLICE, false, 1, false, false, true
175 },175 },
176};176};
177 177

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t