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

for hls callback, add duration of ts.

Browse source
This commit is contained in:
winlin 2015-04-03 13:46:44 +08:00
parent c4466a8c0c
commit 64b065e450
6 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/conf/full.conf
View file

@ -754,6 +754,7 @@ vhost hooks.callback.srs.com {
# "client_id": 1985, # "client_id": 1985,
# "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
# "stream": "livestream", # "stream": "livestream",
# "duration": 9.36, // in seconds
# "cwd": "/usr/local/srs", # "cwd": "/usr/local/srs",
# "file": "./objs/nginx/html/live/livestream.1420254068776-100.ts", # "file": "./objs/nginx/html/live/livestream.1420254068776-100.ts",
# "seq_no": 100 # "seq_no": 100

9
trunk/research/api-server/server.py
View file

@ -328,8 +328,11 @@ class RESTHls(object):
{ {
"action": "on_dvr", "action": "on_dvr",
"client_id": 1985, "client_id": 1985,
"ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", "ip": "192.168.1.10",
"vhost": "video.test.com",
"app": "live",
"stream": "livestream", "stream": "livestream",
"duration": 9.68, // in seconds
"cwd": "/usr/local/srs", "cwd": "/usr/local/srs",
"file": "./objs/nginx/html/live/livestream.1420254068776-100.ts", "file": "./objs/nginx/html/live/livestream.1420254068776-100.ts",
"seq_no": 100 "seq_no": 100
@ -368,8 +371,8 @@ class RESTHls(object):
def __on_hls(self, req): def __on_hls(self, req):
code = Error.success code = Error.success
trace("srs %s: client id=%s, ip=%s, vhost=%s, app=%s, stream=%s, cwd=%s, file=%s, seq_no=%s"%( trace("srs %s: client id=%s, ip=%s, vhost=%s, app=%s, stream=%s, duration=%s, cwd=%s, file=%s, seq_no=%s"%(
req["action"], req["client_id"], req["ip"], req["vhost"], req["app"], req["stream"], req["action"], req["client_id"], req["ip"], req["vhost"], req["app"], req["stream"], req["duration"],
req["cwd"], req["file"], req["seq_no"] req["cwd"], req["file"], req["seq_no"]
)) ))

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

@ -170,11 +170,12 @@ void SrsHlsSegment::update_duration(int64_t current_frame_dts)
return; return;
} }
SrsDvrAsyncCallOnHls::SrsDvrAsyncCallOnHls(SrsRequest* r, string p, int s) SrsDvrAsyncCallOnHls::SrsDvrAsyncCallOnHls(SrsRequest* r, string p, int s, double d)
{ {
req = r; req = r;
path = p; path = p;
seq_no = s; seq_no = s;
duration = d;
} }
SrsDvrAsyncCallOnHls::~SrsDvrAsyncCallOnHls() SrsDvrAsyncCallOnHls::~SrsDvrAsyncCallOnHls()
@ -199,7 +200,7 @@ int SrsDvrAsyncCallOnHls::call()
int sn = seq_no; int sn = seq_no;
for (int i = 0; i < (int)on_hls->args.size(); i++) { for (int i = 0; i < (int)on_hls->args.size(); i++) {
std::string url = on_hls->args.at(i); std::string url = on_hls->args.at(i);
if ((ret = SrsHttpHooks::on_hls(url, req, file, sn)) != ERROR_SUCCESS) { if ((ret = SrsHttpHooks::on_hls(url, req, file, sn, duration)) != ERROR_SUCCESS) {
srs_error("hook client on_hls failed. url=%s, ret=%d", url.c_str(), ret); srs_error("hook client on_hls failed. url=%s, ret=%d", url.c_str(), ret);
return ret; return ret;
} }

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

@ -164,8 +164,9 @@ private:
std::string path; std::string path;
int seq_no; int seq_no;
SrsRequest* req; SrsRequest* req;
double duration;
public: public:
SrsDvrAsyncCallOnHls(SrsRequest* r, std::string p, int s); SrsDvrAsyncCallOnHls(SrsRequest* r, std::string p, int s, double d);
virtual ~SrsDvrAsyncCallOnHls(); virtual ~SrsDvrAsyncCallOnHls();
public: public:
virtual int call(); virtual int call();

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

@ -287,7 +287,7 @@ int SrsHttpHooks::on_dvr(string url, SrsRequest* req, string file)
return ret; return ret;
} }
int SrsHttpHooks::on_hls(string url, SrsRequest* req, string file, int sn) int SrsHttpHooks::on_hls(string url, SrsRequest* req, string file, int sn, double duration)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
@ -302,6 +302,7 @@ int SrsHttpHooks::on_hls(string url, SrsRequest* req, string file, int sn)
<< SRS_JFIELD_STR("vhost", req->vhost) << SRS_JFIELD_CONT << SRS_JFIELD_STR("vhost", req->vhost) << SRS_JFIELD_CONT
<< SRS_JFIELD_STR("app", req->app) << SRS_JFIELD_CONT << SRS_JFIELD_STR("app", req->app) << SRS_JFIELD_CONT
<< SRS_JFIELD_STR("stream", req->stream) << SRS_JFIELD_CONT << SRS_JFIELD_STR("stream", req->stream) << SRS_JFIELD_CONT
<< SRS_JFIELD_ORG("duration", duration) << SRS_JFIELD_CONT
<< SRS_JFIELD_STR("cwd", cwd) << SRS_JFIELD_CONT << SRS_JFIELD_STR("cwd", cwd) << SRS_JFIELD_CONT
<< SRS_JFIELD_STR("file", file) << SRS_JFIELD_CONT << SRS_JFIELD_STR("file", file) << SRS_JFIELD_CONT
<< SRS_JFIELD_ORG("seq_no", sn) << SRS_JFIELD_ORG("seq_no", sn)

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

@ -102,8 +102,9 @@ public:
* ignore if empty. * ignore if empty.
* @param file the ts file path, can be relative or absolute path. * @param file the ts file path, can be relative or absolute path.
* @param sn the seq_no, the sequence number of ts in hls/m3u8. * @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); static int on_hls(std::string url, SrsRequest* req, std::string file, int sn, double duration);
private: private:
static int do_post(std::string url, std::string req, int& code, std::string& res); static int do_post(std::string url, std::string req, int& code, std::string& res);
}; };