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, http ts stream support h.264+mp3. 2.0.106

Browse source
This commit is contained in:
winlin 2015-01-25 16:42:22 +08:00
parent aaade0f04f
commit 2c42350489
10 changed files with 305 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,6 +37,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <string>
#include <vector>
#include <srs_kernel_codec.hpp>
class SrsSharedPtrMessage;
class SrsCodecSample;
class SrsMpegtsFrame;
@ -141,6 +143,8 @@ public:
* @see https://github.com/winlinvip/simple-rtmp-server/issues/151#issuecomment-71155184
*/
virtual bool is_segment_absolutely_overflow();
public:
virtual int update_acodec(SrsCodecAudio acodec);
virtual int flush_audio(SrsMpegtsFrame* af, SrsSimpleBuffer* ab);
virtual int flush_video(SrsMpegtsFrame* af, SrsSimpleBuffer* ab, SrsMpegtsFrame* vf, SrsSimpleBuffer* vb);
/**
@ -174,8 +178,6 @@ private:
class SrsHlsCache
{
private:
// the audio cache buffer start pts, to flush audio if full.
int64_t audio_buffer_start_pts;
SrsTsCache* cache;
public:
SrsHlsCache();