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

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-04-29 09:25:08 +08:00
commit ae6d0a5ab1
9 changed files with 149 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_config.cpp
View file

@ -2570,7 +2570,7 @@ bool SrsConfig::get_vhost_is_edge(SrsConfDirective* vhost)
return SRS_CONF_DEFAULT_EDGE_MODE;
}
return SRS_CONF_PERFER_FALSE(conf->arg0());
return conf->arg0() == "remote";
}
SrsConfDirective* SrsConfig::get_vhost_edge_origin(string vhost)

16
trunk/src/app/srs_app_hls.cpp
View file

@ -170,10 +170,13 @@ void SrsHlsSegment::update_duration(int64_t current_frame_dts)
return;
}
SrsDvrAsyncCallOnHls::SrsDvrAsyncCallOnHls(SrsRequest* r, string p, int s, double d)
SrsDvrAsyncCallOnHls::SrsDvrAsyncCallOnHls(SrsRequest* r, string p, string t, string m, string mu, int s, double d)
{
req = r;
path = p;
ts_url = t;
m3u8 = m;
m3u8_url = mu;
seq_no = s;
duration = d;
}
@ -200,7 +203,7 @@ int SrsDvrAsyncCallOnHls::call()
int sn = seq_no;
for (int i = 0; i < (int)on_hls->args.size(); i++) {
std::string url = on_hls->args.at(i);
if ((ret = SrsHttpHooks::on_hls(url, req, file, sn, duration)) != ERROR_SUCCESS) {
if ((ret = SrsHttpHooks::on_hls(url, req, file, ts_url, m3u8, m3u8_url, sn, duration)) != ERROR_SUCCESS) {
srs_error("hook client on_hls failed. url=%s, ret=%d", url.c_str(), ret);
return ret;
}
@ -361,8 +364,8 @@ int SrsHlsMuxer::update_config(SrsRequest* r, string entry_prefix,
deviation_ts = 0;
// generate the m3u8 dir and path.
m3u8 = path + "/" + m3u8_file;
m3u8 = srs_path_build_stream(m3u8, req->vhost, req->app, req->stream);
m3u8_url = srs_path_build_stream(m3u8_file, req->vhost, req->app, req->stream);
m3u8 = path + "/" + m3u8_url;
// we always keep the target duration increasing.
int max_td = srs_max(target_duration, (int)(fragment * _srs_config->get_hls_td_ratio(r->vhost)));
@ -664,7 +667,10 @@ int SrsHlsMuxer::segment_close(string log_desc)
segments.push_back(current);
// use async to call the http hooks, for it will cause thread switch.
if ((ret = async->call(new SrsDvrAsyncCallOnHls(req, current->full_path, current->sequence_no, current->duration))) != ERROR_SUCCESS) {
if ((ret = async->call(new SrsDvrAsyncCallOnHls(req,
current->full_path, current->uri, m3u8, m3u8_url,
current->sequence_no, current->duration))) != ERROR_SUCCESS)
{
return ret;
}

6
trunk/src/app/srs_app_hls.hpp
View file

@ -163,11 +163,14 @@ class SrsDvrAsyncCallOnHls : public ISrsDvrAsyncCall
{
private:
std::string path;
std::string ts_url;
std::string m3u8;
std::string m3u8_url;
int seq_no;
SrsRequest* req;
double duration;
public:
SrsDvrAsyncCallOnHls(SrsRequest* r, std::string p, int s, double d);
SrsDvrAsyncCallOnHls(SrsRequest* r, std::string p, std::string t, std::string m, std::string mu, int s, double d);
virtual ~SrsDvrAsyncCallOnHls();
public:
virtual int call();
@ -227,6 +230,7 @@ private:
int _sequence_no;
int target_duration;
std::string m3u8;
std::string m3u8_url;
private:
ISrsHlsHandler* handler;
// TODO: FIXME: supports reload.

5
trunk/src/app/srs_app_http_hooks.cpp
View file

@ -292,7 +292,7 @@ int SrsHttpHooks::on_dvr(string url, SrsRequest* req, string file)
return ret;
}
int SrsHttpHooks::on_hls(string url, SrsRequest* req, string file, int sn, double duration)
int SrsHttpHooks::on_hls(string url, SrsRequest* req, string file, string ts_url, string m3u8, string m3u8_url, int sn, double duration)
{
int ret = ERROR_SUCCESS;
@ -310,6 +310,9 @@ int SrsHttpHooks::on_hls(string url, SrsRequest* req, string file, int sn, doubl
<< SRS_JFIELD_ORG("duration", duration) << SRS_JFIELD_CONT
<< SRS_JFIELD_STR("cwd", cwd) << SRS_JFIELD_CONT
<< SRS_JFIELD_STR("file", file) << SRS_JFIELD_CONT
<< SRS_JFIELD_STR("url", ts_url) << SRS_JFIELD_CONT
<< SRS_JFIELD_STR("m3u8", m3u8) << SRS_JFIELD_CONT
<< SRS_JFIELD_STR("m3u8_url", m3u8_url) << SRS_JFIELD_CONT
<< SRS_JFIELD_ORG("seq_no", sn)
<< SRS_JOBJECT_END;

5
trunk/src/app/srs_app_http_hooks.hpp
View file

@ -101,10 +101,13 @@ public:
* @param url the api server url, to process the event.
* ignore if empty.
* @param file the ts file path, can be relative or absolute path.
* @param ts_url the ts url, which used for m3u8.
* @param m3u8 the m3u8 file path, can be relative or absolute path.
* @param m3u8_url the m3u8 url, which is used for the http mount path.
* @param sn the seq_no, the sequence number of ts in hls/m3u8.
* @param duration the segment duration in seconds.
*/
static int on_hls(std::string url, SrsRequest* req, std::string file, int sn, double duration);
static int on_hls(std::string url, SrsRequest* req, std::string file, std::string ts_url, std::string m3u8, std::string m3u8_url, int sn, double duration);
/**
* when hls reap segment, callback.
* @param url the api server url, to process the event.

49
trunk/src/main/srs_main_ingest_hls.cpp
View file

@ -48,9 +48,6 @@ using namespace std;
#include <srs_rtmp_amf0.hpp>
#include <srs_raw_avc.hpp>
// the retry timeout in ms.
#define SRS_INGEST_HLS_ERROR_RETRY_MS 3000
// pre-declare
int proxy_hls2rtmp(std::string hls, std::string rtmp);
@ -217,7 +214,7 @@ private:
/**
* fetch all ts body.
*/
virtual void fetch_all_ts(bool fresh_m3u8);
virtual int fetch_all_ts(bool fresh_m3u8);
/**
* remove all ts which is dirty.
*/
@ -245,7 +242,10 @@ int SrsIngestSrsInput::connect()
}
// fetch all ts.
fetch_all_ts(fresh_m3u8);
if ((ret = fetch_all_ts(fresh_m3u8)) != ERROR_SUCCESS) {
srs_error("fetch all ts failed. ret=%d", ret);
return ret;
}
// remove all dirty ts.
remove_dirty();
@ -304,14 +304,8 @@ int SrsIngestSrsInput::parseTs(ISrsTsHandler* handler, char* body, int nb_body)
// process each ts packet
if ((ret = context->decode(stream, handler)) != ERROR_SUCCESS) {
// when peer closed, must interrupt parse and reconnect.
if (srs_is_client_gracefully_close(ret)) {
srs_warn("interrupt parse for peer closed. ret=%d", ret);
return ret;
}
srs_warn("mpegts: ignore parse ts packet failed. ret=%d", ret);
continue;
srs_error("mpegts: ignore parse ts packet failed. ret=%d", ret);
return ret;
}
srs_info("mpegts: parse ts packet completed");
}
@ -536,7 +530,7 @@ void SrsIngestSrsInput::dirty_all_ts()
}
}
void SrsIngestSrsInput::fetch_all_ts(bool fresh_m3u8)
int SrsIngestSrsInput::fetch_all_ts(bool fresh_m3u8)
{
int ret = ERROR_SUCCESS;
@ -555,9 +549,9 @@ void SrsIngestSrsInput::fetch_all_ts(bool fresh_m3u8)
}
if ((ret = tp->fetch(in_hls->get_url())) != ERROR_SUCCESS) {
srs_warn("ignore ts %s for error. ret=%d", tp->url.c_str(), ret);
srs_error("fetch ts %s for error. ret=%d", tp->url.c_str(), ret);
tp->skip = true;
continue;
return ret;
}
// only wait for a duration of last piece.
@ -565,6 +559,8 @@ void SrsIngestSrsInput::fetch_all_ts(bool fresh_m3u8)
next_connect_time = srs_update_system_time_ms() + (int)tp->duration * 1000;
}
}
return ret;
}
@ -779,10 +775,6 @@ int SrsIngestSrsOutput::on_ts_message(SrsTsMessage* msg)
// we must use queue to cache the msg, then parse it if possible.
queue.insert(std::make_pair(msg->dts, msg->detach()));
if ((ret = parse_message_queue()) != ERROR_SUCCESS) {
// when peer closed, close the output and reconnect.
if (srs_is_client_gracefully_close(ret)) {
close();
}
return ret;
}
@ -1204,6 +1196,7 @@ int SrsIngestSrsOutput::rtmp_write_packet(char type, u_int32_t timestamp, char*
// send out encoded msg.
if ((ret = client->send_and_free_message(msg, stream_id)) != ERROR_SUCCESS) {
srs_error("send RTMP type=%d, dts=%d, size=%d failed. ret=%d", type, timestamp, size, ret);
return ret;
}
@ -1355,22 +1348,22 @@ public:
int ret = ERROR_SUCCESS;
if ((ret = ic->connect()) != ERROR_SUCCESS) {
srs_warn("connect oc failed. ret=%d", ret);
srs_error("connect oc failed. ret=%d", ret);
return ret;
}
if ((ret = oc->connect()) != ERROR_SUCCESS) {
srs_warn("connect ic failed. ret=%d", ret);
srs_error("connect ic failed. ret=%d", ret);
return ret;
}
if ((ret = ic->parse(oc, oc)) != ERROR_SUCCESS) {
srs_warn("proxy ts to rtmp failed. ret=%d", ret);
srs_error("proxy ts to rtmp failed. ret=%d", ret);
return ret;
}
if ((ret = oc->flush_message_queue()) != ERROR_SUCCESS) {
srs_warn("flush oc message failed. ret=%d", ret);
srs_error("flush oc message failed. ret=%d", ret);
return ret;
}
@ -1400,12 +1393,10 @@ int proxy_hls2rtmp(string hls, string rtmp)
SrsIngestSrsContext context(&hls_uri, &rtmp_uri);
for (;;) {
if ((ret = context.proxy()) == ERROR_SUCCESS) {
continue;
if ((ret = context.proxy()) != ERROR_SUCCESS) {
srs_error("proxy hls to rtmp failed. ret=%d", ret);
return ret;
}
srs_warn("proxy hls to rtmp failed. ret=%d", ret);
st_usleep(SRS_INGEST_HLS_ERROR_RETRY_MS * 1000);
}
return ret;