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

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

Issue 7867051: Introduce AudioDecoderConfig to migrate away from GetAVStream(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: samples_per_second Created 9 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
« no previous file with comments | « media/filters/dummy_demuxer.h ('k') | media/filters/ffmpeg_audio_decoder.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() {
22 CHECK_EQ(type_, AUDIO);
23 return audio_config_;
24 }
25
21 void DummyDemuxerStream::Read(const ReadCallback& read_callback) {} 26 void DummyDemuxerStream::Read(const ReadCallback& read_callback) {}
22 27
23 void DummyDemuxerStream::EnableBitstreamConverter() {} 28 void DummyDemuxerStream::EnableBitstreamConverter() {}
24 29
25 DummyDemuxer::DummyDemuxer(bool has_video, bool has_audio) 30 DummyDemuxer::DummyDemuxer(bool has_video, bool has_audio)
26 : has_video_(has_video), 31 : has_video_(has_video),
27 has_audio_(has_audio) { 32 has_audio_(has_audio) {
28 streams_.resize(DemuxerStream::NUM_TYPES); 33 streams_.resize(DemuxerStream::NUM_TYPES);
29 if (has_audio) 34 if (has_audio)
30 streams_[DemuxerStream::AUDIO] = 35 streams_[DemuxerStream::AUDIO] =
31 new DummyDemuxerStream(DemuxerStream::AUDIO); 36 new DummyDemuxerStream(DemuxerStream::AUDIO);
32 if (has_video) 37 if (has_video)
33 streams_[DemuxerStream::VIDEO] = 38 streams_[DemuxerStream::VIDEO] =
34 new DummyDemuxerStream(DemuxerStream::VIDEO); 39 new DummyDemuxerStream(DemuxerStream::VIDEO);
35 } 40 }
36 41
37 DummyDemuxer::~DummyDemuxer() {} 42 DummyDemuxer::~DummyDemuxer() {}
38 43
39 void DummyDemuxer::SetPreload(Preload preload) {} 44 void DummyDemuxer::SetPreload(Preload preload) {}
40 45
41 scoped_refptr<DemuxerStream> DummyDemuxer::GetStream(DemuxerStream::Type type) { 46 scoped_refptr<DemuxerStream> DummyDemuxer::GetStream(DemuxerStream::Type type) {
42 return streams_[type]; 47 return streams_[type];
43 } 48 }
44 49
45 base::TimeDelta DummyDemuxer::GetStartTime() const { 50 base::TimeDelta DummyDemuxer::GetStartTime() const {
46 return base::TimeDelta(); 51 return base::TimeDelta();
47 } 52 }
48 53
49 } // namespace media 54 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/dummy_demuxer.h ('k') | media/filters/ffmpeg_audio_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698