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

Side by Side Diff: media/filters/chunk_demuxer.h

Issue 9860027: Remove DemuxerFactory and URL parameter from Pipeline. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: again Created 8 years, 8 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/preload.h ('k') | media/filters/chunk_demuxer.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 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_ 5 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_
6 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_ 6 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "base/synchronization/lock.h" 10 #include "base/synchronization/lock.h"
11 #include "media/base/byte_queue.h" 11 #include "media/base/byte_queue.h"
12 #include "media/base/demuxer.h" 12 #include "media/base/demuxer.h"
13 #include "media/base/stream_parser.h" 13 #include "media/base/stream_parser.h"
14 14
15 namespace media { 15 namespace media {
16 16
17 class ChunkDemuxerClient; 17 class ChunkDemuxerClient;
18 class ChunkDemuxerStream; 18 class ChunkDemuxerStream;
19 class FFmpegURLProtocol; 19 class FFmpegURLProtocol;
20 20
21 // Demuxer implementation that allows chunks of media data to be passed 21 // Demuxer implementation that allows chunks of media data to be passed
22 // from JavaScript to the media stack. 22 // from JavaScript to the media stack.
23 class MEDIA_EXPORT ChunkDemuxer : public Demuxer, public StreamParserHost { 23 class MEDIA_EXPORT ChunkDemuxer : public Demuxer, public StreamParserHost {
24 public: 24 public:
25 explicit ChunkDemuxer(ChunkDemuxerClient* client); 25 explicit ChunkDemuxer(ChunkDemuxerClient* client);
26 virtual ~ChunkDemuxer(); 26 virtual ~ChunkDemuxer();
27 27
28 void Init(const PipelineStatusCB& cb);
29
30 // Demuxer implementation. 28 // Demuxer implementation.
31 virtual void set_host(DemuxerHost* host) OVERRIDE; 29 virtual void Initialize(const PipelineStatusCB& cb) OVERRIDE;
32 virtual void Stop(const base::Closure& callback) OVERRIDE; 30 virtual void Stop(const base::Closure& callback) OVERRIDE;
33 virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE; 31 virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE;
34 virtual void OnAudioRendererDisabled() OVERRIDE; 32 virtual void OnAudioRendererDisabled() OVERRIDE;
35 virtual scoped_refptr<DemuxerStream> GetStream( 33 virtual scoped_refptr<DemuxerStream> GetStream(
36 DemuxerStream::Type type) OVERRIDE; 34 DemuxerStream::Type type) OVERRIDE;
37 virtual void SetPreload(Preload preload) OVERRIDE;
38 virtual base::TimeDelta GetStartTime() const OVERRIDE; 35 virtual base::TimeDelta GetStartTime() const OVERRIDE;
39 virtual int GetBitrate() OVERRIDE; 36 virtual int GetBitrate() OVERRIDE;
40 virtual bool IsLocalSource() OVERRIDE; 37 virtual bool IsLocalSource() OVERRIDE;
41 virtual bool IsSeekable() OVERRIDE; 38 virtual bool IsSeekable() OVERRIDE;
42 39
43 // Methods used by an external object to control this demuxer. 40 // Methods used by an external object to control this demuxer.
44 void FlushData(); 41 void FlushData();
45 42
46 // Appends media data to the stream. Returns false if this method 43 // Appends media data to the stream. Returns false if this method
47 // is called in an invalid state. 44 // is called in an invalid state.
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 base::TimeDelta duration_; 86 base::TimeDelta duration_;
90 87
91 scoped_ptr<StreamParser> stream_parser_; 88 scoped_ptr<StreamParser> stream_parser_;
92 89
93 // Should a Seek() call wait for more data before calling the 90 // Should a Seek() call wait for more data before calling the
94 // callback. 91 // callback.
95 bool seek_waits_for_data_; 92 bool seek_waits_for_data_;
96 93
97 ByteQueue byte_queue_; 94 ByteQueue byte_queue_;
98 95
99 // Stores an error that happens after initilization but before set_host().
100 // TODO(acolwell): Remove this when http://crbug.com/111585 is fixed.
101 PipelineStatus deferred_error_;
102
103 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); 96 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
104 }; 97 };
105 98
106 } // namespace media 99 } // namespace media
107 100
108 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ 101 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_
OLDNEW
« no previous file with comments | « media/base/preload.h ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698