Index: media/cast/sender/h264_vt_encoder.cc |
diff --git a/media/cast/sender/h264_vt_encoder.cc b/media/cast/sender/h264_vt_encoder.cc |
index 49211fba2ad652756261abe3347c0079e492000f..725711dbc9086513a33fb5c25958ea107e217fbb 100644 |
--- a/media/cast/sender/h264_vt_encoder.cc |
+++ b/media/cast/sender/h264_vt_encoder.cc |
@@ -407,7 +407,7 @@ bool H264VideoToolboxEncoder::EncodeVideoFrame( |
// Wrap information we'll need after the frame is encoded in a heap object. |
// We'll get the pointer back from the VideoToolbox completion callback. |
- scoped_ptr<InProgressFrameEncode> request(new InProgressFrameEncode( |
+ std::unique_ptr<InProgressFrameEncode> request(new InProgressFrameEncode( |
RtpTimeTicks::FromTimeDelta(video_frame->timestamp(), kVideoFrequency), |
reference_time, frame_encoded_callback)); |
@@ -470,10 +470,10 @@ void H264VideoToolboxEncoder::GenerateKeyFrame() { |
encode_next_frame_as_keyframe_ = true; |
} |
-scoped_ptr<VideoFrameFactory> |
+std::unique_ptr<VideoFrameFactory> |
H264VideoToolboxEncoder::CreateVideoFrameFactory() { |
DCHECK(thread_checker_.CalledOnValidThread()); |
- return scoped_ptr<VideoFrameFactory>( |
+ return std::unique_ptr<VideoFrameFactory>( |
new VideoFrameFactoryImpl::Proxy(video_frame_factory_)); |
} |
@@ -516,7 +516,7 @@ void H264VideoToolboxEncoder::CompressionCallback(void* encoder_opaque, |
VTEncodeInfoFlags info, |
CMSampleBufferRef sbuf) { |
auto encoder = reinterpret_cast<H264VideoToolboxEncoder*>(encoder_opaque); |
- const scoped_ptr<InProgressFrameEncode> request( |
+ const std::unique_ptr<InProgressFrameEncode> request( |
reinterpret_cast<InProgressFrameEncode*>(request_opaque)); |
bool keyframe = false; |
bool has_frame_data = false; |
@@ -547,7 +547,7 @@ void H264VideoToolboxEncoder::CompressionCallback(void* encoder_opaque, |
// frame. VideoToolbox calls the output callback serially, so this is safe. |
const uint32_t frame_id = ++encoder->last_frame_id_; |
- scoped_ptr<SenderEncodedFrame> encoded_frame(new SenderEncodedFrame()); |
+ std::unique_ptr<SenderEncodedFrame> encoded_frame(new SenderEncodedFrame()); |
encoded_frame->frame_id = frame_id; |
encoded_frame->reference_time = request->reference_time; |
encoded_frame->rtp_timestamp = request->rtp_timestamp; |