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

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

Issue 10918022: Move AudioDecoder initialization into AudioRenderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 audio_decoder_(new MockAudioDecoder()), 70 audio_decoder_(new MockAudioDecoder()),
71 video_renderer_(new MockVideoRenderer()), 71 video_renderer_(new MockVideoRenderer()),
72 audio_renderer_(new MockAudioRenderer()) { 72 audio_renderer_(new MockAudioRenderer()) {
73 } 73 }
74 74
75 MockFilterCollection::~MockFilterCollection() {} 75 MockFilterCollection::~MockFilterCollection() {}
76 76
77 scoped_ptr<FilterCollection> MockFilterCollection::Create() { 77 scoped_ptr<FilterCollection> MockFilterCollection::Create() {
78 scoped_ptr<FilterCollection> collection(new FilterCollection()); 78 scoped_ptr<FilterCollection> collection(new FilterCollection());
79 collection->SetDemuxer(demuxer_); 79 collection->SetDemuxer(demuxer_);
80 collection->GetAudioDecoders()->push_back(audio_decoder_);
80 collection->GetVideoDecoders()->push_back(video_decoder_); 81 collection->GetVideoDecoders()->push_back(video_decoder_);
81 collection->AddAudioDecoder(audio_decoder_);
82 collection->AddVideoRenderer(video_renderer_); 82 collection->AddVideoRenderer(video_renderer_);
83 collection->AddAudioRenderer(audio_renderer_); 83 collection->AddAudioRenderer(audio_renderer_);
84 return collection.Pass(); 84 return collection.Pass();
85 } 85 }
86 86
87 MockStatisticsCB::MockStatisticsCB() {} 87 MockStatisticsCB::MockStatisticsCB() {}
88 88
89 MockStatisticsCB::~MockStatisticsCB() {} 89 MockStatisticsCB::~MockStatisticsCB() {}
90 90
91 } // namespace media 91 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698