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

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

Issue 10704142: Merge 143765 - Ensure media's buffered ranges always have a range that includes currentTime. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/
Patch Set: Created 8 years, 5 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_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) 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/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
(...skipping 14 matching lines...) Expand all
25 25
26 const VideoDecoderConfig& DummyDemuxerStream::video_decoder_config() { 26 const VideoDecoderConfig& DummyDemuxerStream::video_decoder_config() {
27 CHECK_EQ(type_, VIDEO); 27 CHECK_EQ(type_, VIDEO);
28 return video_config_; 28 return video_config_;
29 } 29 }
30 30
31 void DummyDemuxerStream::Read(const ReadCB& read_cb) {} 31 void DummyDemuxerStream::Read(const ReadCB& read_cb) {}
32 32
33 void DummyDemuxerStream::EnableBitstreamConverter() {} 33 void DummyDemuxerStream::EnableBitstreamConverter() {}
34 34
35 Ranges<base::TimeDelta> DummyDemuxerStream::GetBufferedRanges() {
36 return Ranges<base::TimeDelta>();
37 }
38
35 DummyDemuxer::DummyDemuxer(bool has_video, bool has_audio) 39 DummyDemuxer::DummyDemuxer(bool has_video, bool has_audio)
36 : has_video_(has_video), 40 : has_video_(has_video),
37 has_audio_(has_audio) { 41 has_audio_(has_audio) {
38 streams_.resize(DemuxerStream::NUM_TYPES); 42 streams_.resize(DemuxerStream::NUM_TYPES);
39 if (has_audio) 43 if (has_audio)
40 streams_[DemuxerStream::AUDIO] = 44 streams_[DemuxerStream::AUDIO] =
41 new DummyDemuxerStream(DemuxerStream::AUDIO); 45 new DummyDemuxerStream(DemuxerStream::AUDIO);
42 if (has_video) 46 if (has_video)
43 streams_[DemuxerStream::VIDEO] = 47 streams_[DemuxerStream::VIDEO] =
44 new DummyDemuxerStream(DemuxerStream::VIDEO); 48 new DummyDemuxerStream(DemuxerStream::VIDEO);
(...skipping 13 matching lines...) Expand all
58 return base::TimeDelta(); 62 return base::TimeDelta();
59 } 63 }
60 64
61 int DummyDemuxer::GetBitrate() { 65 int DummyDemuxer::GetBitrate() {
62 return 0; 66 return 0;
63 } 67 }
64 68
65 DummyDemuxer::~DummyDemuxer() {} 69 DummyDemuxer::~DummyDemuxer() {}
66 70
67 } // namespace media 71 } // 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