1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

support live flashP2P(integrated by chnvideo VDN). 0.9.75

This commit is contained in:
winlin 2014-04-24 16:32:19 +08:00
parent b276714573
commit 67e1988b81
11 changed files with 164 additions and 62 deletions

View file

@ -459,7 +459,7 @@ void SrsHttpHooks::on_stop(string url, int client_id, string ip, SrsRequest* req
return;
}
void SrsHttpHooks::on_dvr_keyframe(string url, SrsRequest* req, SrsFlvSegment* segment)
void SrsHttpHooks::on_dvr_reap_flv(string url, SrsRequest* req, SrsFlvSegment* segment)
{
int ret = ERROR_SUCCESS;
@ -471,23 +471,24 @@ void SrsHttpHooks::on_dvr_keyframe(string url, SrsRequest* req, SrsFlvSegment* s
SrsHttpUri uri;
if ((ret = uri.initialize(url)) != ERROR_SUCCESS) {
srs_warn("http uri parse on_dvr_keyframe url failed, ignored. "
srs_warn("http uri parse on_dvr_reap_flv url failed, ignored. "
"url=%s, ret=%d", url.c_str(), ret);
return;
}
std::stringstream ss;
ss << JOBJECT_START
<< JFIELD_STR("action", "on_dvr_keyframe") << JFIELD_CONT
<< JFIELD_STR("action", "on_dvr_reap_flv") << JFIELD_CONT
<< JFIELD_STR("vhost", req->vhost) << JFIELD_CONT
<< JFIELD_STR("app", req->app) << JFIELD_CONT
<< JFIELD_STR("stream", req->stream) << JFIELD_CONT
<< JFIELD_NAME("segment") << JOBJECT_START
<< JFIELD_STR("cwd", _srs_config->get_cwd()) << JFIELD_CONT
<< JFIELD_STR("path", segment->path) << JFIELD_CONT
<< JFIELD_ORG("pts", segment->stream_starttime + segment->starttime) << JFIELD_CONT
<< JFIELD_ORG("duration", segment->duration) << JFIELD_CONT
<< JFIELD_ORG("offset", 0)
<< JFIELD_ORG("offset", segment->sequence_header_offset) << JFIELD_CONT
<< JFIELD_ORG("has_keyframe", (segment->has_keyframe? "true":"false")) << JFIELD_CONT
<< JFIELD_ORG("pts", segment->stream_starttime + segment->starttime)
<< JOBJECT_END
<< JOBJECT_END;
std::string data = ss.str();
@ -495,7 +496,7 @@ void SrsHttpHooks::on_dvr_keyframe(string url, SrsRequest* req, SrsFlvSegment* s
SrsHttpClient http;
if ((ret = http.post(&uri, data, res)) != ERROR_SUCCESS) {
srs_warn("http post on_dvr_keyframe uri failed, ignored. "
srs_warn("http post on_dvr_reap_flv uri failed, ignored. "
"url=%s, request=%s, response=%s, ret=%d",
url.c_str(), data.c_str(), res.c_str(), ret);
return;
@ -503,12 +504,12 @@ void SrsHttpHooks::on_dvr_keyframe(string url, SrsRequest* req, SrsFlvSegment* s
if (res.empty() || res != SRS_HTTP_RESPONSE_OK) {
ret = ERROR_HTTP_DATA_INVLIAD;
srs_warn("http hook on_dvr_keyframe validate failed, ignored. "
srs_warn("http hook on_dvr_reap_flv validate failed, ignored. "
"res=%s, ret=%d", res.c_str(), ret);
return;
}
srs_info("http hook on_dvr_keyframe success. "
srs_info("http hook on_dvr_reap_flv success. "
"url=%s, request=%s, response=%s, ret=%d",
url.c_str(), data.c_str(), res.c_str(), ret);