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

Side by Side Diff: media/base/demuxer.h

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 4 years, 12 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
« no previous file with comments | « media/base/decrypt_config.cc ('k') | media/base/demuxer_perftest.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_BASE_DEMUXER_H_ 5 #ifndef MEDIA_BASE_DEMUXER_H_
6 #define MEDIA_BASE_DEMUXER_H_ 6 #define MEDIA_BASE_DEMUXER_H_
7 7
8 #include <stdint.h>
9
8 #include <vector> 10 #include <vector>
9 11
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/time/time.h" 13 #include "base/time/time.h"
12 #include "media/base/data_source.h" 14 #include "media/base/data_source.h"
13 #include "media/base/demuxer_stream.h" 15 #include "media/base/demuxer_stream.h"
14 #include "media/base/demuxer_stream_provider.h" 16 #include "media/base/demuxer_stream_provider.h"
15 #include "media/base/eme_constants.h" 17 #include "media/base/eme_constants.h"
16 #include "media/base/media_export.h" 18 #include "media/base/media_export.h"
17 #include "media/base/pipeline_status.h" 19 #include "media/base/pipeline_status.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 // Returns the memory usage in bytes for the demuxer. 93 // Returns the memory usage in bytes for the demuxer.
92 virtual int64_t GetMemoryUsage() const = 0; 94 virtual int64_t GetMemoryUsage() const = 0;
93 95
94 private: 96 private:
95 DISALLOW_COPY_AND_ASSIGN(Demuxer); 97 DISALLOW_COPY_AND_ASSIGN(Demuxer);
96 }; 98 };
97 99
98 } // namespace media 100 } // namespace media
99 101
100 #endif // MEDIA_BASE_DEMUXER_H_ 102 #endif // MEDIA_BASE_DEMUXER_H_
OLDNEW
« no previous file with comments | « media/base/decrypt_config.cc ('k') | media/base/demuxer_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698