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

Side by Side Diff: media/cast/sender/video_sender.cc

Issue 532373003: [Cast] RTT clean-up to the max! (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove RTT accessors in FrameSender (not needed post-refactor). Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « media/cast/sender/frame_sender.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/cast/sender/video_sender.h" 5 #include "media/cast/sender/video_sender.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cstring> 8 #include <cstring>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 transport_config.feedback_ssrc = video_config.incoming_feedback_ssrc; 70 transport_config.feedback_ssrc = video_config.incoming_feedback_ssrc;
71 transport_config.rtp_payload_type = video_config.rtp_payload_type; 71 transport_config.rtp_payload_type = video_config.rtp_payload_type;
72 transport_config.stored_frames = max_unacked_frames_; 72 transport_config.stored_frames = max_unacked_frames_;
73 transport_config.aes_key = video_config.aes_key; 73 transport_config.aes_key = video_config.aes_key;
74 transport_config.aes_iv_mask = video_config.aes_iv_mask; 74 transport_config.aes_iv_mask = video_config.aes_iv_mask;
75 75
76 transport_sender->InitializeVideo( 76 transport_sender->InitializeVideo(
77 transport_config, 77 transport_config,
78 base::Bind(&VideoSender::OnReceivedCastFeedback, 78 base::Bind(&VideoSender::OnReceivedCastFeedback,
79 weak_factory_.GetWeakPtr()), 79 weak_factory_.GetWeakPtr()),
80 base::Bind(&VideoSender::OnReceivedRtt, weak_factory_.GetWeakPtr())); 80 base::Bind(&VideoSender::OnMeasuredRoundTripTime,
81 weak_factory_.GetWeakPtr()));
81 } 82 }
82 83
83 VideoSender::~VideoSender() { 84 VideoSender::~VideoSender() {
84 } 85 }
85 86
86 void VideoSender::InsertRawVideoFrame( 87 void VideoSender::InsertRawVideoFrame(
87 const scoped_refptr<media::VideoFrame>& video_frame, 88 const scoped_refptr<media::VideoFrame>& video_frame,
88 const base::TimeTicks& capture_time) { 89 const base::TimeTicks& capture_time) {
89 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN)); 90 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
90 if (cast_initialization_status_ != STATUS_VIDEO_INITIALIZED) { 91 if (cast_initialization_status_ != STATUS_VIDEO_INITIALIZED) {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 VLOG(1) << "Encoder rejected a frame. Skipping..."; 134 VLOG(1) << "Encoder rejected a frame. Skipping...";
134 } 135 }
135 } 136 }
136 137
137 void VideoSender::OnAck(uint32 frame_id) { 138 void VideoSender::OnAck(uint32 frame_id) {
138 video_encoder_->LatestFrameIdToReference(frame_id); 139 video_encoder_->LatestFrameIdToReference(frame_id);
139 } 140 }
140 141
141 } // namespace cast 142 } // namespace cast
142 } // namespace media 143 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/sender/frame_sender.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698