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

Side by Side Diff: media/formats/webm/webm_content_encodings.h

Issue 1874413003: Convert media/formats to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
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_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_ 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_
6 #define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_ 6 #define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
10 #include <string> 11 #include <string>
11 12
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "media/base/media_export.h" 14 #include "media/base/media_export.h"
15 15
16 namespace media { 16 namespace media {
17 17
18 class MEDIA_EXPORT ContentEncoding { 18 class MEDIA_EXPORT ContentEncoding {
19 public: 19 public:
20 // The following enum definitions are based on the ContentEncoding element 20 // The following enum definitions are based on the ContentEncoding element
21 // specified in the Matroska spec. 21 // specified in the Matroska spec.
22 22
23 static const int kOrderInvalid = -1; 23 static const int kOrderInvalid = -1;
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 EncryptionAlgo encryption_algo_; 81 EncryptionAlgo encryption_algo_;
82 std::string encryption_key_id_; 82 std::string encryption_key_id_;
83 CipherMode cipher_mode_; 83 CipherMode cipher_mode_;
84 84
85 DISALLOW_COPY_AND_ASSIGN(ContentEncoding); 85 DISALLOW_COPY_AND_ASSIGN(ContentEncoding);
86 }; 86 };
87 87
88 } // namespace media 88 } // namespace media
89 89
90 #endif // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_ 90 #endif // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698