diff options
| author | dcheng <dcheng@chromium.org> | 2015-12-27 00:54:00 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-27 08:54:53 +0000 |
| commit | 652f5ff5aa1c3592d61a310edc680bf92cf9f57b (patch) | |
| tree | b9d734a460575b5de93ad0bee4204b1cf628a714 /media/cast/receiver/frame_receiver.cc | |
| parent | a3fa7abe73f7bd52b3333f8da4ba5c2333b4f78f (diff) | |
| download | chromium_src-652f5ff5aa1c3592d61a310edc680bf92cf9f57b.zip chromium_src-652f5ff5aa1c3592d61a310edc680bf92cf9f57b.tar.gz chromium_src-652f5ff5aa1c3592d61a310edc680bf92cf9f57b.tar.bz2 | |
Convert Pass()→std::move() in //media
☃
BUG=557422
R=avi@chromium.org
TBR=jrummell@chromium.org
Review URL: https://codereview.chromium.org/1544313002
Cr-Commit-Position: refs/heads/master@{#366924}
Diffstat (limited to 'media/cast/receiver/frame_receiver.cc')
| -rw-r--r-- | media/cast/receiver/frame_receiver.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/media/cast/receiver/frame_receiver.cc b/media/cast/receiver/frame_receiver.cc index 303a718..3c92be1 100644 --- a/media/cast/receiver/frame_receiver.cc +++ b/media/cast/receiver/frame_receiver.cc @@ -5,6 +5,7 @@ #include "media/cast/receiver/frame_receiver.h" #include <algorithm> +#include <utility> #include "base/big_endian.h" #include "base/bind.h" @@ -123,7 +124,7 @@ void FrameReceiver::ProcessParsedPacket(const RtpCastHeader& rtp_header, receive_event->packet_id = rtp_header.packet_id; receive_event->max_packet_id = rtp_header.max_packet_id; receive_event->size = payload_size; - cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass()); + cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event)); bool duplicate = false; const bool complete = @@ -182,7 +183,7 @@ void FrameReceiver::CastFeedback(const RtcpCastMessage& cast_message) { ack_sent_event->media_type = event_media_type_; ack_sent_event->rtp_timestamp = rtp_timestamp; ack_sent_event->frame_id = cast_message.ack_frame_id; - cast_environment_->logger()->DispatchFrameEvent(ack_sent_event.Pass()); + cast_environment_->logger()->DispatchFrameEvent(std::move(ack_sent_event)); ReceiverRtcpEventSubscriber::RtcpEvents rtcp_events; event_subscriber_.GetRtcpEventsWithRedundancy(&rtcp_events); @@ -293,7 +294,7 @@ void FrameReceiver::EmitOneFrame(const ReceiveEncodedFrameCallback& callback, scoped_ptr<EncodedFrame> encoded_frame) const { DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN)); if (!callback.is_null()) - callback.Run(encoded_frame.Pass()); + callback.Run(std::move(encoded_frame)); } base::TimeTicks FrameReceiver::GetPlayoutTime(const EncodedFrame& frame) const { |