| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 #include "content/common/gpu/media/android_video_decode_accelerator.h" | 5 #include "content/common/gpu/media/android_video_decode_accelerator.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 | 63 |
| 64 // Start message loop because | 64 // Start message loop because |
| 65 // AndroidVideoDecodeAccelerator::ConfigureMediaCodec() starts a timer task. | 65 // AndroidVideoDecodeAccelerator::ConfigureMediaCodec() starts a timer task. |
| 66 message_loop_.reset(new base::MessageLoop()); | 66 message_loop_.reset(new base::MessageLoop()); |
| 67 | 67 |
| 68 scoped_ptr<gpu::gles2::MockGLES2Decoder> decoder( | 68 scoped_ptr<gpu::gles2::MockGLES2Decoder> decoder( |
| 69 new gpu::gles2::MockGLES2Decoder()); | 69 new gpu::gles2::MockGLES2Decoder()); |
| 70 scoped_ptr<MockVideoDecodeAcceleratorClient> client( | 70 scoped_ptr<MockVideoDecodeAcceleratorClient> client( |
| 71 new MockVideoDecodeAcceleratorClient()); | 71 new MockVideoDecodeAcceleratorClient()); |
| 72 accelerator_.reset(new AndroidVideoDecodeAccelerator( | 72 accelerator_.reset(new AndroidVideoDecodeAccelerator( |
| 73 decoder->AsWeakPtr(), base::Bind(&MockMakeContextCurrent), | 73 decoder->AsWeakPtr(), base::Bind(&MockMakeContextCurrent))); |
| 74 make_scoped_ptr(new AndroidCopyingBackingStrategy()))); | |
| 75 } | 74 } |
| 76 | 75 |
| 77 bool Configure(media::VideoCodec codec) { | 76 bool Configure(media::VideoCodec codec) { |
| 78 AndroidVideoDecodeAccelerator* accelerator = | 77 AndroidVideoDecodeAccelerator* accelerator = |
| 79 static_cast<AndroidVideoDecodeAccelerator*>(accelerator_.get()); | 78 static_cast<AndroidVideoDecodeAccelerator*>(accelerator_.get()); |
| 80 accelerator->surface_texture_ = gfx::SurfaceTexture::Create(0); | 79 accelerator->surface_texture_ = gfx::SurfaceTexture::Create(0); |
| 81 accelerator->codec_ = codec; | 80 accelerator->codec_ = codec; |
| 82 return accelerator->ConfigureMediaCodec(); | 81 return accelerator->ConfigureMediaCodec(); |
| 83 } | 82 } |
| 84 | 83 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 96 return; | 95 return; |
| 97 EXPECT_TRUE(Configure(media::kCodecVP8)); | 96 EXPECT_TRUE(Configure(media::kCodecVP8)); |
| 98 } | 97 } |
| 99 | 98 |
| 100 } // namespace content | 99 } // namespace content |
| 101 | 100 |
| 102 int main(int argc, char **argv) { | 101 int main(int argc, char **argv) { |
| 103 testing::InitGoogleTest(&argc, argv); | 102 testing::InitGoogleTest(&argc, argv); |
| 104 return RUN_ALL_TESTS(); | 103 return RUN_ALL_TESTS(); |
| 105 } | 104 } |
| OLD | NEW |