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

8
trunk/src/app/srs_app_hls.hpp
View file

@ -118,6 +118,12 @@ private:
* current writing segment.
*/
SrsHlsSegment* current;
/**
* the current audio codec, when open new muxer,
* set the muxer audio codec.
* @see https://github.com/winlinvip/simple-rtmp-server/issues/301
*/
SrsCodecAudio acodec;
public:
SrsHlsMuxer();
virtual ~SrsHlsMuxer();
@ -144,7 +150,7 @@ public:
*/
virtual bool is_segment_absolutely_overflow();
public:
virtual int update_acodec(SrsCodecAudio acodec);
virtual int update_acodec(SrsCodecAudio ac);
virtual int flush_audio(SrsMpegtsFrame* af, SrsSimpleBuffer* ab);
virtual int flush_video(SrsMpegtsFrame* af, SrsSimpleBuffer* ab, SrsMpegtsFrame* vf, SrsSimpleBuffer* vb);
/**