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

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

Issue 491733002: Minor cleanup of DecoderStreamTraits. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove DCHECK Created 6 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 | « no previous file | media/filters/decoder_stream.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_DECODER_STREAM_H_ 5 #ifndef MEDIA_FILTERS_DECODER_STREAM_H_
6 #define MEDIA_FILTERS_DECODER_STREAM_H_ 6 #define MEDIA_FILTERS_DECODER_STREAM_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 185
186 // Decoded buffers that haven't been read yet. Used when the decoder supports 186 // Decoded buffers that haven't been read yet. Used when the decoder supports
187 // parallel decoding. 187 // parallel decoding.
188 std::list<scoped_refptr<Output> > ready_outputs_; 188 std::list<scoped_refptr<Output> > ready_outputs_;
189 189
190 // Number of outstanding decode requests sent to the |decoder_|. 190 // Number of outstanding decode requests sent to the |decoder_|.
191 int pending_decode_requests_; 191 int pending_decode_requests_;
192 192
193 // NOTE: Weak pointers must be invalidated before all other member variables. 193 // NOTE: Weak pointers must be invalidated before all other member variables.
194 base::WeakPtrFactory<DecoderStream<StreamType> > weak_factory_; 194 base::WeakPtrFactory<DecoderStream<StreamType> > weak_factory_;
195
196 // This is required so the VideoFrameStream can access private members in
197 // FinishInitialization() and ReportStatistics().
198 DISALLOW_IMPLICIT_CONSTRUCTORS(DecoderStream);
199 }; 195 };
200 196
201 template <> 197 template <>
202 bool DecoderStream<DemuxerStream::AUDIO>::CanReadWithoutStalling() const; 198 bool DecoderStream<DemuxerStream::AUDIO>::CanReadWithoutStalling() const;
203 199
204 template <> 200 template <>
205 int DecoderStream<DemuxerStream::AUDIO>::GetMaxDecodeRequests() const; 201 int DecoderStream<DemuxerStream::AUDIO>::GetMaxDecodeRequests() const;
206 202
207 typedef DecoderStream<DemuxerStream::VIDEO> VideoFrameStream; 203 typedef DecoderStream<DemuxerStream::VIDEO> VideoFrameStream;
208 typedef DecoderStream<DemuxerStream::AUDIO> AudioBufferStream; 204 typedef DecoderStream<DemuxerStream::AUDIO> AudioBufferStream;
209 205
210 } // namespace media 206 } // namespace media
211 207
212 #endif // MEDIA_FILTERS_DECODER_STREAM_H_ 208 #endif // MEDIA_FILTERS_DECODER_STREAM_H_
OLDNEW
« no previous file with comments | « no previous file | media/filters/decoder_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698