Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/frame_sender.h" | 5 #include "media/cast/sender/frame_sender.h" |
| 6 | 6 |
| 7 #include <algorithm> | |
| 8 #include <vector> | |
| 9 | |
| 7 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| 8 #include "media/cast/cast_defines.h" | 11 #include "media/cast/cast_defines.h" |
| 9 #include "media/cast/constants.h" | 12 #include "media/cast/constants.h" |
| 10 #include "media/cast/sender/sender_encoded_frame.h" | 13 #include "media/cast/sender/sender_encoded_frame.h" |
| 11 | 14 |
| 12 namespace media { | 15 namespace media { |
| 13 namespace cast { | 16 namespace cast { |
| 14 namespace { | 17 namespace { |
| 15 | 18 |
| 16 const int kMinSchedulingDelayMs = 1; | 19 const int kMinSchedulingDelayMs = 1; |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 30 CastTransportSender* const transport_sender, | 33 CastTransportSender* const transport_sender, |
| 31 int rtp_timebase, | 34 int rtp_timebase, |
| 32 uint32 ssrc, | 35 uint32 ssrc, |
| 33 double max_frame_rate, | 36 double max_frame_rate, |
| 34 base::TimeDelta min_playout_delay, | 37 base::TimeDelta min_playout_delay, |
| 35 base::TimeDelta max_playout_delay, | 38 base::TimeDelta max_playout_delay, |
| 36 CongestionControl* congestion_control) | 39 CongestionControl* congestion_control) |
| 37 : cast_environment_(cast_environment), | 40 : cast_environment_(cast_environment), |
| 38 transport_sender_(transport_sender), | 41 transport_sender_(transport_sender), |
| 39 ssrc_(ssrc), | 42 ssrc_(ssrc), |
| 40 min_playout_delay_(min_playout_delay == base::TimeDelta() ? | 43 min_playout_delay_(min_playout_delay), |
|
miu
2015/12/01 21:15:27
Sanity-check: Can min_playout_delay ever be zero?
Irfan
2015/12/02 22:32:44
I have gone to previous logic since if there is no
| |
| 41 max_playout_delay : min_playout_delay), | |
| 42 max_playout_delay_(max_playout_delay), | 44 max_playout_delay_(max_playout_delay), |
| 43 send_target_playout_delay_(false), | 45 send_target_playout_delay_(false), |
| 44 max_frame_rate_(max_frame_rate), | 46 max_frame_rate_(max_frame_rate), |
| 45 num_aggressive_rtcp_reports_sent_(0), | 47 num_aggressive_rtcp_reports_sent_(0), |
| 46 last_sent_frame_id_(0), | 48 last_sent_frame_id_(0), |
| 47 latest_acked_frame_id_(0), | 49 latest_acked_frame_id_(0), |
| 48 duplicate_ack_counter_(0), | 50 duplicate_ack_counter_(0), |
| 49 congestion_control_(congestion_control), | 51 congestion_control_(congestion_control), |
| 50 rtp_timebase_(rtp_timebase), | 52 rtp_timebase_(rtp_timebase), |
| 51 is_audio_(is_audio), | 53 is_audio_(is_audio), |
| 52 weak_factory_(this) { | 54 weak_factory_(this) { |
| 53 DCHECK(transport_sender_); | 55 DCHECK(transport_sender_); |
| 54 DCHECK_GT(rtp_timebase_, 0); | 56 DCHECK_GT(rtp_timebase_, 0); |
| 55 DCHECK(congestion_control_); | 57 DCHECK(congestion_control_); |
| 56 SetTargetPlayoutDelay(min_playout_delay_); | 58 SetTargetPlayoutDelay( |
| 59 base::TimeDelta::FromMilliseconds(kNonInteractiveModeStartPlayoutTimeMs)); | |
| 57 send_target_playout_delay_ = false; | 60 send_target_playout_delay_ = false; |
| 58 memset(frame_rtp_timestamps_, 0, sizeof(frame_rtp_timestamps_)); | 61 memset(frame_rtp_timestamps_, 0, sizeof(frame_rtp_timestamps_)); |
| 59 } | 62 } |
| 60 | 63 |
| 61 FrameSender::~FrameSender() { | 64 FrameSender::~FrameSender() { |
| 62 } | 65 } |
| 63 | 66 |
| 64 void FrameSender::ScheduleNextRtcpReport() { | 67 void FrameSender::ScheduleNextRtcpReport() { |
| 65 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN)); | 68 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN)); |
| 66 | 69 |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 402 VLOG(1) << SENDER_SSRC << "Dropping: In-flight duration would be too high."; | 405 VLOG(1) << SENDER_SSRC << "Dropping: In-flight duration would be too high."; |
| 403 return true; | 406 return true; |
| 404 } | 407 } |
| 405 | 408 |
| 406 // Next frame is accepted. | 409 // Next frame is accepted. |
| 407 return false; | 410 return false; |
| 408 } | 411 } |
| 409 | 412 |
| 410 } // namespace cast | 413 } // namespace cast |
| 411 } // namespace media | 414 } // namespace media |
| OLD | NEW |