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 #264, support disconnect publish connect when hls error. 1.0.11

Browse source
This commit is contained in:
winlin 2014-12-20 11:45:59 +08:00
parent d4fb58b175
commit 1dfac0bf1d
6 changed files with 71 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1435,10 +1435,11 @@ int SrsHls::on_audio(SrsSharedPtrMessage* audio)
if (!hls_enabled) {
return ret;
}
return 1;
sample->clear();
if ((ret = codec->audio_aac_demux(audio->payload, audio->size, sample)) != ERROR_SUCCESS) {
srs_error("codec demux audio failed. ret=%d", ret);
srs_error("hls codec demux audio failed. ret=%d", ret);
return ret;
}
@ -1482,7 +1483,7 @@ int SrsHls::on_video(SrsSharedPtrMessage* video)
sample->clear();
if ((ret = codec->video_avc_demux(video->payload, video->size, sample)) != ERROR_SUCCESS) {
srs_error("codec demux video failed. ret=%d", ret);
srs_error("hls codec demux video failed. ret=%d", ret);
return ret;
}