support webrtc-datachannel sdp exchange

trunk/src/app/srs_app_rtc_api.cpp

@@ -534,11 +534,16 @@ srs_error_t SrsGoApiRtcPublish::check_remote_sdp(const SrsSdp& remote_sdp)
  }
 
  for (std::vector<SrsMediaDesc>::const_iterator iter = remote_sdp.media_descs_.begin(); iter != remote_sdp.media_descs_.end(); ++iter) {
+ // donot need check "application"
+ if (iter->type_ == "application") {
+ continue;
+ }
+
  if (iter->type_ != "audio" && iter->type_ != "video") {
  return srs_error_new(ERROR_RTC_SDP_EXCHANGE, "unsupport media type=%s", iter->type_.c_str());
  }
 
- if (! iter->rtcp_mux_) {
+ if (!iter->rtcp_mux_) {
  return srs_error_new(ERROR_RTC_SDP_EXCHANGE, "now only suppor rtcp-mux");
  }
 

trunk/src/app/srs_app_rtc_conn.cpp

@@ -2799,6 +2799,11 @@ srs_error_t SrsRtcConnection::negotiate_publish_capability(SrsRtcUserConfig* ruc
 
  // TODO: FIXME: Support RRTR?
  //local_media_desc.payload_types_.back().rtcp_fb_.push_back("rrtr");
+ } else if (remote_media_desc.is_application()) {
+ track_desc->type_ = "application";
+ stream_desc->application_track_desc_ = track_desc->copy();
+ // the "application" have NOT media and ssrc, so we just copy it
+ continue;
  }
 
  // Error if track desc is invalid, that is failed to match SDP, for example, we require H264 but no H264 found.
@@ -2895,6 +2900,10 @@ srs_error_t SrsRtcConnection::generate_publish_local_sdp(SrsRequest* req, SrsSdp
  }
  }
 
+ if ((err = generate_publish_local_sdp_for_application(local_sdp, stream_desc)) != srs_success) {
+ return srs_error_wrap(err, "application");
+ }
+
  return err;
 }
 
@@ -2939,6 +2948,29 @@ srs_error_t SrsRtcConnection::generate_publish_local_sdp_for_audio(SrsSdp& local
  return err;
 }
 
+srs_error_t SrsRtcConnection::generate_publish_local_sdp_for_application(SrsSdp& local_sdp, SrsRtcSourceDescription* stream_desc)
+{
+ srs_error_t err = srs_success;
+
+ // generate application desc
+ if (stream_desc->application_track_desc_) {
+ SrsRtcTrackDescription* app_track = stream_desc->application_track_desc_;
+
+ local_sdp.media_descs_.push_back(SrsMediaDesc("application"));
+ SrsMediaDesc& local_media_desc = local_sdp.media_descs_.back();
+
+ local_media_desc.port_ = 9;
+ local_media_desc.protos_ = "UDP/DTLS/SCTP";
+
+ local_media_desc.mid_ = app_track->mid_;
+ local_sdp.groups_.push_back(local_media_desc.mid_);
+
+ local_media_desc.extmaps_ = app_track->extmaps_;
+ }
+
+ return err;
+}
+
 srs_error_t SrsRtcConnection::generate_publish_local_sdp_for_video(SrsSdp& local_sdp, SrsRtcSourceDescription* stream_desc, bool unified_plan)
 {
  srs_error_t err = srs_success;

trunk/src/app/srs_app_rtc_conn.hpp

@@ -543,6 +543,7 @@ class SrsRtcConnection : public ISrsResource, public ISrsDisposingHandler, publi
  srs_error_t generate_publish_local_sdp(SrsRequest* req, SrsSdp& local_sdp, SrsRtcSourceDescription* stream_desc, bool unified_plan, bool audio_before_video);
  srs_error_t generate_publish_local_sdp_for_audio(SrsSdp& local_sdp, SrsRtcSourceDescription* stream_desc);
  srs_error_t generate_publish_local_sdp_for_video(SrsSdp& local_sdp, SrsRtcSourceDescription* stream_desc, bool unified_plan);
+ srs_error_t generate_publish_local_sdp_for_application(SrsSdp& local_sdp, SrsRtcSourceDescription* stream_desc);
  // play media capabilitiy negotiate
  //TODO: Use StreamDescription to negotiate and remove first negotiate_play_capability function
  srs_error_t negotiate_play_capability(SrsRtcUserConfig* ruc, std::map<uint32_t, SrsRtcTrackDescription*>& sub_relations);

trunk/src/app/srs_app_rtc_sdp.cpp

@@ -390,6 +390,10 @@ srs_error_t SrsMediaDesc::encode(std::ostringstream& os)
  os << " " << iter->payload_type_;
  }
 
+ if (is_application()) {
+ os << " webrtc-datachannel";
+ }
+
  os << kCRLF;
 
  // TODO:nettype and address type

trunk/src/app/srs_app_rtc_sdp.hpp

@@ -140,6 +140,7 @@ class SrsMediaDesc
 
  bool is_audio() const { return type_ == "audio"; }
  bool is_video() const { return type_ == "video"; }
+ bool is_application() const { return type_ == "application"; }
 private:
  srs_error_t parse_attribute(const std::string& content);
  srs_error_t parse_attr_rtpmap(const std::string& value);

trunk/src/app/srs_app_rtc_source.cpp

@@ -2269,11 +2269,13 @@ SrsRtcTrackDescription* SrsRtcTrackDescription::copy()
 SrsRtcSourceDescription::SrsRtcSourceDescription()
 {
  audio_track_desc_ = NULL;
+ application_track_desc_ = NULL;
 }
 
 SrsRtcSourceDescription::~SrsRtcSourceDescription()
 {
  srs_freep(audio_track_desc_);
+ srs_freep(application_track_desc_);
 
  for (int i = 0; i < (int)video_track_descs_.size(); ++i) {
  srs_freep(video_track_descs_.at(i));
@@ -2289,6 +2291,10 @@ SrsRtcSourceDescription* SrsRtcSourceDescription::copy()
  stream_desc->audio_track_desc_ = audio_track_desc_->copy();
  }
 
+ if (application_track_desc_) {
+ stream_desc->application_track_desc_ = application_track_desc_->copy();
+ }
+
  for (int i = 0; i < (int)video_track_descs_.size(); ++i) {
  stream_desc->video_track_descs_.push_back(video_track_descs_.at(i)->copy());
  }
@@ -2302,6 +2308,10 @@ SrsRtcTrackDescription* SrsRtcSourceDescription::find_track_description_by_ssrc(
  return audio_track_desc_;
  }
 
+ if (application_track_desc_ && application_track_desc_->has_ssrc(ssrc)) {
+ return application_track_desc_;
+ }
+
  for (int i = 0; i < (int)video_track_descs_.size(); ++i) {
  if (video_track_descs_.at(i)->has_ssrc(ssrc)) {
  return video_track_descs_.at(i);

trunk/src/app/srs_app_rtc_source.hpp

@@ -497,6 +497,7 @@ class SrsRtcSourceDescription
 
  SrsRtcTrackDescription* audio_track_desc_;
  std::vector<SrsRtcTrackDescription*> video_track_descs_;
+ SrsRtcTrackDescription* application_track_desc_;
 public:
  SrsRtcSourceDescription();
  virtual ~SrsRtcSourceDescription();