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

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

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 6 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
« no previous file with comments | « media/gpu/android_video_decode_accelerator.cc ('k') | media/gpu/avda_codec_image.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "media/gpu/android_video_decode_accelerator.h" 5 #include "media/gpu/android_video_decode_accelerator.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 std::unique_ptr<MockVideoDecodeAcceleratorClient> client( 74 std::unique_ptr<MockVideoDecodeAcceleratorClient> client(
75 new MockVideoDecodeAcceleratorClient()); 75 new MockVideoDecodeAcceleratorClient());
76 accelerator_.reset(new AndroidVideoDecodeAccelerator( 76 accelerator_.reset(new AndroidVideoDecodeAccelerator(
77 base::Bind(&MockMakeContextCurrent), 77 base::Bind(&MockMakeContextCurrent),
78 base::Bind(&MockGetGLES2Decoder, decoder->AsWeakPtr()))); 78 base::Bind(&MockGetGLES2Decoder, decoder->AsWeakPtr())));
79 } 79 }
80 80
81 bool Configure(media::VideoCodec codec) { 81 bool Configure(media::VideoCodec codec) {
82 AndroidVideoDecodeAccelerator* accelerator = 82 AndroidVideoDecodeAccelerator* accelerator =
83 static_cast<AndroidVideoDecodeAccelerator*>(accelerator_.get()); 83 static_cast<AndroidVideoDecodeAccelerator*>(accelerator_.get());
84 scoped_refptr<gfx::SurfaceTexture> surface_texture = 84 scoped_refptr<gl::SurfaceTexture> surface_texture =
85 gfx::SurfaceTexture::Create(0); 85 gl::SurfaceTexture::Create(0);
86 accelerator->codec_config_->surface_ = 86 accelerator->codec_config_->surface_ =
87 gfx::ScopedJavaSurface(surface_texture.get()); 87 gl::ScopedJavaSurface(surface_texture.get());
88 accelerator->codec_config_->codec_ = codec; 88 accelerator->codec_config_->codec_ = codec;
89 return accelerator->ConfigureMediaCodecSynchronously(); 89 return accelerator->ConfigureMediaCodecSynchronously();
90 } 90 }
91 91
92 private: 92 private:
93 std::unique_ptr<media::VideoDecodeAccelerator> accelerator_; 93 std::unique_ptr<media::VideoDecodeAccelerator> accelerator_;
94 std::unique_ptr<base::MessageLoop> message_loop_; 94 std::unique_ptr<base::MessageLoop> message_loop_;
95 }; 95 };
96 96
97 TEST_F(AndroidVideoDecodeAcceleratorTest, ConfigureUnsupportedCodec) { 97 TEST_F(AndroidVideoDecodeAcceleratorTest, ConfigureUnsupportedCodec) {
98 EXPECT_FALSE(Configure(media::kUnknownVideoCodec)); 98 EXPECT_FALSE(Configure(media::kUnknownVideoCodec));
99 } 99 }
100 100
101 TEST_F(AndroidVideoDecodeAcceleratorTest, ConfigureSupportedCodec) { 101 TEST_F(AndroidVideoDecodeAcceleratorTest, ConfigureSupportedCodec) {
102 if (!media::MediaCodecUtil::IsMediaCodecAvailable()) 102 if (!media::MediaCodecUtil::IsMediaCodecAvailable())
103 return; 103 return;
104 EXPECT_TRUE(Configure(media::kCodecVP8)); 104 EXPECT_TRUE(Configure(media::kCodecVP8));
105 } 105 }
106 106
107 } // namespace media 107 } // namespace media
108 108
109 int main(int argc, char** argv) { 109 int main(int argc, char** argv) {
110 testing::InitGoogleTest(&argc, argv); 110 testing::InitGoogleTest(&argc, argv);
111 return RUN_ALL_TESTS(); 111 return RUN_ALL_TESTS();
112 } 112 }
OLDNEW
« no previous file with comments | « media/gpu/android_video_decode_accelerator.cc ('k') | media/gpu/avda_codec_image.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698