| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 // | 4 // |
| 5 // The bulk of this file is support code; sorry about that. Here's an overview | 5 // The bulk of this file is support code; sorry about that. Here's an overview |
| 6 // to hopefully help readers of this code: | 6 // to hopefully help readers of this code: |
| 7 // - RenderingHelper is charged with interacting with X11/{EGL/GLES2,GLX/GL} or | 7 // - RenderingHelper is charged with interacting with X11/{EGL/GLES2,GLX/GL} or |
| 8 // Win/EGL. | 8 // Win/EGL. |
| 9 // - ClientState is an enum for the state of the decode client used by the test. | 9 // - ClientState is an enum for the state of the decode client used by the test. |
| 10 // - ClientStateNotification is a barrier abstraction that allows the test code | 10 // - ClientStateNotification is a barrier abstraction that allows the test code |
| (...skipping 1251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1262 EXPECT_GE(client->num_decoded_frames(), video_file->num_frames); | 1262 EXPECT_GE(client->num_decoded_frames(), video_file->num_frames); |
| 1263 else | 1263 else |
| 1264 EXPECT_EQ(client->num_decoded_frames(), video_file->num_frames); | 1264 EXPECT_EQ(client->num_decoded_frames(), video_file->num_frames); |
| 1265 } | 1265 } |
| 1266 if (reset_point == END_OF_STREAM_RESET) { | 1266 if (reset_point == END_OF_STREAM_RESET) { |
| 1267 EXPECT_EQ(video_file->num_fragments, client->num_skipped_fragments() + | 1267 EXPECT_EQ(video_file->num_fragments, client->num_skipped_fragments() + |
| 1268 client->num_queued_fragments()); | 1268 client->num_queued_fragments()); |
| 1269 EXPECT_EQ(client->num_done_bitstream_buffers(), | 1269 EXPECT_EQ(client->num_done_bitstream_buffers(), |
| 1270 client->num_queued_fragments()); | 1270 client->num_queued_fragments()); |
| 1271 } | 1271 } |
| 1272 LOG(INFO) << "Decoder " << i << " fps: " << client->frames_per_second(); | 1272 VLOG(0) << "Decoder " << i << " fps: " << client->frames_per_second(); |
| 1273 if (!render_as_thumbnails) { | 1273 if (!render_as_thumbnails) { |
| 1274 int min_fps = suppress_rendering ? | 1274 int min_fps = suppress_rendering ? |
| 1275 video_file->min_fps_no_render : video_file->min_fps_render; | 1275 video_file->min_fps_no_render : video_file->min_fps_render; |
| 1276 if (min_fps > 0 && !test_reuse_delay) | 1276 if (min_fps > 0 && !test_reuse_delay) |
| 1277 EXPECT_GT(client->frames_per_second(), min_fps); | 1277 EXPECT_GT(client->frames_per_second(), min_fps); |
| 1278 } | 1278 } |
| 1279 } | 1279 } |
| 1280 | 1280 |
| 1281 if (render_as_thumbnails) { | 1281 if (render_as_thumbnails) { |
| 1282 std::vector<unsigned char> rgb; | 1282 std::vector<unsigned char> rgb; |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1449 g_rendering_fps, | 1449 g_rendering_fps, |
| 1450 true, | 1450 true, |
| 1451 std::numeric_limits<int>::max(), | 1451 std::numeric_limits<int>::max(), |
| 1452 kWebRtcDecodeCallsPerSecond); | 1452 kWebRtcDecodeCallsPerSecond); |
| 1453 CreateAndStartDecoder(client, note); | 1453 CreateAndStartDecoder(client, note); |
| 1454 WaitUntilDecodeFinish(note); | 1454 WaitUntilDecodeFinish(note); |
| 1455 | 1455 |
| 1456 int decode_time_median = client->decode_time_median(); | 1456 int decode_time_median = client->decode_time_median(); |
| 1457 std::string output_string = | 1457 std::string output_string = |
| 1458 base::StringPrintf("Decode time median: %d ms", decode_time_median); | 1458 base::StringPrintf("Decode time median: %d ms", decode_time_median); |
| 1459 LOG(INFO) << output_string; | 1459 VLOG(0) << output_string; |
| 1460 ASSERT_GT(decode_time_median, 0); | 1460 ASSERT_GT(decode_time_median, 0); |
| 1461 | 1461 |
| 1462 if (g_output_log != NULL) | 1462 if (g_output_log != NULL) |
| 1463 OutputLogFile(g_output_log, output_string); | 1463 OutputLogFile(g_output_log, output_string); |
| 1464 | 1464 |
| 1465 rendering_loop_proxy_->DeleteSoon(FROM_HERE, client); | 1465 rendering_loop_proxy_->DeleteSoon(FROM_HERE, client); |
| 1466 rendering_loop_proxy_->DeleteSoon(FROM_HERE, note); | 1466 rendering_loop_proxy_->DeleteSoon(FROM_HERE, note); |
| 1467 WaitUntilIdle(); | 1467 WaitUntilIdle(); |
| 1468 }; | 1468 }; |
| 1469 | 1469 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1516 } | 1516 } |
| 1517 if (it->first == "v" || it->first == "vmodule") | 1517 if (it->first == "v" || it->first == "vmodule") |
| 1518 continue; | 1518 continue; |
| 1519 LOG(FATAL) << "Unexpected switch: " << it->first << ":" << it->second; | 1519 LOG(FATAL) << "Unexpected switch: " << it->first << ":" << it->second; |
| 1520 } | 1520 } |
| 1521 | 1521 |
| 1522 base::ShadowingAtExitManager at_exit_manager; | 1522 base::ShadowingAtExitManager at_exit_manager; |
| 1523 | 1523 |
| 1524 return RUN_ALL_TESTS(); | 1524 return RUN_ALL_TESTS(); |
| 1525 } | 1525 } |
| OLD | NEW |