diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 691b42799..b1e852c99 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -2368,7 +2368,6 @@ srs_error_t SrsRtcConnection::negotiate_publish_capability(SrsRequest* req, cons track_desc->create_auxiliary_payload(remote_media_desc.find_media_with_encoding_name("red")); track_desc->create_auxiliary_payload(remote_media_desc.find_media_with_encoding_name("rtx")); track_desc->create_auxiliary_payload(remote_media_desc.find_media_with_encoding_name("ulpfec")); - track_desc->create_auxiliary_payload(remote_media_desc.find_media_with_encoding_name("rsfec")); std::string track_id; for (int i = 0; i < remote_media_desc.ssrc_infos_.size(); ++i) { @@ -2583,12 +2582,6 @@ srs_error_t SrsRtcConnection::negotiate_play_capability(SrsRequest* req, const S srs_freep(track->ulpfec_); track->fec_ssrc_ = 0; } - // TODO: FIXME: if we support downlink , MUST assign fec_ssrc_ - // set_rsfec_config; - if (true) { - srs_freep(track->rsfec_); - track->fec_ssrc_ = 0; - } track->set_direction("sendonly"); sub_relations.insert(make_pair(publish_ssrc, track)); @@ -2648,11 +2641,6 @@ srs_error_t SrsRtcConnection::fetch_source_capability(SrsRequest* req, std::map< // set_ulpfec_config; srs_freep(track->ulpfec_); track->fec_ssrc_ = 0; - - // TODO: FIXME: if we support downlink , MUST assign fec_ssrc_ - // set_rsfec_config; - srs_freep(track->rsfec_); - track->fec_ssrc_ = 0; track->set_direction("sendonly"); sub_relations.insert(make_pair(publish_ssrc, track)); @@ -2718,7 +2706,7 @@ srs_error_t SrsRtcConnection::generate_play_local_sdp(SrsRequest* req, SrsSdp& l SrsAudioPayload* payload = (SrsAudioPayload*)audio_track->media_; local_media_desc.payload_types_.push_back(payload->generate_media_payload_type()); - //TODO: FIXME: add red, rtx, ulpfec, rsfec..., payload_types_. + //TODO: FIXME: add red, rtx, ulpfec..., payload_types_. //local_media_desc.payload_types_.push_back(payload->generate_media_payload_type()); local_media_desc.ssrc_infos_.push_back(SrsSSRCInfo(audio_track->ssrc_, cname, stream_id, audio_track->id_)); @@ -2732,7 +2720,7 @@ srs_error_t SrsRtcConnection::generate_play_local_sdp(SrsRequest* req, SrsSdp& l local_media_desc.ssrc_infos_.push_back(SrsSSRCInfo(audio_track->rtx_ssrc_, cname, stream_id, audio_track->id_)); } - if (audio_track->ulpfec_ || audio_track->rsfec_) { + if (audio_track->ulpfec_) { std::vector group_ssrcs; group_ssrcs.push_back(audio_track->ssrc_); group_ssrcs.push_back(audio_track->fec_ssrc_); @@ -2787,7 +2775,7 @@ srs_error_t SrsRtcConnection::generate_play_local_sdp(SrsRequest* req, SrsSdp& l local_media_desc.ssrc_infos_.push_back(SrsSSRCInfo(track->rtx_ssrc_, cname, stream_id, track->id_)); } - if ((track->ulpfec_ || track->rsfec_) && track->fec_ssrc_) { + if (track->ulpfec_ && track->fec_ssrc_) { std::vector group_ssrcs; group_ssrcs.push_back(track->ssrc_); group_ssrcs.push_back(track->fec_ssrc_); diff --git a/trunk/src/app/srs_app_rtc_source.cpp b/trunk/src/app/srs_app_rtc_source.cpp index 169ee1024..31d4f6e65 100644 --- a/trunk/src/app/srs_app_rtc_source.cpp +++ b/trunk/src/app/srs_app_rtc_source.cpp @@ -1260,7 +1260,6 @@ SrsRtcTrackDescription::SrsRtcTrackDescription() red_ = NULL; rtx_ = NULL; ulpfec_ = NULL; - rsfec_ = NULL; } SrsRtcTrackDescription::~SrsRtcTrackDescription() @@ -1269,7 +1268,6 @@ SrsRtcTrackDescription::~SrsRtcTrackDescription() srs_freep(red_); srs_freep(rtx_); srs_freep(ulpfec_); - srs_freep(rsfec_); } bool SrsRtcTrackDescription::has_ssrc(uint32_t ssrc) @@ -1311,9 +1309,6 @@ void SrsRtcTrackDescription::create_auxiliary_payload(const std::vectorred_ = red_ ? red_->copy():NULL; cp->rtx_ = rtx_ ? rtx_->copy():NULL; cp->ulpfec_ = ulpfec_ ? ulpfec_->copy():NULL; - cp->rsfec_ = rsfec_ ? rsfec_->copy():NULL; return cp; } diff --git a/trunk/src/app/srs_app_rtc_source.hpp b/trunk/src/app/srs_app_rtc_source.hpp index 4caf4d7fc..f23125a24 100644 --- a/trunk/src/app/srs_app_rtc_source.hpp +++ b/trunk/src/app/srs_app_rtc_source.hpp @@ -342,7 +342,6 @@ public: SrsCodecPayload* red_; SrsCodecPayload* rtx_; SrsCodecPayload* ulpfec_; - SrsCodecPayload* rsfec_; public: SrsRtcTrackDescription(); virtual ~SrsRtcTrackDescription(); @@ -355,7 +354,7 @@ public: void add_rtp_extension_desc(int id, std::string uri); void set_direction(std::string direction); void set_codec_payload(SrsCodecPayload* payload); - // auxiliary paylod include red, rtx, ulpfec, rsfec. + // auxiliary paylod include red, rtx, ulpfec. void create_auxiliary_payload(const std::vector payload_types); void set_rtx_ssrc(uint32_t ssrc); void set_fec_ssrc(uint32_t ssrc);