zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MID not always getting set with audio

Browse Source 
Bug: webrtc:4050
Change-Id: I543a9f70c6c7fd10cd177ce16eba6c335db367ec
Reviewed-on: https://webrtc-review.googlesource.com/65020
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Zhi Huang <zhihuang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22681}
This commit is contained in:
Steve Anton
2018-03-29 12:37:21 -07:00
committed by Commit Bot
parent 44c608a7a7
commit 003930a3ce
2 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
audio/audio_send_stream.cc
View File

@ -263,8 +263,9 @@ void AudioSendStream::ConfigureStream(
}
// MID RTP header extension.
if ((first_time || new_ids.mid != old_ids.mid) && new_ids.mid != 0 &&
!new_config.rtp.mid.empty()) {
if ((first_time || new_ids.mid != old_ids.mid ||
new_config.rtp.mid != old_config.rtp.mid) &&
new_ids.mid != 0 && !new_config.rtp.mid.empty()) {
channel_proxy->SetMid(new_config.rtp.mid, new_ids.mid);
}

81
media/base/mediachannel.h
View File

@ -589,56 +589,59 @@ struct RtcpParameters {
template <class Codec>
struct RtpParameters {
virtual std::string ToString() const {
std::ostringstream ost;
ost << "{";
ost << "codecs: " << VectorToString(codecs) << ", ";
ost << "extensions: " << VectorToString(extensions);
ost << "}";
return ost.str();
}
virtual ~RtpParameters() = default;
std::vector<Codec> codecs;
std::vector<webrtc::RtpExtension> extensions;
// TODO(pthatcher): Add streams.
RtcpParameters rtcp;
virtual ~RtpParameters() = default;
std::string ToString() const {
std::ostringstream ost;
ost << "{";
const char* separator = "";
for (const auto& entry : ToStringMap()) {
ost << separator << entry.first << ": " << entry.second;
separator = ", ";
}
ost << "}";
return ost.str();
}
protected:
virtual std::map<std::string, std::string> ToStringMap() const {
return {{"codecs", VectorToString(codecs)},
{"extensions", VectorToString(extensions)}};
}
};
// TODO(deadbeef): Rename to RtpSenderParameters, since they're intended to
// encapsulate all the parameters needed for an RtpSender.
template <class Codec>
struct RtpSendParameters : RtpParameters<Codec> {
std::string ToString() const override {
std::ostringstream ost;
ost << "{";
ost << "codecs: " << VectorToString(this->codecs) << ", ";
ost << "extensions: " << VectorToString(this->extensions) << ", ";
ost << "max_bandwidth_bps: " << max_bandwidth_bps << ", ";
ost << "mid: " << (mid.empty() ? "<not set>" : mid) << ", ";
ost << "}";
return ost.str();
}
int max_bandwidth_bps = -1;
// This is the value to be sent in the MID RTP header extension (if the header
// extension in included in the list of extensions).
std::string mid;
protected:
std::map<std::string, std::string> ToStringMap() const override {
auto params = RtpParameters<Codec>::ToStringMap();
params["max_bandwidth_bps"] = rtc::ToString(max_bandwidth_bps);
params["mid"] = (mid.empty() ? "<not set>" : mid);
return params;
}
};
struct AudioSendParameters : RtpSendParameters<AudioCodec> {
std::string ToString() const override {
std::ostringstream ost;
ost << "{";
ost << "codecs: " << VectorToString(this->codecs) << ", ";
ost << "extensions: " << VectorToString(this->extensions) << ", ";
ost << "max_bandwidth_bps: " << max_bandwidth_bps << ", ";
ost << "options: " << options.ToString();
ost << "}";
return ost.str();
}
AudioOptions options;
protected:
std::map<std::string, std::string> ToStringMap() const override {
auto params = RtpSendParameters<AudioCodec>::ToStringMap();
params["options"] = options.ToString();
return params;
}
};
struct AudioRecvParameters : RtpParameters<AudioCodec> {
@ -704,6 +707,13 @@ struct VideoSendParameters : RtpSendParameters<VideoCodec> {
// WebRtcVideoChannel::WebRtcVideoSendStream::CreateVideoEncoderConfig.
// The special screencast behaviour is disabled by default.
bool conference_mode = false;
protected:
std::map<std::string, std::string> ToStringMap() const override {
auto params = RtpSendParameters<VideoCodec>::ToStringMap();
params["conference_mode"] = (conference_mode ? "yes" : "no");
return params;
}
};
// TODO(deadbeef): Rename to VideoReceiverParameters, since they're intended to
@ -819,15 +829,6 @@ struct SendDataParams {
enum SendDataResult { SDR_SUCCESS, SDR_ERROR, SDR_BLOCK };
struct DataSendParameters : RtpSendParameters<DataCodec> {
std::string ToString() const {
std::ostringstream ost;
// Options and extensions aren't used.
ost << "{";
ost << "codecs: " << VectorToString(codecs) << ", ";
ost << "max_bandwidth_bps: " << max_bandwidth_bps;
ost << "}";
return ost.str();
}
};
struct DataRecvParameters : RtpParameters<DataCodec> {