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

Side by Side Diff: media/filters/dummy_demuxer.cc

Issue 8341033: Remove DemuxerStream::GetAVStream() once and for all. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: now with cmath Created 9 years, 1 month 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/filters/dummy_demuxer.h ('k') | media/filters/ffmpeg_demuxer.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/filters/dummy_demuxer.h" 5 #include "media/filters/dummy_demuxer.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace media { 9 namespace media {
10 10
11 DummyDemuxerStream::DummyDemuxerStream(Type type) 11 DummyDemuxerStream::DummyDemuxerStream(Type type)
12 : type_(type) { 12 : type_(type) {
13 } 13 }
14 14
15 DummyDemuxerStream::~DummyDemuxerStream() {} 15 DummyDemuxerStream::~DummyDemuxerStream() {}
16 16
17 DemuxerStream::Type DummyDemuxerStream::type() { 17 DemuxerStream::Type DummyDemuxerStream::type() {
18 return type_; 18 return type_;
19 } 19 }
20 20
21 const AudioDecoderConfig& DummyDemuxerStream::audio_decoder_config() { 21 const AudioDecoderConfig& DummyDemuxerStream::audio_decoder_config() {
22 CHECK_EQ(type_, AUDIO); 22 CHECK_EQ(type_, AUDIO);
23 return audio_config_; 23 return audio_config_;
24 } 24 }
25 25
26 const VideoDecoderConfig& DummyDemuxerStream::video_decoder_config() {
27 CHECK_EQ(type_, VIDEO);
28 return video_config_;
29 }
30
26 void DummyDemuxerStream::Read(const ReadCallback& read_callback) {} 31 void DummyDemuxerStream::Read(const ReadCallback& read_callback) {}
27 32
28 void DummyDemuxerStream::EnableBitstreamConverter() {} 33 void DummyDemuxerStream::EnableBitstreamConverter() {}
29 34
30 DummyDemuxer::DummyDemuxer(bool has_video, bool has_audio) 35 DummyDemuxer::DummyDemuxer(bool has_video, bool has_audio)
31 : has_video_(has_video), 36 : has_video_(has_video),
32 has_audio_(has_audio) { 37 has_audio_(has_audio) {
33 streams_.resize(DemuxerStream::NUM_TYPES); 38 streams_.resize(DemuxerStream::NUM_TYPES);
34 if (has_audio) 39 if (has_audio)
35 streams_[DemuxerStream::AUDIO] = 40 streams_[DemuxerStream::AUDIO] =
36 new DummyDemuxerStream(DemuxerStream::AUDIO); 41 new DummyDemuxerStream(DemuxerStream::AUDIO);
37 if (has_video) 42 if (has_video)
38 streams_[DemuxerStream::VIDEO] = 43 streams_[DemuxerStream::VIDEO] =
39 new DummyDemuxerStream(DemuxerStream::VIDEO); 44 new DummyDemuxerStream(DemuxerStream::VIDEO);
40 } 45 }
41 46
42 DummyDemuxer::~DummyDemuxer() {} 47 DummyDemuxer::~DummyDemuxer() {}
43 48
44 void DummyDemuxer::SetPreload(Preload preload) {} 49 void DummyDemuxer::SetPreload(Preload preload) {}
45 50
46 scoped_refptr<DemuxerStream> DummyDemuxer::GetStream(DemuxerStream::Type type) { 51 scoped_refptr<DemuxerStream> DummyDemuxer::GetStream(DemuxerStream::Type type) {
47 return streams_[type]; 52 return streams_[type];
48 } 53 }
49 54
50 base::TimeDelta DummyDemuxer::GetStartTime() const { 55 base::TimeDelta DummyDemuxer::GetStartTime() const {
51 return base::TimeDelta(); 56 return base::TimeDelta();
52 } 57 }
53 58
54 } // namespace media 59 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/dummy_demuxer.h ('k') | media/filters/ffmpeg_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698