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

Unified Diff: webrtc/media/engine/webrtcvideoengine2.cc

Issue 1885473004: Adding codecs to the RtpParameters returned by an RtpSender. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Updating build files. Created 4 years, 8 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: webrtc/media/engine/webrtcvideoengine2.cc
diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc
index b9dbd666848a8703e76dc4be1c5623c50ed91bd6..bed7f32db7dafc667898c075305f9b0eb35f2b2d 100644
--- a/webrtc/media/engine/webrtcvideoengine2.cc
+++ b/webrtc/media/engine/webrtcvideoengine2.cc
@@ -877,6 +877,7 @@ bool WebRtcVideoChannel2::SetSendParameters(const VideoSendParameters& params) {
send_params_ = params;
return true;
}
+
webrtc::RtpParameters WebRtcVideoChannel2::GetRtpParameters(
uint32_t ssrc) const {
rtc::CritScope stream_lock(&stream_crit_);
@@ -887,7 +888,17 @@ webrtc::RtpParameters WebRtcVideoChannel2::GetRtpParameters(
return webrtc::RtpParameters();
}
- return it->second->GetRtpParameters();
+ webrtc::RtpParameters rtp_params = it->second->GetRtpParameters();
+ // Need to add the common list of codecs to the send stream-specific
+ // RTP parameters.
+ for (const VideoCodec& codec : send_params_.codecs) {
+ webrtc::RtpCodecParameters codec_params;
+ codec_params.payload_type = codec.id;
+ codec_params.mime_type = codec.name;
+ codec_params.clock_rate = codec.clockrate;
+ rtp_params.codecs.push_back(codec_params);
skvlad 2016/04/14 01:03:56 Could this be moved into a function common for bot
Taylor Brandstetter 2016/04/14 01:43:45 Yeah, I can move this to codec.h/codec.cc.
+ }
+ return rtp_params;
}
bool WebRtcVideoChannel2::SetRtpParameters(
@@ -902,6 +913,8 @@ bool WebRtcVideoChannel2::SetRtpParameters(
return false;
}
+ // TODO(deadbeef): Handle setting parameters with a list of codecs in a
+ // different order (which should change the send codec).
return it->second->SetRtpParameters(parameters);
}

Powered by Google App Engine
This is Rietveld 408576698