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

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

Issue 1535193003: Add missing macros includes in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « media/base/decryptor.h ('k') | media/base/demuxer_stream_provider.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) 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 <vector> 8 #include <vector>
9 9
10 #include "base/macros.h"
10 #include "base/time/time.h" 11 #include "base/time/time.h"
11 #include "media/base/data_source.h" 12 #include "media/base/data_source.h"
12 #include "media/base/demuxer_stream.h" 13 #include "media/base/demuxer_stream.h"
13 #include "media/base/demuxer_stream_provider.h" 14 #include "media/base/demuxer_stream_provider.h"
14 #include "media/base/eme_constants.h" 15 #include "media/base/eme_constants.h"
15 #include "media/base/media_export.h" 16 #include "media/base/media_export.h"
16 #include "media/base/pipeline_status.h" 17 #include "media/base/pipeline_status.h"
17 18
18 namespace media { 19 namespace media {
19 20
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 // Returns the memory usage in bytes for the demuxer. 91 // Returns the memory usage in bytes for the demuxer.
91 virtual int64_t GetMemoryUsage() const = 0; 92 virtual int64_t GetMemoryUsage() const = 0;
92 93
93 private: 94 private:
94 DISALLOW_COPY_AND_ASSIGN(Demuxer); 95 DISALLOW_COPY_AND_ASSIGN(Demuxer);
95 }; 96 };
96 97
97 } // namespace media 98 } // namespace media
98 99
99 #endif // MEDIA_BASE_DEMUXER_H_ 100 #endif // MEDIA_BASE_DEMUXER_H_
OLDNEW
« no previous file with comments | « media/base/decryptor.h ('k') | media/base/demuxer_stream_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698