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 #299, fragment reap workflow

Browse source
This commit is contained in:
winlin 2017-03-19 12:30:02 +08:00
parent 721a8457c2
commit c71e8fa947
2 changed files with 154 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,9 +51,9 @@ int SrsInitMp4::write(SrsFormat* format, bool video, int tid)
{
int ret = ERROR_SUCCESS;
string path_tmp = fullpath() + ".tmp";
string path_tmp = tmppath();
if ((ret = fw->open(path_tmp)) != ERROR_SUCCESS) {
srs_error("DASH: Open media failed, path=%s, ret=%d", path_tmp.c_str(), ret);
srs_error("DASH: Open init mp4 failed, path=%s, ret=%d", path_tmp.c_str(), ret);
return ret;
}
@ -291,10 +291,56 @@ int SrsInitMp4::write(SrsFormat* format, bool video, int tid)
SrsFragmentedMp4::SrsFragmentedMp4()
{
fw = new SrsFileWriter();
}
SrsFragmentedMp4::~SrsFragmentedMp4()
{
srs_freep(fw);
}
int SrsFragmentedMp4::initialize(bool video, SrsMpdWriter* mpd)
{
int ret = ERROR_SUCCESS;
string home;
string path;
if ((ret = mpd->get_fragment(video, home, path)) != ERROR_SUCCESS) {
return ret;
}
set_path(home + "/" + path);
if ((ret = create_dir()) != ERROR_SUCCESS) {
return ret;
}
string path_tmp = tmppath();
if ((ret = fw->open(path_tmp)) != ERROR_SUCCESS) {
srs_error("DASH: Open fmp4 failed, path=%s, ret=%d", path_tmp.c_str(), ret);
return ret;
}
return ret;
}
int SrsFragmentedMp4::write(SrsSharedPtrMessage* shared_msg, SrsFormat* format)
{
int ret = ERROR_SUCCESS;
return ret;
}
int SrsFragmentedMp4::reap()
{
int ret = ERROR_SUCCESS;
srs_freep(fw);
if ((ret = rename()) != ERROR_SUCCESS) {
return ret;
}
return ret;
}
SrsMpdWriter::SrsMpdWriter()
@ -336,6 +382,8 @@ int SrsMpdWriter::write(SrsFormat* format)
string full_path = home + "/" + mpd_path;
string full_home = srs_path_dirname(full_path);
fragment_home = srs_path_dirname(mpd_path) + "/" + req->stream;
if ((ret = srs_create_dir_recursively(full_home)) != ERROR_SUCCESS) {
srs_error("DASH: Create MPD home failed, home=%s, ret=%d", full_home.c_str(), ret);
return ret;
@ -399,19 +447,40 @@ int SrsMpdWriter::write(SrsFormat* format)
return ret;
}
int SrsMpdWriter::get_fragment(bool video, std::string& home, std::string& path)
{
int ret = ERROR_SUCCESS;
home = fragment_home;
int64_t sequence_number = srs_update_system_time_ms() / fragment / 1000;
if (video) {
path = "video-" + srs_int2str(sequence_number) + ".m4s";
} else {
path = "audio-" + srs_int2str(sequence_number) + ".m4s";
}
return ret;
}
SrsDashController::SrsDashController()
{
req = NULL;
video_tack_id = 2;
audio_track_id = 1;
mpd = new SrsMpdWriter();
fragments = new SrsFragmentWindow();
vcurrent = acurrent = NULL;
vfragments = new SrsFragmentWindow();
afragments = new SrsFragmentWindow();
}
SrsDashController::~SrsDashController()
{
srs_freep(mpd);
srs_freep(fragments);
srs_freep(vcurrent);
srs_freep(acurrent);
srs_freep(vfragments);
srs_freep(afragments);
}
int SrsDashController::initialize(SrsRequest* r)
@ -419,12 +488,29 @@ int SrsDashController::initialize(SrsRequest* r)
int ret = ERROR_SUCCESS;
req = r;
fragment = _srs_config->get_dash_fragment(r->vhost);
home = _srs_config->get_dash_path(r->vhost);
if ((ret = mpd->initialize(r)) != ERROR_SUCCESS) {
return ret;
}
string home, path;
srs_freep(vcurrent);
vcurrent = new SrsFragmentedMp4();
if ((ret = vcurrent->initialize(true, mpd)) != ERROR_SUCCESS) {
srs_error("DASH: Initialize the video fragment failed, ret=%d", ret);
return ret;
}
srs_freep(acurrent);
acurrent = new SrsFragmentedMp4();
if ((ret = acurrent->initialize(false, mpd)) != ERROR_SUCCESS) {
srs_error("DASH: Initialize the audio fragment failed, ret=%d", ret);
return ret;
}
return ret;
}
@ -436,6 +522,25 @@ int SrsDashController::on_audio(SrsSharedPtrMessage* shared_audio, SrsFormat* fo
return refresh_init_mp4(shared_audio, format);
}
if (acurrent->duration() >= fragment) {
if ((ret = acurrent->reap()) != ERROR_SUCCESS) {
return ret;
}
afragments->append(acurrent);
acurrent = new SrsFragmentedMp4();
if ((ret = acurrent->initialize(false, mpd)) != ERROR_SUCCESS) {
srs_error("DASH: Initialize the audio fragment failed, ret=%d", ret);
return ret;
}
}
if ((ret = acurrent->write(shared_audio, format)) != ERROR_SUCCESS) {
srs_error("DASH: Write audio to fragment failed, ret=%d", ret);
return ret;
}
if ((ret = refresh_mpd(format)) != ERROR_SUCCESS) {
srs_error("DASH: Refresh the MPD failed. ret=%d", ret);
return ret;
@ -452,6 +557,27 @@ int SrsDashController::on_video(SrsSharedPtrMessage* shared_video, SrsFormat* fo
return refresh_init_mp4(shared_video, format);
}
bool reopen = format->video->frame_type == SrsVideoAvcFrameTypeKeyFrame
&& vcurrent->duration() >= fragment;
if (reopen) {
if ((ret = vcurrent->reap()) != ERROR_SUCCESS) {
return ret;
}
vfragments->append(vcurrent);
vcurrent = new SrsFragmentedMp4();
if ((ret = vcurrent->initialize(true, mpd)) != ERROR_SUCCESS) {
srs_error("DASH: Initialize the video fragment failed, ret=%d", ret);
return ret;
}
}
if ((ret = vcurrent->write(shared_video, format)) != ERROR_SUCCESS) {
srs_error("DASH: Write video to fragment failed, ret=%d", ret);
return ret;
}
if ((ret = refresh_mpd(format)) != ERROR_SUCCESS) {
srs_error("DASH: Refresh the MPD failed. ret=%d", ret);
return ret;

25
trunk/src/app/srs_app_dash.hpp
View file

@ -39,6 +39,7 @@ class SrsOriginHub;
class SrsSharedPtrMessage;
class SrsFormat;
class SrsFileWriter;
class SrsMpdWriter;
/**
* The init mp4 for FMP4.
@ -60,9 +61,18 @@ public:
*/
class SrsFragmentedMp4 : public SrsFragment
{
private:
SrsFileWriter* fw;
public:
SrsFragmentedMp4();
virtual ~SrsFragmentedMp4();
public:
// Initialize the fragment, create the home dir, open the file.
virtual int initialize(bool video, SrsMpdWriter* mpd);
// Write media message to fragment.
virtual int write(SrsSharedPtrMessage* shared_msg, SrsFormat* format);
// Reap the fragment, close the fd and rename tmp to official file.
virtual int reap();
};
/**
@ -84,6 +94,9 @@ private:
std::string home;
// The MPD path template, from which to build the file path.
std::string mpd_file;
private:
// The home for fragment, relative to home.
std::string fragment_home;
public:
SrsMpdWriter();
virtual ~SrsMpdWriter();
@ -91,6 +104,9 @@ public:
virtual int initialize(SrsRequest* r);
// Write MPD according to parsed format of stream.
virtual int write(SrsFormat* format);
public:
// Get the fragment home and path.
virtual int get_fragment(bool video, std::string& home, std::string& path);
};
/**
@ -101,7 +117,14 @@ class SrsDashController
private:
SrsRequest* req;
SrsMpdWriter* mpd;
SrsFragmentWindow* fragments;
private:
SrsFragmentedMp4* vcurrent;
SrsFragmentWindow* vfragments;
SrsFragmentedMp4* acurrent;
SrsFragmentWindow* afragments;
private:
// The fragment duration in ms to reap it.
int fragment;
private:
std::string home;
int video_tack_id;