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

fix #85, fix the segment-dvr sequence header missing. 0.9.187.

Browse source
This commit is contained in:
winlin 2014-08-03 20:27:57 +08:00
parent 5a95d594e7
commit 6dd065bcc3
4 changed files with 38 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

32
trunk/src/app/srs_app_dvr.cpp
View file

@ -399,10 +399,13 @@ void SrsDvrSessionPlan::on_unpublish()
SrsDvrSegmentPlan::SrsDvrSegmentPlan()
{
segment_duration = -1;
sh_video = sh_audio = NULL;
}
SrsDvrSegmentPlan::~SrsDvrSegmentPlan()
{
srs_freep(sh_video);
srs_freep(sh_audio);
}
int SrsDvrSegmentPlan::initialize(SrsSource* source, SrsRequest* req)
@ -445,6 +448,26 @@ void SrsDvrSegmentPlan::on_unpublish()
dvr_enabled = false;
}
int SrsDvrSegmentPlan::on_audio(SrsSharedPtrMessage* audio)
{
if (SrsFlvCodec::audio_is_sequence_header(audio->payload, audio->size)) {
srs_freep(sh_audio);
sh_audio = audio->copy();
}
return SrsDvrPlan::on_audio(audio);
}
int SrsDvrSegmentPlan::on_video(SrsSharedPtrMessage* video)
{
if (SrsFlvCodec::video_is_sequence_header(video->payload, video->size)) {
srs_freep(sh_video);
sh_video = video->copy();
}
return SrsDvrPlan::on_video(video);
}
int SrsDvrSegmentPlan::update_duration(SrsSharedPtrMessage* msg)
{
int ret = ERROR_SUCCESS;
@ -463,9 +486,18 @@ int SrsDvrSegmentPlan::update_duration(SrsSharedPtrMessage* msg)
}
on_unpublish();
// open new flv file
if ((ret = open_new_segment()) != ERROR_SUCCESS) {
return ret;
}
// update sequence header
if (sh_video && (ret = SrsDvrPlan::on_video(sh_video)) != ERROR_SUCCESS) {
return ret;
}
if (sh_audio && (ret = SrsDvrPlan::on_audio(sh_audio)) != ERROR_SUCCESS) {
return ret;
}
}
return ret;