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

Side by Side Diff: media/base/mock_filters.cc

Issue 11148011: Move audio decoder initialization to AudioRendererImpl. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: nits Created 8 years, 2 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/base/mock_filters.h ('k') | media/base/pipeline.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/base/mock_filters.h" 5 #include "media/base/mock_filters.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 9
10 using ::testing::_; 10 using ::testing::_;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 video_renderer_(new MockVideoRenderer()), 78 video_renderer_(new MockVideoRenderer()),
79 audio_renderer_(new MockAudioRenderer()) { 79 audio_renderer_(new MockAudioRenderer()) {
80 } 80 }
81 81
82 MockFilterCollection::~MockFilterCollection() {} 82 MockFilterCollection::~MockFilterCollection() {}
83 83
84 scoped_ptr<FilterCollection> MockFilterCollection::Create() { 84 scoped_ptr<FilterCollection> MockFilterCollection::Create() {
85 scoped_ptr<FilterCollection> collection(new FilterCollection()); 85 scoped_ptr<FilterCollection> collection(new FilterCollection());
86 collection->SetDemuxer(demuxer_); 86 collection->SetDemuxer(demuxer_);
87 collection->GetVideoDecoders()->push_back(video_decoder_); 87 collection->GetVideoDecoders()->push_back(video_decoder_);
88 collection->AddAudioDecoder(audio_decoder_); 88 collection->GetAudioDecoders()->push_back(audio_decoder_);
89 collection->AddVideoRenderer(video_renderer_); 89 collection->AddVideoRenderer(video_renderer_);
90 collection->AddAudioRenderer(audio_renderer_); 90 collection->AddAudioRenderer(audio_renderer_);
91 return collection.Pass(); 91 return collection.Pass();
92 } 92 }
93 93
94 MockStatisticsCB::MockStatisticsCB() {} 94 MockStatisticsCB::MockStatisticsCB() {}
95 95
96 MockStatisticsCB::~MockStatisticsCB() {} 96 MockStatisticsCB::~MockStatisticsCB() {}
97 97
98 } // namespace media 98 } // namespace media
OLDNEW
« no previous file with comments | « media/base/mock_filters.h ('k') | media/base/pipeline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698