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 #301, hls support h.264+mp3, ok for vlc. 2.0.107

Browse source
This commit is contained in:
winlin 2015-01-25 17:06:49 +08:00
parent 2c42350489
commit 919a85b103
7 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,6 +92,7 @@ SrsHlsMuxer::SrsHlsMuxer()
hls_fragment = hls_window = 0;
_sequence_no = 0;
current = NULL;
acodec = SrsCodecAudioReserved1;
}
SrsHlsMuxer::~SrsHlsMuxer()
@ -170,6 +171,11 @@ int SrsHlsMuxer::segment_open(int64_t segment_start_dts)
}
srs_info("open HLS muxer success. path=%s, tmp=%s",
current->full_path.c_str(), tmp_file.c_str());
// set the segment muxer audio codec.
if (acodec != SrsCodecAudioReserved1) {
current->muxer->update_acodec(acodec);
}
return ret;
}
@ -199,11 +205,12 @@ bool SrsHlsMuxer::is_segment_absolutely_overflow()
return current->duration >= 2 * hls_fragment;
}
int SrsHlsMuxer::update_acodec(SrsCodecAudio acodec)
int SrsHlsMuxer::update_acodec(SrsCodecAudio ac)
{
srs_assert(current);
srs_assert(current->muxer);
return current->muxer->update_acodec(acodec);
acodec = ac;
return current->muxer->update_acodec(ac);
}
int SrsHlsMuxer::flush_audio(SrsMpegtsFrame* af, SrsSimpleBuffer* ab)
@ -801,7 +808,7 @@ int SrsHls::on_audio(SrsSharedPtrMessage* __audio)
}
// ignore sequence header
if (sample->aac_packet_type == SrsCodecAudioTypeSequenceHeader) {
if (acodec == SrsCodecAudioAAC && sample->aac_packet_type == SrsCodecAudioTypeSequenceHeader) {
return hls_cache->on_sequence_header(muxer);
}