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

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

Issue 2692863011: Add ContentVideoViewOverlay to AVDA. (Closed)
Patch Set: make DequeueOutput require NO_ERROR from setsurface Created 3 years, 9 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 "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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 } 44 }
45 45
46 base::WeakPtr<gpu::gles2::GLES2Decoder> GetGLES2Decoder( 46 base::WeakPtr<gpu::gles2::GLES2Decoder> GetGLES2Decoder(
47 const base::WeakPtr<gpu::gles2::GLES2Decoder>& decoder) { 47 const base::WeakPtr<gpu::gles2::GLES2Decoder>& decoder) {
48 return decoder; 48 return decoder;
49 } 49 }
50 50
51 ACTION(PostNullCodec) { 51 ACTION(PostNullCodec) {
52 base::ThreadTaskRunnerHandle::Get()->PostTask( 52 base::ThreadTaskRunnerHandle::Get()->PostTask(
53 FROM_HERE, base::Bind(&media::AVDACodecAllocatorClient::OnCodecConfigured, 53 FROM_HERE, base::Bind(&media::AVDACodecAllocatorClient::OnCodecConfigured,
54 arg0, nullptr)); 54 arg0, nullptr, nullptr));
55 } 55 }
56 56
57 } // namespace 57 } // namespace
58 58
59 class MockVDAClient : public VideoDecodeAccelerator::Client { 59 class MockVDAClient : public VideoDecodeAccelerator::Client {
60 public: 60 public:
61 MOCK_METHOD1(NotifyInitializationComplete, void(bool)); 61 MOCK_METHOD1(NotifyInitializationComplete, void(bool));
62 MOCK_METHOD5( 62 MOCK_METHOD5(
63 ProvidePictureBuffers, 63 ProvidePictureBuffers,
64 void(uint32_t, VideoPixelFormat, uint32_t, const gfx::Size&, uint32_t)); 64 void(uint32_t, VideoPixelFormat, uint32_t, const gfx::Size&, uint32_t));
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 EXPECT_CALL(codec_allocator_, CreateMediaCodecAsync(_, _)) 142 EXPECT_CALL(codec_allocator_, CreateMediaCodecAsync(_, _))
143 .WillOnce(PostNullCodec()); 143 .WillOnce(PostNullCodec());
144 144
145 VideoDecodeAccelerator::Config config(H264PROFILE_BASELINE); 145 VideoDecodeAccelerator::Config config(H264PROFILE_BASELINE);
146 config.is_deferred_initialization_allowed = true; 146 config.is_deferred_initialization_allowed = true;
147 vda_->Initialize(config, &client_); 147 vda_->Initialize(config, &client_);
148 base::RunLoop().RunUntilIdle(); 148 base::RunLoop().RunUntilIdle();
149 } 149 }
150 150
151 } // namespace media 151 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698