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

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

Issue 7601002: Revert r95841 due to failing media_unittests on linux_shared bot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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/bitstream_converter.h ('k') | media/filters/chunk_demuxer_factory.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 #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/filters.h" 11 #include "media/base/filters.h"
12 #include "media/webm/webm_cluster_parser.h" 12 #include "media/webm/webm_cluster_parser.h"
13 13
14 struct AVFormatContext; 14 struct AVFormatContext;
15 15
16 namespace media { 16 namespace media {
17 17
18 class ChunkDemuxerClient; 18 class ChunkDemuxerClient;
19 class ChunkDemuxerStream; 19 class ChunkDemuxerStream;
20 class FFmpegURLProtocol; 20 class FFmpegURLProtocol;
21 21
22 // Demuxer implementation that allows chunks of WebM media data to be passed 22 // Demuxer implementation that allows chunks of WebM media data to be passed
23 // from JavaScript to the media stack. 23 // from JavaScript to the media stack.
24 class MEDIA_EXPORT ChunkDemuxer : public Demuxer { 24 class ChunkDemuxer : public Demuxer {
25 public: 25 public:
26 explicit ChunkDemuxer(ChunkDemuxerClient* client); 26 explicit ChunkDemuxer(ChunkDemuxerClient* client);
27 virtual ~ChunkDemuxer(); 27 virtual ~ChunkDemuxer();
28 28
29 void Init(PipelineStatusCB cb); 29 void Init(PipelineStatusCB cb);
30 30
31 // Filter implementation. 31 // Filter implementation.
32 virtual void set_host(FilterHost* filter_host); 32 virtual void set_host(FilterHost* filter_host);
33 virtual void Stop(FilterCallback* callback); 33 virtual void Stop(FilterCallback* callback);
34 virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb); 34 virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb);
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 // Should a Seek() call wait for more data before calling the 113 // Should a Seek() call wait for more data before calling the
114 // callback. 114 // callback.
115 bool seek_waits_for_data_; 115 bool seek_waits_for_data_;
116 116
117 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); 117 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
118 }; 118 };
119 119
120 } // namespace media 120 } // namespace media
121 121
122 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ 122 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_
OLDNEW
« no previous file with comments | « media/filters/bitstream_converter.h ('k') | media/filters/chunk_demuxer_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698