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

Side by Side Diff: chromecast/media/cma/base/buffering_frame_provider_unittest.cc

Issue 1553503002: Convert Pass()→std::move() in //chromecast (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chromecast/media/cma/base/buffering_frame_provider.h"
6
5 #include <stddef.h> 7 #include <stddef.h>
6
7 #include <list> 8 #include <list>
9 #include <utility>
8 #include <vector> 10 #include <vector>
9 11
10 #include "base/bind.h" 12 #include "base/bind.h"
11 #include "base/macros.h" 13 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
14 #include "base/threading/thread.h" 16 #include "base/threading/thread.h"
15 #include "base/time/time.h" 17 #include "base/time/time.h"
16 #include "chromecast/media/cma/base/buffering_frame_provider.h"
17 #include "chromecast/media/cma/test/frame_generator_for_test.h" 18 #include "chromecast/media/cma/test/frame_generator_for_test.h"
18 #include "chromecast/media/cma/test/mock_frame_consumer.h" 19 #include "chromecast/media/cma/test/mock_frame_consumer.h"
19 #include "chromecast/media/cma/test/mock_frame_provider.h" 20 #include "chromecast/media/cma/test/mock_frame_provider.h"
20 #include "chromecast/public/media/cast_decoder_buffer.h" 21 #include "chromecast/public/media/cast_decoder_buffer.h"
21 #include "media/base/audio_decoder_config.h" 22 #include "media/base/audio_decoder_config.h"
22 #include "media/base/decoder_buffer.h" 23 #include "media/base/decoder_buffer.h"
23 #include "media/base/video_decoder_config.h" 24 #include "media/base/video_decoder_config.h"
24 #include "testing/gtest/include/gtest/gtest.h" 25 #include "testing/gtest/include/gtest/gtest.h"
25 26
26 namespace chromecast { 27 namespace chromecast {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 } 74 }
74 frame_specs[frame_specs.size() - 1].is_eos = true; 75 frame_specs[frame_specs.size() - 1].is_eos = true;
75 76
76 scoped_ptr<FrameGeneratorForTest> frame_generator_provider( 77 scoped_ptr<FrameGeneratorForTest> frame_generator_provider(
77 new FrameGeneratorForTest(frame_specs)); 78 new FrameGeneratorForTest(frame_specs));
78 scoped_ptr<FrameGeneratorForTest> frame_generator_consumer( 79 scoped_ptr<FrameGeneratorForTest> frame_generator_consumer(
79 new FrameGeneratorForTest(frame_specs)); 80 new FrameGeneratorForTest(frame_specs));
80 81
81 scoped_ptr<MockFrameProvider> frame_provider(new MockFrameProvider()); 82 scoped_ptr<MockFrameProvider> frame_provider(new MockFrameProvider());
82 frame_provider->Configure(provider_delayed_pattern, 83 frame_provider->Configure(provider_delayed_pattern,
83 frame_generator_provider.Pass()); 84 std::move(frame_generator_provider));
84 85
85 size_t max_frame_size = 10 * 1024; 86 size_t max_frame_size = 10 * 1024;
86 size_t buffer_size = 10 * max_frame_size; 87 size_t buffer_size = 10 * max_frame_size;
87 buffering_frame_provider_.reset( 88 buffering_frame_provider_.reset(
88 new BufferingFrameProvider( 89 new BufferingFrameProvider(
89 scoped_ptr<CodedFrameProvider>(frame_provider.release()), 90 scoped_ptr<CodedFrameProvider>(frame_provider.release()),
90 buffer_size, 91 buffer_size,
91 max_frame_size, 92 max_frame_size,
92 BufferingFrameProvider::FrameBufferedCB())); 93 BufferingFrameProvider::FrameBufferedCB()));
93 94
94 frame_consumer_.reset( 95 frame_consumer_.reset(
95 new MockFrameConsumer(buffering_frame_provider_.get())); 96 new MockFrameConsumer(buffering_frame_provider_.get()));
96 frame_consumer_->Configure( 97 frame_consumer_->Configure(consumer_delayed_pattern, false,
97 consumer_delayed_pattern, 98 std::move(frame_generator_consumer));
98 false,
99 frame_generator_consumer.Pass());
100 } 99 }
101 100
102 void BufferingFrameProviderTest::Start() { 101 void BufferingFrameProviderTest::Start() {
103 frame_consumer_->Start( 102 frame_consumer_->Start(
104 base::Bind(&BufferingFrameProviderTest::OnTestCompleted, 103 base::Bind(&BufferingFrameProviderTest::OnTestCompleted,
105 base::Unretained(this))); 104 base::Unretained(this)));
106 } 105 }
107 106
108 void BufferingFrameProviderTest::OnTestTimeout() { 107 void BufferingFrameProviderTest::OnTestTimeout() {
109 ADD_FAILURE() << "Test timed out"; 108 ADD_FAILURE() << "Test timed out";
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 179
181 scoped_ptr<base::MessageLoop> message_loop(new base::MessageLoop()); 180 scoped_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
182 message_loop->PostTask( 181 message_loop->PostTask(
183 FROM_HERE, 182 FROM_HERE,
184 base::Bind(&BufferingFrameProviderTest::Start, base::Unretained(this))); 183 base::Bind(&BufferingFrameProviderTest::Start, base::Unretained(this)));
185 message_loop->Run(); 184 message_loop->Run();
186 }; 185 };
187 186
188 } // namespace media 187 } // namespace media
189 } // namespace chromecast 188 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/media/cma/base/buffering_frame_provider.cc ('k') | chromecast/media/cma/base/decoder_buffer_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698