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

Side by Side Diff: media/base/bitstream_buffer.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/bit_reader.h ('k') | media/base/byte_queue.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_BITSTREAM_BUFFER_H_ 5 #ifndef MEDIA_BASE_BITSTREAM_BUFFER_H_
6 #define MEDIA_BASE_BITSTREAM_BUFFER_H_ 6 #define MEDIA_BASE_BITSTREAM_BUFFER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 size_t size_; 75 size_t size_;
76 off_t offset_; 76 off_t offset_;
77 77
78 // This is only set when necessary. For example, AndroidVideoDecodeAccelerator 78 // This is only set when necessary. For example, AndroidVideoDecodeAccelerator
79 // needs the timestamp because the underlying decoder may require it to 79 // needs the timestamp because the underlying decoder may require it to
80 // determine the output order. 80 // determine the output order.
81 base::TimeDelta presentation_timestamp_; 81 base::TimeDelta presentation_timestamp_;
82 82
83 // The following fields come from DecryptConfig. 83 // The following fields come from DecryptConfig.
84 // TODO(timav): Try to DISALLOW_COPY_AND_ASSIGN and include these params as 84 // TODO(timav): Try to DISALLOW_COPY_AND_ASSIGN and include these params as
85 // scoped_ptr<DecryptConfig> or explain why copy & assign is needed. 85 // std::unique_ptr<DecryptConfig> or explain why copy & assign is needed.
86 86
87 std::string key_id_; // key ID. 87 std::string key_id_; // key ID.
88 std::string iv_; // initialization vector 88 std::string iv_; // initialization vector
89 std::vector<SubsampleEntry> subsamples_; // clear/cypher sizes 89 std::vector<SubsampleEntry> subsamples_; // clear/cypher sizes
90 90
91 friend struct IPC::ParamTraits<media::BitstreamBuffer>; 91 friend struct IPC::ParamTraits<media::BitstreamBuffer>;
92 92
93 // Allow compiler-generated copy & assign constructors. 93 // Allow compiler-generated copy & assign constructors.
94 }; 94 };
95 95
96 } // namespace media 96 } // namespace media
97 97
98 #endif // MEDIA_BASE_BITSTREAM_BUFFER_H_ 98 #endif // MEDIA_BASE_BITSTREAM_BUFFER_H_
OLDNEW
« no previous file with comments | « media/base/bit_reader.h ('k') | media/base/byte_queue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698