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 #250, demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109.

Browse source
This commit is contained in:
winlin 2015-01-31 12:21:04 +08:00
parent bce78fdab6
commit 66fccdbbd1
5 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/src/kernel/srs_kernel_error.hpp
View file

@ -227,6 +227,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define ERROR_STREAM_CASTER_TS_PAT 4017
#define ERROR_STREAM_CASTER_TS_PMT 4018
#define ERROR_STREAM_CASTER_TS_PSE 4019
#define ERROR_STREAM_CASTER_TS_ES 4020
/**
* whether the error code is an system control error.

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

@ -402,6 +402,21 @@ SrsMpegtsFrame::SrsMpegtsFrame()
key = false;
}
string srs_ts_stream2string(SrsTsStream stream)
{
switch (stream) {
case SrsTsStreamReserved: return "Reserved";
case SrsTsStreamAudioMp3: return "MP3";
case SrsTsStreamAudioAAC: return "AAC";
case SrsTsStreamAudioAC3: return "AC3";
case SrsTsStreamAudioDTS: return "AudioDTS";
case SrsTsStreamVideoH264: return "H.264";
case SrsTsStreamVideoMpeg4: return "MP4";
case SrsTsStreamAudioMpeg4: return "MP4A";
default: return "Other";
}
}
SrsTsChannel::SrsTsChannel()
{
pid = 0;

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

@ -174,6 +174,7 @@ enum SrsTsStream
SrsTsStreamAudioAC3 = 0x81,
SrsTsStreamAudioDTS = 0x8a,
};
std::string srs_ts_stream2string(SrsTsStream stream);
/**
* the ts channel.