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

Remove rtp data channel related code from media_channel.*

Browse Source 
Bug: webrtc:6625
Change-Id: Iede5a348330f3fbbd6a13a88d02bfc82171adb8a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/215402
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33763}
This commit is contained in:
Tomas Gunnarsson
2021-04-16 19:13:12 +02:00
committed by Commit Bot
parent 18ac30c243
commit e6324029a2
2 changed files with 0 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
media/base/media_channel.cc
View File

@ -78,9 +78,6 @@ VoiceMediaInfo::~VoiceMediaInfo() = default;
VideoMediaInfo::VideoMediaInfo() = default;
VideoMediaInfo::~VideoMediaInfo() = default;
DataMediaInfo::DataMediaInfo() = default;
DataMediaInfo::~DataMediaInfo() = default;
AudioSendParameters::AudioSendParameters() = default;
AudioSendParameters::~AudioSendParameters() = default;
@ -107,31 +104,4 @@ cricket::MediaType VideoMediaChannel::media_type() const {
return cricket::MediaType::MEDIA_TYPE_VIDEO;
}
DataMediaChannel::DataMediaChannel() = default;
DataMediaChannel::DataMediaChannel(const MediaConfig& config)
: MediaChannel(config) {}
DataMediaChannel::~DataMediaChannel() = default;
webrtc::RtpParameters DataMediaChannel::GetRtpSendParameters(
uint32_t ssrc) const {
// GetRtpSendParameters is not supported for DataMediaChannel.
RTC_NOTREACHED();
return webrtc::RtpParameters();
}
webrtc::RTCError DataMediaChannel::SetRtpSendParameters(
uint32_t ssrc,
const webrtc::RtpParameters& parameters) {
// SetRtpSendParameters is not supported for DataMediaChannel.
RTC_NOTREACHED();
return webrtc::RTCError(webrtc::RTCErrorType::UNSUPPORTED_OPERATION);
}
cricket::MediaType DataMediaChannel::media_type() const {
return cricket::MediaType::MEDIA_TYPE_DATA;
}
bool DataMediaChannel::GetStats(DataMediaInfo* info) {
return true;
}
} // namespace cricket

59
media/base/media_channel.h
View File

@ -676,14 +676,6 @@ struct VideoReceiverInfo : public MediaReceiverInfo {
absl::optional<webrtc::TimingFrameInfo> timing_frame_info;
};
struct DataSenderInfo : public MediaSenderInfo {
uint32_t ssrc = 0;
};
struct DataReceiverInfo : public MediaReceiverInfo {
uint32_t ssrc = 0;
};
struct BandwidthEstimationInfo {
int available_send_bandwidth = 0;
int available_recv_bandwidth = 0;
@ -737,17 +729,6 @@ struct VideoMediaInfo {
RtpCodecParametersMap receive_codecs;
};
struct DataMediaInfo {
DataMediaInfo();
~DataMediaInfo();
void Clear() {
senders.clear();
receivers.clear();
}
std::vector<DataSenderInfo> senders;
std::vector<DataReceiverInfo> receivers;
};
struct RtcpParameters {
bool reduced_size = false;
bool remote_estimate = false;
@ -990,46 +971,6 @@ struct SendDataParams {
enum SendDataResult { SDR_SUCCESS, SDR_ERROR, SDR_BLOCK };
struct DataSendParameters : RtpSendParameters<DataCodec> {};
struct DataRecvParameters : RtpParameters<DataCodec> {};
class DataMediaChannel : public MediaChannel {
public:
DataMediaChannel();
explicit DataMediaChannel(const MediaConfig& config);
~DataMediaChannel() override;
cricket::MediaType media_type() const override;
virtual bool SetSendParameters(const DataSendParameters& params) = 0;
virtual bool SetRecvParameters(const DataRecvParameters& params) = 0;
// RtpParameter methods are not supported for Data channel.
webrtc::RtpParameters GetRtpSendParameters(uint32_t ssrc) const override;
webrtc::RTCError SetRtpSendParameters(
uint32_t ssrc,
const webrtc::RtpParameters& parameters) override;
// TODO(pthatcher): Implement this.
virtual bool GetStats(DataMediaInfo* info);
virtual bool SetSend(bool send) = 0;
virtual bool SetReceive(bool receive) = 0;
void OnNetworkRouteChanged(const std::string& transport_name,
const rtc::NetworkRoute& network_route) override {}
virtual bool SendData(const SendDataParams& params,
const rtc::CopyOnWriteBuffer& payload,
SendDataResult* result = NULL) = 0;
// Signals when data is received (params, data, len)
sigslot::signal3<const ReceiveDataParams&, const char*, size_t>
SignalDataReceived;
// Signal when the media channel is ready to send the stream. Arguments are:
// writable(bool)
sigslot::signal1<bool> SignalReadyToSend;
};
} // namespace cricket
#endif // MEDIA_BASE_MEDIA_CHANNEL_H_