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

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

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years 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
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 <list> 8 #include <list>
9 9
10 #include "base/basictypes.h"
11 #include "base/callback.h" 10 #include "base/callback.h"
12 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
13 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_vector.h" 13 #include "base/memory/scoped_vector.h"
15 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
16 #include "media/base/audio_decoder.h" 15 #include "media/base/audio_decoder.h"
17 #include "media/base/cdm_context.h" 16 #include "media/base/cdm_context.h"
18 #include "media/base/demuxer_stream.h" 17 #include "media/base/demuxer_stream.h"
19 #include "media/base/media_export.h" 18 #include "media/base/media_export.h"
20 #include "media/base/media_log.h" 19 #include "media/base/media_log.h"
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 233
235 template <> 234 template <>
236 int DecoderStream<DemuxerStream::AUDIO>::GetMaxDecodeRequests() const; 235 int DecoderStream<DemuxerStream::AUDIO>::GetMaxDecodeRequests() const;
237 236
238 typedef DecoderStream<DemuxerStream::VIDEO> VideoFrameStream; 237 typedef DecoderStream<DemuxerStream::VIDEO> VideoFrameStream;
239 typedef DecoderStream<DemuxerStream::AUDIO> AudioBufferStream; 238 typedef DecoderStream<DemuxerStream::AUDIO> AudioBufferStream;
240 239
241 } // namespace media 240 } // namespace media
242 241
243 #endif // MEDIA_FILTERS_DECODER_STREAM_H_ 242 #endif // MEDIA_FILTERS_DECODER_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698