diff --git a/trunk/src/app/srs_app_rtc_api.cpp b/trunk/src/app/srs_app_rtc_api.cpp index 3a5791cb2..52c78cf45 100644 --- a/trunk/src/app/srs_app_rtc_api.cpp +++ b/trunk/src/app/srs_app_rtc_api.cpp @@ -195,6 +195,8 @@ srs_error_t SrsGoApiRtcPlay::do_serve_http(ISrsHttpResponseWriter* w, ISrsHttpMe } string local_sdp_str = os.str(); + // Filter the \r\n to \\r\\n for JSON. + local_sdp_str = srs_string_replace(local_sdp_str.c_str(), "\r\n", "\\r\\n"); res->set("code", SrsJsonAny::integer(ERROR_SUCCESS)); res->set("server", SrsJsonAny::integer(SrsStatistic::instance()->server_id())); @@ -207,7 +209,7 @@ srs_error_t SrsGoApiRtcPlay::do_serve_http(ISrsHttpResponseWriter* w, ISrsHttpMe srs_trace("RTC username=%s, offer=%dB, answer=%dB", session->username().c_str(), remote_sdp_str.length(), local_sdp_str.length()); srs_trace("RTC remote offer: %s", srs_string_replace(remote_sdp_str.c_str(), "\r\n", "\\r\\n").c_str()); - srs_trace("RTC local answer: %s", srs_string_replace(local_sdp_str.c_str(), "\r\n", "\\r\\n").c_str()); + srs_trace("RTC local answer: %s", local_sdp_str.c_str()); return err; } @@ -545,6 +547,8 @@ srs_error_t SrsGoApiRtcPublish::do_serve_http(ISrsHttpResponseWriter* w, ISrsHtt } string local_sdp_str = os.str(); + // Filter the \r\n to \\r\\n for JSON. + local_sdp_str = srs_string_replace(local_sdp_str.c_str(), "\r\n", "\\r\\n"); res->set("code", SrsJsonAny::integer(ERROR_SUCCESS)); res->set("server", SrsJsonAny::integer(SrsStatistic::instance()->server_id())); @@ -557,7 +561,7 @@ srs_error_t SrsGoApiRtcPublish::do_serve_http(ISrsHttpResponseWriter* w, ISrsHtt srs_trace("RTC username=%s, offer=%dB, answer=%dB", session->username().c_str(), remote_sdp_str.length(), local_sdp_str.length()); srs_trace("RTC remote offer: %s", srs_string_replace(remote_sdp_str.c_str(), "\r\n", "\\r\\n").c_str()); - srs_trace("RTC local answer: %s", srs_string_replace(local_sdp_str.c_str(), "\r\n", "\\r\\n").c_str()); + srs_trace("RTC local answer: %s", local_sdp_str.c_str()); return err; } diff --git a/trunk/src/app/srs_app_rtc_sdp.cpp b/trunk/src/app/srs_app_rtc_sdp.cpp index b5b942675..86fd5a2fd 100644 --- a/trunk/src/app/srs_app_rtc_sdp.cpp +++ b/trunk/src/app/srs_app_rtc_sdp.cpp @@ -34,7 +34,7 @@ using namespace std; #include // TODO: FIXME: Maybe we should use json.encode to escape it? -const std::string kCRLF = "\\r\\n"; +const std::string kCRLF = "\r\n"; #define FETCH(is,word) \ if (!(is >> word)) {\