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

Refine SrsTcpClient timeout in time unit

Browse source
This commit is contained in:
winlin 2019-04-17 07:56:28 +08:00
parent e9770933a6
commit 61afca7160
10 changed files with 46 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

29
trunk/src/app/srs_app_dash.cpp
View file

@ -172,19 +172,31 @@ SrsMpdWriter::~SrsMpdWriter()
srs_error_t SrsMpdWriter::initialize(SrsRequest* r)
{
req = r;
return srs_success;
}
srs_error_t SrsMpdWriter::on_publish()
{
SrsRequest* r = req;
fragment = _srs_config->get_dash_fragment(r->vhost);
update_period = _srs_config->get_dash_update_period(r->vhost);
timeshit = _srs_config->get_dash_timeshift(r->vhost);
home = _srs_config->get_dash_path(r->vhost);
mpd_file = _srs_config->get_dash_mpd_file(r->vhost);
string mpd_path = srs_path_build_stream(mpd_file, req->vhost, req->app, req->stream);
fragment_home = srs_path_dirname(mpd_path) + "/" + req->stream;
srs_trace("DASH: Config fragment=%" PRId64 ", period=%" PRId64, fragment, update_period);
return srs_success;
}
void SrsMpdWriter::on_unpublish()
{
}
srs_error_t SrsMpdWriter::write(SrsFormat* format)
{
srs_error_t err = srs_success;
@ -303,8 +315,6 @@ srs_error_t SrsDashController::initialize(SrsRequest* r)
srs_error_t err = srs_success;
req = r;
fragment = _srs_config->get_dash_fragment(r->vhost);
home = _srs_config->get_dash_path(r->vhost);
if ((err = mpd->initialize(r)) != srs_success) {
return srs_error_wrap(err, "mpd");
@ -317,6 +327,11 @@ srs_error_t SrsDashController::on_publish()
{
srs_error_t err = srs_success;
SrsRequest* r = req;
fragment = _srs_config->get_dash_fragment(r->vhost);
home = _srs_config->get_dash_path(r->vhost);
srs_freep(vcurrent);
vcurrent = new SrsFragmentedMp4();
if ((err = vcurrent->initialize(req, true, mpd, video_tack_id)) != srs_success) {
@ -329,11 +344,17 @@ srs_error_t SrsDashController::on_publish()
return srs_error_wrap(err, "audio fragment");
}
if ((err = mpd->on_publish()) != srs_success) {
return srs_error_wrap(err, "mpd");
}
return err;
}
void SrsDashController::on_unpublish()
{
mpd->on_unpublish();
srs_freep(vcurrent);
srs_freep(acurrent);
}