Adding C++ versions of currently spec'd "RtpParameters" structs.
These structs will be used for ORTC objects (and their WebRTC
equivalents).
This CL also introduces some minor changes to the existing implemented
structs:
- max_bitrate_bps uses rtc::Optional instead of "-1 means unset"
- "mime_type" turned into "name"/"kind" (which can be used to form the
MIME type string, if needed).
- clock_rate and channels changed to rtc::Optional, since they will
need to be for RtpSender.send().
- Renamed "channels" to "num_channels" (the ORTC name, which I prefer).
BUG=webrtc:7013, webrtc:7112
Review-Url: https://codereview.webrtc.org/2651883010
Cr-Original-Commit-Position: refs/heads/master@{#16437}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: e702b30fec47933114161691369bd27a90371862
diff --git a/pc/rtcstatscollector_unittest.cc b/pc/rtcstatscollector_unittest.cc
index 6d1595e..178deee 100644
--- a/pc/rtcstatscollector_unittest.cc
+++ b/pc/rtcstatscollector_unittest.cc
@@ -765,15 +765,17 @@
RtpCodecParameters inbound_audio_codec;
inbound_audio_codec.payload_type = 1;
- inbound_audio_codec.mime_type = "opus";
- inbound_audio_codec.clock_rate = 1337;
+ inbound_audio_codec.kind = cricket::MEDIA_TYPE_AUDIO;
+ inbound_audio_codec.name = "opus";
+ inbound_audio_codec.clock_rate = rtc::Optional<int>(1337);
voice_media_info.receive_codecs.insert(
std::make_pair(inbound_audio_codec.payload_type, inbound_audio_codec));
RtpCodecParameters outbound_audio_codec;
outbound_audio_codec.payload_type = 2;
- outbound_audio_codec.mime_type = "isac";
- outbound_audio_codec.clock_rate = 1338;
+ outbound_audio_codec.kind = cricket::MEDIA_TYPE_AUDIO;
+ outbound_audio_codec.name = "isac";
+ outbound_audio_codec.clock_rate = rtc::Optional<int>(1338);
voice_media_info.send_codecs.insert(
std::make_pair(outbound_audio_codec.payload_type, outbound_audio_codec));
@@ -785,15 +787,17 @@
RtpCodecParameters inbound_video_codec;
inbound_video_codec.payload_type = 3;
- inbound_video_codec.mime_type = "H264";
- inbound_video_codec.clock_rate = 1339;
+ inbound_video_codec.kind = cricket::MEDIA_TYPE_VIDEO;
+ inbound_video_codec.name = "H264";
+ inbound_video_codec.clock_rate = rtc::Optional<int>(1339);
video_media_info.receive_codecs.insert(
std::make_pair(inbound_video_codec.payload_type, inbound_video_codec));
RtpCodecParameters outbound_video_codec;
outbound_video_codec.payload_type = 4;
- outbound_video_codec.mime_type = "VP8";
- outbound_video_codec.clock_rate = 1340;
+ outbound_video_codec.kind = cricket::MEDIA_TYPE_VIDEO;
+ outbound_video_codec.name = "VP8";
+ outbound_video_codec.clock_rate = rtc::Optional<int>(1340);
video_media_info.send_codecs.insert(
std::make_pair(outbound_video_codec.payload_type, outbound_video_codec));
@@ -1687,8 +1691,9 @@
RtpCodecParameters codec_parameters;
codec_parameters.payload_type = 42;
- codec_parameters.mime_type = "dummy";
- codec_parameters.clock_rate = 0;
+ codec_parameters.kind = cricket::MEDIA_TYPE_AUDIO;
+ codec_parameters.name = "dummy";
+ codec_parameters.clock_rate = rtc::Optional<int>(0);
voice_media_info.receive_codecs.insert(
std::make_pair(codec_parameters.payload_type, codec_parameters));
@@ -1769,8 +1774,9 @@
RtpCodecParameters codec_parameters;
codec_parameters.payload_type = 42;
- codec_parameters.mime_type = "dummy";
- codec_parameters.clock_rate = 0;
+ codec_parameters.kind = cricket::MEDIA_TYPE_AUDIO;
+ codec_parameters.name = "dummy";
+ codec_parameters.clock_rate = rtc::Optional<int>(0);
video_media_info.receive_codecs.insert(
std::make_pair(codec_parameters.payload_type, codec_parameters));
@@ -1848,8 +1854,9 @@
RtpCodecParameters codec_parameters;
codec_parameters.payload_type = 42;
- codec_parameters.mime_type = "dummy";
- codec_parameters.clock_rate = 0;
+ codec_parameters.kind = cricket::MEDIA_TYPE_AUDIO;
+ codec_parameters.name = "dummy";
+ codec_parameters.clock_rate = rtc::Optional<int>(0);
voice_media_info.send_codecs.insert(
std::make_pair(codec_parameters.payload_type, codec_parameters));
@@ -1927,8 +1934,9 @@
RtpCodecParameters codec_parameters;
codec_parameters.payload_type = 42;
- codec_parameters.mime_type = "dummy";
- codec_parameters.clock_rate = 0;
+ codec_parameters.kind = cricket::MEDIA_TYPE_AUDIO;
+ codec_parameters.name = "dummy";
+ codec_parameters.clock_rate = rtc::Optional<int>(0);
video_media_info.send_codecs.insert(
std::make_pair(codec_parameters.payload_type, codec_parameters));
