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

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

Issue 12262058: Revert r180578, r180591, and r180604 from 1410 branch. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/
Patch Set: Created 7 years, 10 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
« no previous file with comments | « media/base/filter_collection.h ('k') | media/base/filter_collection_unittest.cc » ('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/filter_collection.h" 5 #include "media/base/filter_collection.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/base/audio_decoder.h" 8 #include "media/base/audio_decoder.h"
9 #include "media/base/audio_renderer.h" 9 #include "media/base/audio_renderer.h"
10 #include "media/base/demuxer.h" 10 #include "media/base/demuxer.h"
11 #include "media/base/video_decoder.h" 11 #include "media/base/video_decoder.h"
12 #include "media/base/video_renderer.h" 12 #include "media/base/video_renderer.h"
13 13
14 namespace media { 14 namespace media {
15 15
16 FilterCollection::FilterCollection() {} 16 FilterCollection::FilterCollection() {}
17 17
18 FilterCollection::~FilterCollection() {} 18 FilterCollection::~FilterCollection() {}
19 19
20 void FilterCollection::SetDemuxer(const scoped_refptr<Demuxer>& demuxer) { 20 void FilterCollection::SetDemuxer(const scoped_refptr<Demuxer>& demuxer) {
21 demuxer_ = demuxer; 21 demuxer_ = demuxer;
22 } 22 }
23 23
24 const scoped_refptr<Demuxer>& FilterCollection::GetDemuxer() { 24 const scoped_refptr<Demuxer>& FilterCollection::GetDemuxer() {
25 return demuxer_; 25 return demuxer_;
26 } 26 }
27 27
28 void FilterCollection::SetAudioRenderer( 28 void FilterCollection::AddAudioRenderer(AudioRenderer* audio_renderer) {
29 scoped_ptr<AudioRenderer> audio_renderer) { 29 audio_renderers_.push_back(audio_renderer);
30 audio_renderer_ = audio_renderer.Pass();
31 } 30 }
32 31
33 scoped_ptr<AudioRenderer> FilterCollection::GetAudioRenderer() { 32 void FilterCollection::AddVideoRenderer(VideoRenderer* video_renderer) {
34 return audio_renderer_.Pass(); 33 video_renderers_.push_back(video_renderer);
35 }
36
37 void FilterCollection::SetVideoRenderer(
38 scoped_ptr<VideoRenderer> video_renderer) {
39 video_renderer_ = video_renderer.Pass();
40 }
41
42 scoped_ptr<VideoRenderer> FilterCollection::GetVideoRenderer() {
43 return video_renderer_.Pass();
44 } 34 }
45 35
46 void FilterCollection::Clear() { 36 void FilterCollection::Clear() {
47 audio_decoders_.clear(); 37 audio_decoders_.clear();
48 video_decoders_.clear(); 38 video_decoders_.clear();
49 audio_renderer_.reset(); 39 audio_renderers_.clear();
50 video_renderer_.reset(); 40 video_renderers_.clear();
41 }
42
43 void FilterCollection::SelectAudioRenderer(scoped_refptr<AudioRenderer>* out) {
44 if (audio_renderers_.empty()) {
45 *out = NULL;
46 return;
47 }
48 *out = audio_renderers_.front();
49 audio_renderers_.pop_front();
50 }
51
52 void FilterCollection::SelectVideoRenderer(scoped_refptr<VideoRenderer>* out) {
53 if (video_renderers_.empty()) {
54 *out = NULL;
55 return;
56 }
57 *out = video_renderers_.front();
58 video_renderers_.pop_front();
51 } 59 }
52 60
53 FilterCollection::AudioDecoderList* FilterCollection::GetAudioDecoders() { 61 FilterCollection::AudioDecoderList* FilterCollection::GetAudioDecoders() {
54 return &audio_decoders_; 62 return &audio_decoders_;
55 } 63 }
56 64
57 FilterCollection::VideoDecoderList* FilterCollection::GetVideoDecoders() { 65 FilterCollection::VideoDecoderList* FilterCollection::GetVideoDecoders() {
58 return &video_decoders_; 66 return &video_decoders_;
59 } 67 }
60 68
61 } // namespace media 69 } // namespace media
OLDNEW
« no previous file with comments | « media/base/filter_collection.h ('k') | media/base/filter_collection_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698