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

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

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-media-base: android Created 4 years, 7 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/decoder_buffer_unittest.cc ('k') | media/base/demuxer.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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <iosfwd> 10 #include <iosfwd>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "media/base/media_export.h" 15 #include "media/base/media_export.h"
17 16
18 namespace media { 17 namespace media {
19 18
20 // The Common Encryption spec provides for subsample encryption, where portions 19 // The Common Encryption spec provides for subsample encryption, where portions
21 // of a sample are set in cleartext. A SubsampleEntry specifies the number of 20 // of a sample are set in cleartext. A SubsampleEntry specifies the number of
22 // clear and encrypted bytes in each subsample. For decryption, all of the 21 // clear and encrypted bytes in each subsample. For decryption, all of the
23 // encrypted bytes in a sample should be considered a single logical stream, 22 // encrypted bytes in a sample should be considered a single logical stream,
24 // regardless of how they are divided into subsamples, and the clear bytes 23 // regardless of how they are divided into subsamples, and the clear bytes
25 // should not be considered as part of decryption. This is logically equivalent 24 // should not be considered as part of decryption. This is logically equivalent
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 }; 79 };
81 80
82 } // namespace media 81 } // namespace media
83 82
84 inline std::ostream& operator<<(std::ostream& os, 83 inline std::ostream& operator<<(std::ostream& os,
85 const media::DecryptConfig& obj) { 84 const media::DecryptConfig& obj) {
86 return obj.Print(os); 85 return obj.Print(os);
87 } 86 }
88 87
89 #endif // MEDIA_BASE_DECRYPT_CONFIG_H_ 88 #endif // MEDIA_BASE_DECRYPT_CONFIG_H_
OLDNEW
« no previous file with comments | « media/base/decoder_buffer_unittest.cc ('k') | media/base/demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698