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

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

Issue 542883004: Cast: Merge common functionality from audio/video sender into frame_sender. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/sender/frame_sender.h ('k') | media/cast/sender/video_sender.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/sender/frame_sender.cc
diff --git a/media/cast/sender/frame_sender.cc b/media/cast/sender/frame_sender.cc
index f338dd9b2b065ce91a7ea98332711478916ff16f..bc2d7a776462c8adbd12c10e8a38e3756da71d4c 100644
--- a/media/cast/sender/frame_sender.cc
+++ b/media/cast/sender/frame_sender.cc
@@ -4,30 +4,40 @@
#include "media/cast/sender/frame_sender.h"
+#include "base/debug/trace_event.h"
+
namespace media {
namespace cast {
namespace {
+
const int kMinSchedulingDelayMs = 1;
+const int kNumAggressiveReportsSentAtStart = 100;
+
} // namespace
FrameSender::FrameSender(scoped_refptr<CastEnvironment> cast_environment,
+ bool is_audio,
CastTransportSender* const transport_sender,
base::TimeDelta rtcp_interval,
int rtp_timebase,
uint32 ssrc,
double max_frame_rate,
- base::TimeDelta playout_delay)
+ base::TimeDelta playout_delay,
+ CongestionControl* congestion_control)
: cast_environment_(cast_environment),
transport_sender_(transport_sender),
ssrc_(ssrc),
rtt_available_(false),
rtcp_interval_(rtcp_interval),
max_frame_rate_(max_frame_rate),
+ frames_in_encoder_(0),
num_aggressive_rtcp_reports_sent_(0),
last_sent_frame_id_(0),
latest_acked_frame_id_(0),
duplicate_ack_counter_(0),
rtp_timebase_(rtp_timebase),
+ congestion_control_(congestion_control),
+ is_audio_(is_audio),
weak_factory_(this) {
DCHECK_GT(rtp_timebase_, 0);
SetTargetPlayoutDelay(playout_delay);
@@ -158,5 +168,185 @@ RtpTimestamp FrameSender::GetRecordedRtpTimestamp(uint32 frame_id) const {
return frame_rtp_timestamps_[frame_id % arraysize(frame_rtp_timestamps_)];
}
+
+void FrameSender::SendEncodedFrame(
+ int requested_bitrate_before_encode,
+ scoped_ptr<EncodedFrame> encoded_frame) {
+ DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
+
+ DCHECK_GT(frames_in_encoder_, 0) << " is_audio: " << is_audio_;
+ frames_in_encoder_--;
+
+ const uint32 frame_id = encoded_frame->frame_id;
+
+ const bool is_first_frame_to_be_sent = last_send_time_.is_null();
+ last_send_time_ = cast_environment_->Clock()->NowTicks();
+ last_sent_frame_id_ = frame_id;
+ // If this is the first frame about to be sent, fake the value of
+ // |latest_acked_frame_id_| to indicate the receiver starts out all caught up.
+ // Also, schedule the periodic frame re-send checks.
+ if (is_first_frame_to_be_sent) {
+ latest_acked_frame_id_ = frame_id - 1;
+ ScheduleNextResendCheck();
+ }
+
+ VLOG_IF(1, encoded_frame->dependency == EncodedFrame::KEY)
+ << "Send encoded key frame; frame_id: " << frame_id;
+
+ cast_environment_->Logging()->InsertEncodedFrameEvent(
+ last_send_time_, FRAME_ENCODED,
+ is_audio_ ? AUDIO_EVENT : VIDEO_EVENT,
+ encoded_frame->rtp_timestamp,
+ frame_id, static_cast<int>(encoded_frame->data.size()),
+ encoded_frame->dependency == EncodedFrame::KEY,
+ requested_bitrate_before_encode);
+
+ RecordLatestFrameTimestamps(frame_id,
+ encoded_frame->reference_time,
+ encoded_frame->rtp_timestamp);
+
+ if (!is_audio_) {
+ // Used by chrome/browser/extension/api/cast_streaming/performance_test.cc
+ TRACE_EVENT_INSTANT1(
+ "cast_perf_test", "VideoFrameEncoded",
+ TRACE_EVENT_SCOPE_THREAD,
+ "rtp_timestamp", encoded_frame->rtp_timestamp);
+ }
+
+ // At the start of the session, it's important to send reports before each
+ // frame so that the receiver can properly compute playout times. The reason
+ // more than one report is sent is because transmission is not guaranteed,
+ // only best effort, so send enough that one should almost certainly get
+ // through.
+ if (num_aggressive_rtcp_reports_sent_ < kNumAggressiveReportsSentAtStart) {
+ // SendRtcpReport() will schedule future reports to be made if this is the
+ // last "aggressive report."
+ ++num_aggressive_rtcp_reports_sent_;
+ const bool is_last_aggressive_report =
+ (num_aggressive_rtcp_reports_sent_ == kNumAggressiveReportsSentAtStart);
+ VLOG_IF(1, is_last_aggressive_report) << "Sending last aggressive report.";
+ SendRtcpReport(is_last_aggressive_report);
+ }
+
+ congestion_control_->SendFrameToTransport(
+ frame_id, encoded_frame->data.size() * 8, last_send_time_);
+
+ if (send_target_playout_delay_) {
+ encoded_frame->new_playout_delay_ms =
+ target_playout_delay_.InMilliseconds();
+ }
+ transport_sender_->InsertFrame(ssrc_, *encoded_frame);
+}
+
+void FrameSender::OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback) {
+ DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
+
+ base::TimeDelta rtt;
+ base::TimeDelta avg_rtt;
+ base::TimeDelta min_rtt;
+ base::TimeDelta max_rtt;
+ if (is_rtt_available()) {
+ rtt = rtt_;
+ avg_rtt = avg_rtt_;
+ min_rtt = min_rtt_;
+ max_rtt = max_rtt_;
+
+ congestion_control_->UpdateRtt(rtt);
+
+ // Don't use a RTT lower than our average.
+ rtt = std::max(rtt, avg_rtt);
+
+ // Having the RTT values implies the receiver sent back a receiver report
+ // based on it having received a report from here. Therefore, ensure this
+ // sender stops aggressively sending reports.
+ if (num_aggressive_rtcp_reports_sent_ < kNumAggressiveReportsSentAtStart) {
+ VLOG(1) << "No longer a need to send reports aggressively (sent "
+ << num_aggressive_rtcp_reports_sent_ << ").";
+ num_aggressive_rtcp_reports_sent_ = kNumAggressiveReportsSentAtStart;
+ ScheduleNextRtcpReport();
+ }
+ } else {
+ // We have no measured value use default.
+ rtt = base::TimeDelta::FromMilliseconds(kStartRttMs);
+ }
+
+ if (last_send_time_.is_null())
+ return; // Cannot get an ACK without having first sent a frame.
+
+ if (cast_feedback.missing_frames_and_packets.empty()) {
+ OnAck(cast_feedback.ack_frame_id);
+
+ // We only count duplicate ACKs when we have sent newer frames.
+ if (latest_acked_frame_id_ == cast_feedback.ack_frame_id &&
+ latest_acked_frame_id_ != last_sent_frame_id_) {
+ duplicate_ack_counter_++;
+ } else {
+ duplicate_ack_counter_ = 0;
+ }
+ // TODO(miu): The values "2" and "3" should be derived from configuration.
+ if (duplicate_ack_counter_ >= 2 && duplicate_ack_counter_ % 3 == 2) {
+ VLOG(1) << "Received duplicate ACK for frame " << latest_acked_frame_id_;
+ ResendForKickstart();
+ }
+ } else {
+ // Only count duplicated ACKs if there is no NACK request in between.
+ // This is to avoid aggresive resend.
+ duplicate_ack_counter_ = 0;
+ }
+
+ base::TimeTicks now = cast_environment_->Clock()->NowTicks();
+ congestion_control_->AckFrame(cast_feedback.ack_frame_id, now);
+
+ cast_environment_->Logging()->InsertFrameEvent(
+ now,
+ FRAME_ACK_RECEIVED,
+ is_audio_ ? AUDIO_EVENT : VIDEO_EVENT,
+ GetRecordedRtpTimestamp(cast_feedback.ack_frame_id),
+ cast_feedback.ack_frame_id);
+
+ const bool is_acked_out_of_order =
+ static_cast<int32>(cast_feedback.ack_frame_id -
+ latest_acked_frame_id_) < 0;
+ VLOG(2) << "Received ACK" << (is_acked_out_of_order ? " out-of-order" : "")
+ << " for frame " << cast_feedback.ack_frame_id;
+ if (!is_acked_out_of_order) {
+ // Cancel resends of acked frames.
+ std::vector<uint32> cancel_sending_frames;
+ while (latest_acked_frame_id_ != cast_feedback.ack_frame_id) {
+ latest_acked_frame_id_++;
+ cancel_sending_frames.push_back(latest_acked_frame_id_);
+ }
+ transport_sender_->CancelSendingFrames(ssrc_, cancel_sending_frames);
+ latest_acked_frame_id_ = cast_feedback.ack_frame_id;
+ }
+}
+
+bool FrameSender::ShouldDropNextFrame(base::TimeTicks capture_time) const {
+ DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
+ int frames_in_flight = 0;
+ base::TimeDelta duration_in_flight;
+ if (!last_send_time_.is_null()) {
+ frames_in_flight =
+ static_cast<int32>(last_sent_frame_id_ - latest_acked_frame_id_);
+ if (frames_in_flight > 0) {
+ const uint32 oldest_unacked_frame_id = latest_acked_frame_id_ + 1;
+ duration_in_flight =
+ capture_time - GetRecordedReferenceTime(oldest_unacked_frame_id);
+ }
+ }
+ frames_in_flight += frames_in_encoder_;
+ VLOG(2) << frames_in_flight
+ << " frames in flight; last sent: " << last_sent_frame_id_
+ << "; latest acked: " << latest_acked_frame_id_
+ << "; frames in encoder: " << frames_in_encoder_
+ << "; duration in flight: "
+ << duration_in_flight.InMicroseconds() << " usec ("
+ << (target_playout_delay_ > base::TimeDelta() ?
+ 100 * duration_in_flight / target_playout_delay_ :
+ kint64max) << "%)";
+ return frames_in_flight >= max_unacked_frames_ ||
+ duration_in_flight >= target_playout_delay_;
+}
+
} // namespace cast
} // namespace media
« no previous file with comments | « media/cast/sender/frame_sender.h ('k') | media/cast/sender/video_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698