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 bug #251, refine the directly access ptrs for hls,dvr,forwarder,consumer.

Browse source
This commit is contained in:
winlin 2014-12-05 23:49:53 +08:00
parent d3a103184a
commit de993b6465
8 changed files with 97 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1426,15 +1426,16 @@ int SrsHls::on_meta_data(SrsAmf0Object* metadata)
return ret;
}
int SrsHls::on_audio(SrsSharedPtrMessage* audio)
int SrsHls::on_audio(SrsSharedPtrMessage* __audio)
{
int ret = ERROR_SUCCESS;
SrsAutoFree(SrsSharedPtrMessage, audio);
if (!hls_enabled) {
return ret;
}
SrsSharedPtrMessage* audio = __audio->copy();
SrsAutoFree(SrsSharedPtrMessage, audio);
sample->clear();
if ((ret = codec->audio_aac_demux(audio->payload, audio->size, sample)) != ERROR_SUCCESS) {
@ -1470,15 +1471,16 @@ int SrsHls::on_audio(SrsSharedPtrMessage* audio)
return ret;
}
int SrsHls::on_video(SrsSharedPtrMessage* video)
int SrsHls::on_video(SrsSharedPtrMessage* __video)
{
int ret = ERROR_SUCCESS;
SrsAutoFree(SrsSharedPtrMessage, video);
if (!hls_enabled) {
return ret;
}
SrsSharedPtrMessage* video = __video->copy();
SrsAutoFree(SrsSharedPtrMessage, video);
sample->clear();
if ((ret = codec->video_avc_demux(video->payload, video->size, sample)) != ERROR_SUCCESS) {