Convert media/formats to std::unique_ptr

media/formats/mp4/hevc.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/formats/mp4/hevc.h"
 
 #include <algorithm>
+#include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/logging.h"
 #include "media/base/decrypt_config.h"
 #include "media/filters/h265_parser.h"
 #include "media/formats/mp4/avc.h"
 #include "media/formats/mp4/box_definitions.h"
 #include "media/formats/mp4/box_reader.h"
 
@@ skipping 107 matching lines @@
 
 static const uint8_t kAnnexBStartCode[] = {0, 0, 0, 1};
 static const int kAnnexBStartCodeSize = 4;
 
 bool HEVC::InsertParamSetsAnnexB(
     const HEVCDecoderConfigurationRecord& hevc_config,
     std::vector<uint8_t>* buffer,
     std::vector<SubsampleEntry>* subsamples) {
   DCHECK(HEVC::IsValidAnnexB(*buffer, *subsamples));
 
-  scoped_ptr<H265Parser> parser(new H265Parser());
+  std::unique_ptr<H265Parser> parser(new H265Parser());
   const uint8_t* start = &(*buffer)[0];
   parser->SetEncryptedStream(start, buffer->size(), *subsamples);
 
   H265NALU nalu;
   if (parser->AdvanceToNextNALU(&nalu) != H265Parser::kOk)
     return false;
 
   std::vector<uint8_t>::iterator config_insert_point = buffer->begin();
 
   if (nalu.nal_unit_type == H265NALU::AUD_NUT) {
@@ skipping 59 matching lines @@
   DCHECK(buffer);
 
   if (size == 0)
     return true;
 
   // TODO(servolk): Implement this, see crbug.com/527595
   return true;
 }
 
 HEVCBitstreamConverter::HEVCBitstreamConverter(
-    scoped_ptr<HEVCDecoderConfigurationRecord> hevc_config)
+    std::unique_ptr<HEVCDecoderConfigurationRecord> hevc_config)
     : hevc_config_(std::move(hevc_config)) {
-    DCHECK(hevc_config_);
+  DCHECK(hevc_config_);
 }
 
 HEVCBitstreamConverter::~HEVCBitstreamConverter() {
 }
 
 bool HEVCBitstreamConverter::ConvertFrame(
     std::vector<uint8_t>* frame_buf,
     bool is_keyframe,
     std::vector<SubsampleEntry>* subsamples) const {
   RCHECK(AVC::ConvertFrameToAnnexB(hevc_config_->lengthSizeMinusOne + 1,
                                    frame_buf, subsamples));
 
   if (is_keyframe) {
     // If this is a keyframe, we (re-)inject HEVC params headers at the start of
     // a frame. If subsample info is present, we also update the clear byte
     // count for that first subsample.
     RCHECK(HEVC::InsertParamSetsAnnexB(*hevc_config_, frame_buf, subsamples));
   }
 
   DCHECK(HEVC::IsValidAnnexB(*frame_buf, *subsamples));
   return true;
 }
 
 }  // namespace mp4
 }  // namespace media