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

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

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/frame_sender.cc ('k') | media/cast/sender/video_encoder_unittest.cc » ('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 733b50c3c4694a5169e3153d625702b5928574cc..6d1399fb154424461817135ac0eb668d955adef4 100644
--- a/media/cast/sender/size_adaptable_video_encoder_base.cc
+++ b/media/cast/sender/size_adaptable_video_encoder_base.cc
@@ -4,6 +4,8 @@
#include "media/cast/sender/size_adaptable_video_encoder_base.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/location.h"
#include "media/base/video_frame.h"
@@ -132,7 +134,7 @@ void SizeAdaptableVideoEncoderBase::TrySpawningReplacementEncoder(
<< frame_size_.ToString() << " to "
<< size_needed.ToString() << ").";
frame_size_ = size_needed;
- encoder_ = CreateEncoder().Pass();
+ encoder_ = CreateEncoder();
DCHECK(encoder_);
}
@@ -155,7 +157,7 @@ void SizeAdaptableVideoEncoderBase::OnEncodedVideoFrame(
--frames_in_encoder_;
DCHECK_GE(frames_in_encoder_, 0);
last_frame_id_ = encoded_frame->frame_id;
- frame_encoded_callback.Run(encoded_frame.Pass());
+ frame_encoded_callback.Run(std::move(encoded_frame));
}
} // namespace cast
« no previous file with comments | « media/cast/sender/frame_sender.cc ('k') | media/cast/sender/video_encoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698