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

Side by Side Diff: media/base/decrypt_config.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/decoder_buffer_queue.h ('k') | media/base/decryptor.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_DECRYPT_CONFIG_H_ 5 #ifndef MEDIA_BASE_DECRYPT_CONFIG_H_
6 #define MEDIA_BASE_DECRYPT_CONFIG_H_ 6 #define MEDIA_BASE_DECRYPT_CONFIG_H_
7 7
8 #include <iosfwd> 8 #include <iosfwd>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
13 #include "media/base/media_export.h" 14 #include "media/base/media_export.h"
14 15
15 namespace media { 16 namespace media {
16 17
17 // The Common Encryption spec provides for subsample encryption, where portions 18 // The Common Encryption spec provides for subsample encryption, where portions
18 // of a sample are set in cleartext. A SubsampleEntry specifies the number of 19 // of a sample are set in cleartext. A SubsampleEntry specifies the number of
19 // clear and encrypted bytes in each subsample. For decryption, all of the 20 // clear and encrypted bytes in each subsample. For decryption, all of the
20 // encrypted bytes in a sample should be considered a single logical stream, 21 // encrypted bytes in a sample should be considered a single logical stream,
21 // regardless of how they are divided into subsamples, and the clear bytes 22 // regardless of how they are divided into subsamples, and the clear bytes
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 }; 74 };
74 75
75 } // namespace media 76 } // namespace media
76 77
77 inline std::ostream& operator<<(std::ostream& os, 78 inline std::ostream& operator<<(std::ostream& os,
78 const media::DecryptConfig& obj) { 79 const media::DecryptConfig& obj) {
79 return obj.Print(os); 80 return obj.Print(os);
80 } 81 }
81 82
82 #endif // MEDIA_BASE_DECRYPT_CONFIG_H_ 83 #endif // MEDIA_BASE_DECRYPT_CONFIG_H_
OLDNEW
« no previous file with comments | « media/base/decoder_buffer_queue.h ('k') | media/base/decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698