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 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
503 } | 503 } |
504 return decoder.Pass(); | 504 return decoder.Pass(); |
505 } | 505 } |
506 | 506 |
507 scoped_ptr<media::VideoDecodeAccelerator> | 507 scoped_ptr<media::VideoDecodeAccelerator> |
508 GLRenderingVDAClient::CreateDXVAVDA() { | 508 GLRenderingVDAClient::CreateDXVAVDA() { |
509 scoped_ptr<media::VideoDecodeAccelerator> decoder; | 509 scoped_ptr<media::VideoDecodeAccelerator> decoder; |
510 #if defined(OS_WIN) | 510 #if defined(OS_WIN) |
511 if (base::win::GetVersion() >= base::win::VERSION_WIN7) | 511 if (base::win::GetVersion() >= base::win::VERSION_WIN7) |
512 decoder.reset( | 512 decoder.reset( |
513 new DXVAVideoDecodeAccelerator(base::Bind(&DoNothingReturnTrue))); | 513 new DXVAVideoDecodeAccelerator( |
| 514 base::Bind(&DoNothingReturnTrue), |
| 515 rendering_helper_->GetGLContext().get())); |
514 #endif | 516 #endif |
515 return decoder.Pass(); | 517 return decoder.Pass(); |
516 } | 518 } |
517 | 519 |
518 scoped_ptr<media::VideoDecodeAccelerator> | 520 scoped_ptr<media::VideoDecodeAccelerator> |
519 GLRenderingVDAClient::CreateV4L2VDA() { | 521 GLRenderingVDAClient::CreateV4L2VDA() { |
520 scoped_ptr<media::VideoDecodeAccelerator> decoder; | 522 scoped_ptr<media::VideoDecodeAccelerator> decoder; |
521 #if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC) | 523 #if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC) |
522 scoped_refptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kDecoder); | 524 scoped_refptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kDecoder); |
523 if (device.get()) { | 525 if (device.get()) { |
(...skipping 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1628 ui::OzonePlatform::InitializeForUI(); | 1630 ui::OzonePlatform::InitializeForUI(); |
1629 #endif | 1631 #endif |
1630 | 1632 |
1631 content::g_env = | 1633 content::g_env = |
1632 reinterpret_cast<content::VideoDecodeAcceleratorTestEnvironment*>( | 1634 reinterpret_cast<content::VideoDecodeAcceleratorTestEnvironment*>( |
1633 testing::AddGlobalTestEnvironment( | 1635 testing::AddGlobalTestEnvironment( |
1634 new content::VideoDecodeAcceleratorTestEnvironment())); | 1636 new content::VideoDecodeAcceleratorTestEnvironment())); |
1635 | 1637 |
1636 return RUN_ALL_TESTS(); | 1638 return RUN_ALL_TESTS(); |
1637 } | 1639 } |
OLD | NEW |