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

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

Issue 268033003: Disable splice frames for codecs other than mp3 or vorbis. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | « no previous file | 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 <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 void CompletePendingReadIfPossible_Locked(); 114 void CompletePendingReadIfPossible_Locked();
115 115
116 // Specifies the type of the stream. 116 // Specifies the type of the stream.
117 Type type_; 117 Type type_;
118 118
119 scoped_ptr<SourceBufferStream> stream_; 119 scoped_ptr<SourceBufferStream> stream_;
120 120
121 mutable base::Lock lock_; 121 mutable base::Lock lock_;
122 State state_; 122 State state_;
123 ReadCB read_cb_; 123 ReadCB read_cb_;
124 const bool splice_frames_enabled_; 124 bool splice_frames_enabled_;
125 bool partial_append_window_trimming_enabled_; 125 bool partial_append_window_trimming_enabled_;
126 126
127 DISALLOW_IMPLICIT_CONSTRUCTORS(ChunkDemuxerStream); 127 DISALLOW_IMPLICIT_CONSTRUCTORS(ChunkDemuxerStream);
128 }; 128 };
129 129
130 // Demuxer implementation that allows chunks of media data to be passed 130 // Demuxer implementation that allows chunks of media data to be passed
131 // from JavaScript to the media stack. 131 // from JavaScript to the media stack.
132 class MEDIA_EXPORT ChunkDemuxer : public Demuxer { 132 class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
133 public: 133 public:
134 enum Status { 134 enum Status {
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 385
386 // Indicates that splice frame generation is enabled. 386 // Indicates that splice frame generation is enabled.
387 const bool splice_frames_enabled_; 387 const bool splice_frames_enabled_;
388 388
389 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); 389 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
390 }; 390 };
391 391
392 } // namespace media 392 } // namespace media
393 393
394 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ 394 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_
OLDNEW
« no previous file with comments | « no previous file | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698