| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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, and GLES2. | 7 // - RenderingHelper is charged with interacting with X11, EGL, and GLES2. |
| 8 // - ClientState is an enum for the state of the decode client used by the test. | 8 // - ClientState is an enum for the state of the decode client used by the test. |
| 9 // - ClientStateNotification is a barrier abstraction that allows the test code | 9 // - ClientStateNotification is a barrier abstraction that allows the test code |
| 10 // to be written sequentially and wait for the decode client to see certain | 10 // to be written sequentially and wait for the decode client to see certain |
| (...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 558 SetState(CS_DECODER_SET); | 558 SetState(CS_DECODER_SET); |
| 559 if (decoder_deleted()) | 559 if (decoder_deleted()) |
| 560 return; | 560 return; |
| 561 | 561 |
| 562 // Configure the decoder. | 562 // Configure the decoder. |
| 563 int32 config_array[] = { | 563 int32 config_array[] = { |
| 564 media::VIDEOATTRIBUTEKEY_BITSTREAMFORMAT_FOURCC, | 564 media::VIDEOATTRIBUTEKEY_BITSTREAMFORMAT_FOURCC, |
| 565 media::VIDEOCODECFOURCC_H264, | 565 media::VIDEOCODECFOURCC_H264, |
| 566 media::VIDEOATTRIBUTEKEY_VIDEOCOLORFORMAT, media::VIDEOCOLORFORMAT_RGBA, | 566 media::VIDEOATTRIBUTEKEY_VIDEOCOLORFORMAT, media::VIDEOCOLORFORMAT_RGBA, |
| 567 }; | 567 }; |
| 568 std::vector<uint32> config( | 568 std::vector<int32> config( |
| 569 config_array, config_array + arraysize(config_array)); | 569 config_array, config_array + arraysize(config_array)); |
| 570 CHECK(decoder_->Initialize(config)); | 570 CHECK(decoder_->Initialize(config)); |
| 571 } | 571 } |
| 572 | 572 |
| 573 void EglRenderingVDAClient::ProvidePictureBuffers( | 573 void EglRenderingVDAClient::ProvidePictureBuffers( |
| 574 uint32 requested_num_of_buffers, | 574 uint32 requested_num_of_buffers, |
| 575 const gfx::Size& dimensions) { | 575 const gfx::Size& dimensions) { |
| 576 if (decoder_deleted()) | 576 if (decoder_deleted()) |
| 577 return; | 577 return; |
| 578 std::vector<media::PictureBuffer> buffers; | 578 std::vector<media::PictureBuffer> buffers; |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 994 it != switches.end(); ++it) { | 994 it != switches.end(); ++it) { |
| 995 if (it->first == "test_video_data") { | 995 if (it->first == "test_video_data") { |
| 996 test_video_data = it->second.c_str(); | 996 test_video_data = it->second.c_str(); |
| 997 continue; | 997 continue; |
| 998 } | 998 } |
| 999 LOG(FATAL) << "Unexpected switch: " << it->first << ":" << it->second; | 999 LOG(FATAL) << "Unexpected switch: " << it->first << ":" << it->second; |
| 1000 } | 1000 } |
| 1001 | 1001 |
| 1002 return RUN_ALL_TESTS(); | 1002 return RUN_ALL_TESTS(); |
| 1003 } | 1003 } |
| OLD | NEW |