Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Side by Side Diff: content/common/gpu/media/android_video_decode_accelerator_unittest.cc

Issue 1313913003: Begin refactor of AVDA to support zero-copy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed unit test. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
11 #include "content/common/gpu/media/android_copying_backing_strategy.h"
11 #include "content/common/gpu/media/android_video_decode_accelerator.h" 12 #include "content/common/gpu/media/android_video_decode_accelerator.h"
12 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" 13 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
13 #include "media/base/android/media_codec_bridge.h" 14 #include "media/base/android/media_codec_bridge.h"
14 #include "media/base/android/media_jni_registrar.h" 15 #include "media/base/android/media_jni_registrar.h"
15 #include "media/video/picture.h" 16 #include "media/video/picture.h"
16 #include "media/video/video_decode_accelerator.h" 17 #include "media/video/video_decode_accelerator.h"
17 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
18 #include "ui/gl/android/surface_texture.h" 19 #include "ui/gl/android/surface_texture.h"
19 20
20 namespace { 21 namespace {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 void SetUp() override { 57 void SetUp() override {
57 JNIEnv* env = base::android::AttachCurrentThread(); 58 JNIEnv* env = base::android::AttachCurrentThread();
58 media::RegisterJni(env); 59 media::RegisterJni(env);
59 // TODO(felipeg): fix GL bindings, so that the decoder can perform GL 60 // TODO(felipeg): fix GL bindings, so that the decoder can perform GL
60 // calls. 61 // calls.
61 scoped_ptr<gpu::gles2::MockGLES2Decoder> decoder( 62 scoped_ptr<gpu::gles2::MockGLES2Decoder> decoder(
62 new gpu::gles2::MockGLES2Decoder()); 63 new gpu::gles2::MockGLES2Decoder());
63 scoped_ptr<MockVideoDecodeAcceleratorClient> client( 64 scoped_ptr<MockVideoDecodeAcceleratorClient> client(
64 new MockVideoDecodeAcceleratorClient()); 65 new MockVideoDecodeAcceleratorClient());
65 accelerator_.reset(new AndroidVideoDecodeAccelerator( 66 accelerator_.reset(new AndroidVideoDecodeAccelerator(
66 decoder->AsWeakPtr(), base::Bind(&MockMakeContextCurrent))); 67 decoder->AsWeakPtr(), base::Bind(&MockMakeContextCurrent),
68 scoped_ptr<AndroidVideoDecodeAccelerator::BackingStrategy>(
69 new AndroidCopyingBackingStrategy())));
watk 2015/09/09 00:36:01 You can use make_scoped_ptr() to make this less no
67 } 70 }
68 71
69 bool Configure(media::VideoCodec codec) { 72 bool Configure(media::VideoCodec codec) {
70 AndroidVideoDecodeAccelerator* accelerator = 73 AndroidVideoDecodeAccelerator* accelerator =
71 static_cast<AndroidVideoDecodeAccelerator*>(accelerator_.get()); 74 static_cast<AndroidVideoDecodeAccelerator*>(accelerator_.get());
72 accelerator->surface_texture_ = gfx::SurfaceTexture::Create(0); 75 accelerator->surface_texture_ = gfx::SurfaceTexture::Create(0);
73 accelerator->codec_ = codec; 76 accelerator->codec_ = codec;
74 return accelerator->ConfigureMediaCodec(); 77 return accelerator->ConfigureMediaCodec();
75 } 78 }
76 79
(...skipping 10 matching lines...) Expand all
87 return; 90 return;
88 EXPECT_TRUE(Configure(media::kCodecVP8)); 91 EXPECT_TRUE(Configure(media::kCodecVP8));
89 } 92 }
90 93
91 } // namespace content 94 } // namespace content
92 95
93 int main(int argc, char **argv) { 96 int main(int argc, char **argv) {
94 testing::InitGoogleTest(&argc, argv); 97 testing::InitGoogleTest(&argc, argv);
95 return RUN_ALL_TESTS(); 98 return RUN_ALL_TESTS();
96 } 99 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698