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

Side by Side Diff: media/formats/webm/cluster_builder.cc

Issue 2330543002: Change unique_ptr::reset() for std::move (Closed)
Patch Set: Change unique_ptr::reset() for std::move Created 4 years, 3 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/video_frame.cc ('k') | media/gpu/vaapi_video_decode_accelerator.cc » ('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 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 #include "media/formats/webm/cluster_builder.h" 5 #include "media/formats/webm/cluster_builder.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 235
236 void ClusterBuilder::ExtendBuffer(int bytes_needed) { 236 void ClusterBuilder::ExtendBuffer(int bytes_needed) {
237 int new_buffer_size = 2 * buffer_size_; 237 int new_buffer_size = 2 * buffer_size_;
238 238
239 while ((new_buffer_size - bytes_used_) < bytes_needed) 239 while ((new_buffer_size - bytes_used_) < bytes_needed)
240 new_buffer_size *= 2; 240 new_buffer_size *= 2;
241 241
242 std::unique_ptr<uint8_t[]> new_buffer(new uint8_t[new_buffer_size]); 242 std::unique_ptr<uint8_t[]> new_buffer(new uint8_t[new_buffer_size]);
243 243
244 memcpy(new_buffer.get(), buffer_.get(), bytes_used_); 244 memcpy(new_buffer.get(), buffer_.get(), bytes_used_);
245 buffer_.reset(new_buffer.release()); 245 buffer_ = std::move(new_buffer);
246 buffer_size_ = new_buffer_size; 246 buffer_size_ = new_buffer_size;
247 } 247 }
248 248
249 void ClusterBuilder::UpdateUInt64(int offset, int64_t value) { 249 void ClusterBuilder::UpdateUInt64(int offset, int64_t value) {
250 DCHECK_LE(offset + 7, buffer_size_); 250 DCHECK_LE(offset + 7, buffer_size_);
251 uint8_t* buf = buffer_.get() + offset; 251 uint8_t* buf = buffer_.get() + offset;
252 252
253 // Fill the last 7 bytes of size field in big-endian order. 253 // Fill the last 7 bytes of size field in big-endian order.
254 for (int i = 7; i > 0; i--) { 254 for (int i = 7; i > 0; i--) {
255 buf[i] = value & 0xff; 255 buf[i] = value & 0xff;
256 value >>= 8; 256 value >>= 8;
257 } 257 }
258 } 258 }
259 259
260 } // namespace media 260 } // namespace media
OLDNEW
« no previous file with comments | « media/base/video_frame.cc ('k') | media/gpu/vaapi_video_decode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698