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

Unified Diff: media/cast/net/cast_transport_sender_impl.cc

Issue 1709863002: Add Cast PLI support on sender side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Separate Pli message from Cast message. Created 4 years, 10 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
Index: media/cast/net/cast_transport_sender_impl.cc
diff --git a/media/cast/net/cast_transport_sender_impl.cc b/media/cast/net/cast_transport_sender_impl.cc
index 29629679f08b99c31c579c368f1f5ee2dbe8d8a6..3437eae6fd74fffacc77071ecd1fff2a58c6bad4 100644
--- a/media/cast/net/cast_transport_sender_impl.cc
+++ b/media/cast/net/cast_transport_sender_impl.cc
@@ -98,7 +98,8 @@ CastTransportSenderImpl::~CastTransportSenderImpl() {
void CastTransportSenderImpl::InitializeAudio(
const CastTransportRtpConfig& config,
const RtcpCastMessageCallback& cast_message_cb,
- const RtcpRttCallback& rtt_cb) {
+ const RtcpRttCallback& rtt_cb,
+ const RtcpPliCallback& pli_cb) {
LOG_IF(WARNING, config.aes_key.empty() || config.aes_iv_mask.empty())
<< "Unsafe to send audio with encryption DISABLED.";
if (!audio_encryptor_.Initialize(config.aes_key, config.aes_iv_mask)) {
@@ -123,7 +124,7 @@ void CastTransportSenderImpl::InitializeAudio(
weak_factory_.GetWeakPtr(), config.ssrc, cast_message_cb),
rtt_cb, base::Bind(&CastTransportSenderImpl::OnReceivedLogMessage,
weak_factory_.GetWeakPtr(), AUDIO_EVENT),
- clock_, &pacer_, config.ssrc, config.feedback_ssrc));
+ pli_cb, clock_, &pacer_, config.ssrc, config.feedback_ssrc));
pacer_.RegisterAudioSsrc(config.ssrc);
AddValidSsrc(config.feedback_ssrc);
transport_client_->OnStatusChanged(TRANSPORT_AUDIO_INITIALIZED);
@@ -132,7 +133,8 @@ void CastTransportSenderImpl::InitializeAudio(
void CastTransportSenderImpl::InitializeVideo(
const CastTransportRtpConfig& config,
const RtcpCastMessageCallback& cast_message_cb,
- const RtcpRttCallback& rtt_cb) {
+ const RtcpRttCallback& rtt_cb,
+ const RtcpPliCallback& pli_cb) {
LOG_IF(WARNING, config.aes_key.empty() || config.aes_iv_mask.empty())
<< "Unsafe to send video with encryption DISABLED.";
if (!video_encryptor_.Initialize(config.aes_key, config.aes_iv_mask)) {
@@ -152,7 +154,7 @@ void CastTransportSenderImpl::InitializeVideo(
weak_factory_.GetWeakPtr(), config.ssrc, cast_message_cb),
rtt_cb, base::Bind(&CastTransportSenderImpl::OnReceivedLogMessage,
weak_factory_.GetWeakPtr(), VIDEO_EVENT),
- clock_, &pacer_, config.ssrc, config.feedback_ssrc));
+ pli_cb, clock_, &pacer_, config.ssrc, config.feedback_ssrc));
pacer_.RegisterVideoSsrc(config.ssrc);
AddValidSsrc(config.feedback_ssrc);
transport_client_->OnStatusChanged(TRANSPORT_VIDEO_INITIALIZED);
@@ -420,12 +422,13 @@ void CastTransportSenderImpl::SendRtcpFromRtpReceiver(
uint32_t sender_ssrc,
const RtcpTimeData& time_data,
const RtcpCastMessage* cast_message,
+ const RtcpPliMessage* pli_message,
base::TimeDelta target_delay,
const ReceiverRtcpEventSubscriber::RtcpEvents* rtcp_events,
const RtpReceiverStatistics* rtp_receiver_statistics) {
const ReceiverRtcpSession rtcp(clock_, &pacer_, ssrc, sender_ssrc);
- rtcp.SendRtcpReport(time_data, cast_message, target_delay, rtcp_events,
- rtp_receiver_statistics);
+ rtcp.SendRtcpReport(time_data, cast_message, pli_message, target_delay,
+ rtcp_events, rtp_receiver_statistics);
}
} // namespace cast

Powered by Google App Engine
This is Rietveld 408576698