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

Unified Diff: media/cast/sender/size_adaptable_video_encoder_base.cc

Issue 1905763002: Convert //media/cast from scoped_ptr 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/sender/size_adaptable_video_encoder_base.h ('k') | media/cast/sender/video_encoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/sender/size_adaptable_video_encoder_base.cc
diff --git a/media/cast/sender/size_adaptable_video_encoder_base.cc b/media/cast/sender/size_adaptable_video_encoder_base.cc
index 6d1399fb154424461817135ac0eb668d955adef4..b16db6d38df981871a4dcad4f55975e5392d87cb 100644
--- a/media/cast/sender/size_adaptable_video_encoder_base.cc
+++ b/media/cast/sender/size_adaptable_video_encoder_base.cc
@@ -79,8 +79,8 @@ void SizeAdaptableVideoEncoderBase::GenerateKeyFrame() {
encoder_->GenerateKeyFrame();
}
-scoped_ptr<VideoFrameFactory>
- SizeAdaptableVideoEncoderBase::CreateVideoFrameFactory() {
+std::unique_ptr<VideoFrameFactory>
+SizeAdaptableVideoEncoderBase::CreateVideoFrameFactory() {
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
return nullptr;
}
@@ -152,7 +152,7 @@ void SizeAdaptableVideoEncoderBase::OnEncoderStatusChange(
void SizeAdaptableVideoEncoderBase::OnEncodedVideoFrame(
const FrameEncodedCallback& frame_encoded_callback,
- scoped_ptr<SenderEncodedFrame> encoded_frame) {
+ std::unique_ptr<SenderEncodedFrame> encoded_frame) {
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
--frames_in_encoder_;
DCHECK_GE(frames_in_encoder_, 0);
« no previous file with comments | « media/cast/sender/size_adaptable_video_encoder_base.h ('k') | media/cast/sender/video_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698