| Index: webrtc/media/base/mediachannel.h
|
| diff --git a/webrtc/media/base/mediachannel.h b/webrtc/media/base/mediachannel.h
|
| index ecb09f033a5444fbe30b6c72de7a8404ff60f1aa..4d8c3a4c738becc95b65c66dc702f31902ebefb4 100644
|
| --- a/webrtc/media/base/mediachannel.h
|
| +++ b/webrtc/media/base/mediachannel.h
|
| @@ -694,7 +694,11 @@ struct VideoSenderInfo : public MediaSenderInfo {
|
| frames_encoded(0) {}
|
|
|
| std::vector<SsrcGroup> ssrc_groups;
|
| + // TODO(hbos): Move this to |VideoMediaInfo::send_codecs|?
|
| std::string encoder_implementation_name;
|
| + // TODO(hbos): Move this to |MediaSenderInfo| when supported by
|
| + // |VoiceSenderInfo| as well (which also extends that class).
|
| + rtc::Optional<uint32_t> codec_payload_type;
|
| int packets_cached;
|
| int firs_rcvd;
|
| int plis_rcvd;
|
| @@ -738,7 +742,11 @@ struct VideoReceiverInfo : public MediaReceiverInfo {
|
| }
|
|
|
| std::vector<SsrcGroup> ssrc_groups;
|
| + // TODO(hbos): Move this to |VideoMediaInfo::receive_codecs|?
|
| std::string decoder_implementation_name;
|
| + // TODO(hbos): Move this to |MediaReceiverInfo| when supported by
|
| + // |VoiceReceiverInfo| as well (which also extends that class).
|
| + rtc::Optional<uint32_t> codec_payload_type;
|
| int packets_concealed;
|
| int firs_sent;
|
| int plis_sent;
|
| @@ -814,6 +822,9 @@ struct BandwidthEstimationInfo {
|
| int64_t bucket_delay;
|
| };
|
|
|
| +// Maps from payload type to |RtpCodecParameters|.
|
| +typedef std::map<int, webrtc::RtpCodecParameters> RtpCodecParametersMap;
|
| +
|
| struct VoiceMediaInfo {
|
| void Clear() {
|
| senders.clear();
|
| @@ -828,10 +839,14 @@ struct VideoMediaInfo {
|
| senders.clear();
|
| receivers.clear();
|
| bw_estimations.clear();
|
| + send_codecs.clear();
|
| + receive_codecs.clear();
|
| }
|
| std::vector<VideoSenderInfo> senders;
|
| std::vector<VideoReceiverInfo> receivers;
|
| std::vector<BandwidthEstimationInfo> bw_estimations;
|
| + RtpCodecParametersMap send_codecs;
|
| + RtpCodecParametersMap receive_codecs;
|
| };
|
|
|
| struct DataMediaInfo {
|
|
|