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 #512, partical hotfix the hls pure audio. 2.0.196

Browse source
This commit is contained in:
winlin 2015-10-27 17:44:10 +08:00
parent 3683f06e4d
commit d1979c760f
5 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
trunk/src/kernel/srs_kernel_ts.cpp
View file

@ -459,8 +459,11 @@ int SrsTsContext::encode_pes(SrsFileWriter* writer, SrsTsMessage* msg, int16_t p
while (p < end) {
SrsTsPacket* pkt = NULL;
if (p == start) {
// for pure audio stream, always write pcr.
// write pcr according to message.
bool write_pcr = msg->write_pcr;
// for pure audio, always write pcr.
// TODO: FIXME: maybe only need to write at begin and end of ts.
if (pure_audio && msg->is_audio()) {
write_pcr = true;
}
@ -2785,11 +2788,12 @@ int SrsTsCache::cache_audio(SrsAvcAacCodec* codec, int64_t dts, SrsCodecSample*
if (!audio) {
audio = new SrsTsMessage();
audio->write_pcr = false;
audio->start_pts = dts;
audio->dts = audio->pts = audio->start_pts = dts;
}
audio->dts = dts;
audio->pts = audio->dts;
// TODO: FIXME: refine code.
//audio->dts = dts;
//audio->pts = audio->dts;
audio->sid = SrsTsPESStreamIdAudioCommon;
// must be aac or mp3
@ -3139,6 +3143,8 @@ int SrsTsEncoder::write_audio(int64_t timestamp, char* data, int size)
return ret;
}
// TODO: FIXME: for pure audio, aggregate some frame to one.
// always flush audio frame by frame.
// @see https://github.com/simple-rtmp-server/srs/issues/512
return flush_audio();

4
trunk/src/kernel/srs_kernel_ts.hpp
View file

@ -54,6 +54,9 @@ class SrsTsContext;
// Transport Stream packets are 188 bytes in length.
#define SRS_TS_PACKET_SIZE 188
// the aggregate pure audio for hls, in ts tbn(ms * 90).
#define SRS_CONSTS_HLS_PURE_AUDIO_AGGREGATE 720 * 90
/**
* the pid of ts packet,
* Table 2-3 - PID table, hls-mpeg-ts-iso13818-1.pdf, page 37
@ -359,6 +362,7 @@ public:
/**
* whether the hls stream is pure audio stream.
*/
// TODO: FIXME: merge with muxer codec detect.
virtual bool is_pure_audio();
/**
* when PMT table parsed, we know some info about stream.