History

fix crash

Karina committed 11 years ago

Commit 7c1fbad1 parent d2e66de6 files · +6925 −6925Browse files

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

Unified · Split

test/api/encoder_test.cpp+10−10
@@ -103,15 +103,15 @@ 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 "33b5470a38f1a5fcc69da6cfa4feb10f62ac9e2f", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false106 "ee97bab09041362fbe8aed16f69a55f16b106f92", 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 "5633086f68b36e5c58ab5b6c3c5abf936b3bbde8", CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false110 "37b4f5b7b77b362dee9a74ac4b2bc043537f2dd0", 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 "4d6db931e370ee600a294e844d070aa0d5b7c909", CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false114 "b220be0163974e36fbd6662236d4e05566a21546", 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",
@@ -119,11 +119,11 @@ static const EncodeFileParam kFileParamArray[] = { · 1 unmodified line
119 },119 },
120 {120 {
121 "res/CiscoVT2people_320x192_12fps.yuv",121 "res/CiscoVT2people_320x192_12fps.yuv",
122 "a0b60763e311a698ca17692a365ca3fefd519f80", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false122 "409ced068a5a313cad7c654d27ab7a2edaed4630", 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 "0acde1838cb1585bc0b77148c0068c856c930235", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2, false, false, false126 "73156dfc1dc45924349b5b79f8debcac13d7231d", 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 "b685b0df0c37c5046c33169d93e0c615aa9c0ddb", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4, false, false, false134 "b5f42875a550551d81e460017d2691d3c104cf2f", 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 strategy136 // 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 "46786f8d07639dd19948300019328ee2f6572dcc", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false139 "c384a0dafc46573d02a38d8323304c5e1309d9d0", 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 "deadc7aa27e51c69ee8192352a2657fc66e50181", SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false143 "637d50652f9bb8750359c4b418f30a039908d56d", 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 "6956e9b4dcbbf3cea834c681e4859d0c158a9eef", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false147 "77a140c6bd80a6479ee13aecd2a8dac0a17cf03d", 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 "0885042733e1ff0370ccc19daa29678b0c8a3495", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac160 "a0c97ec484e8a8cca8868c893e38a5a7312a70a8", 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",

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