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

refine the spaces, no TABS

Browse source
This commit is contained in:
winlin 2017-01-16 15:47:26 +08:00
parent 750f4413c8
commit 1ed5118246
12 changed files with 198 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

54
trunk/src/app/srs_app_ffmpeg.cpp
View file

@ -61,16 +61,16 @@ using namespace std;
SrsFFMPEG::SrsFFMPEG(std::string ffmpeg_bin) SrsFFMPEG::SrsFFMPEG(std::string ffmpeg_bin)
{ {
ffmpeg = ffmpeg_bin; ffmpeg = ffmpeg_bin;
vbitrate = 0; vbitrate = 0;
vfps = 0; vfps = 0;
vwidth = 0; vwidth = 0;
vheight = 0; vheight = 0;
vthreads = 0; vthreads = 0;
abitrate = 0; abitrate = 0;
asample_rate = 0; asample_rate = 0;
achannels = 0; achannels = 0;
process = new SrsProcess(); process = new SrsProcess();
} }
@ -112,24 +112,24 @@ int SrsFFMPEG::initialize_transcode(SrsConfDirective* engine)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
perfile = _srs_config->get_engine_perfile(engine); perfile = _srs_config->get_engine_perfile(engine);
iformat = _srs_config->get_engine_iformat(engine); iformat = _srs_config->get_engine_iformat(engine);
vfilter = _srs_config->get_engine_vfilter(engine); vfilter = _srs_config->get_engine_vfilter(engine);
vcodec = _srs_config->get_engine_vcodec(engine); vcodec = _srs_config->get_engine_vcodec(engine);
vbitrate = _srs_config->get_engine_vbitrate(engine); vbitrate = _srs_config->get_engine_vbitrate(engine);
vfps = _srs_config->get_engine_vfps(engine); vfps = _srs_config->get_engine_vfps(engine);
vwidth = _srs_config->get_engine_vwidth(engine); vwidth = _srs_config->get_engine_vwidth(engine);
vheight = _srs_config->get_engine_vheight(engine); vheight = _srs_config->get_engine_vheight(engine);
vthreads = _srs_config->get_engine_vthreads(engine); vthreads = _srs_config->get_engine_vthreads(engine);
vprofile = _srs_config->get_engine_vprofile(engine); vprofile = _srs_config->get_engine_vprofile(engine);
vpreset = _srs_config->get_engine_vpreset(engine); vpreset = _srs_config->get_engine_vpreset(engine);
vparams = _srs_config->get_engine_vparams(engine); vparams = _srs_config->get_engine_vparams(engine);
acodec = _srs_config->get_engine_acodec(engine); acodec = _srs_config->get_engine_acodec(engine);
abitrate = _srs_config->get_engine_abitrate(engine); abitrate = _srs_config->get_engine_abitrate(engine);
asample_rate = _srs_config->get_engine_asample_rate(engine); asample_rate = _srs_config->get_engine_asample_rate(engine);
achannels = _srs_config->get_engine_achannels(engine); achannels = _srs_config->get_engine_achannels(engine);
aparams = _srs_config->get_engine_aparams(engine); aparams = _srs_config->get_engine_aparams(engine);
oformat = _srs_config->get_engine_oformat(engine); oformat = _srs_config->get_engine_oformat(engine);
// ensure the size is even. // ensure the size is even.
vwidth -= vwidth % 2; vwidth -= vwidth % 2;

2
trunk/src/app/srs_app_mpegts_udp.cpp
View file

@ -226,7 +226,7 @@ int SrsMpegtsOverUdp::on_udp_bytes(string host, int port, char* buf, int nb_buf)
} }
// use stream to parse ts packet. // use stream to parse ts packet.
int nb_packet = buffer->length() / SRS_TS_PACKET_SIZE; int nb_packet = buffer->length() / SRS_TS_PACKET_SIZE;
for (int i = 0; i < nb_packet; i++) { for (int i = 0; i < nb_packet; i++) {
char* p = buffer->bytes() + (i * SRS_TS_PACKET_SIZE); char* p = buffer->bytes() + (i * SRS_TS_PACKET_SIZE);
if ((ret = stream->initialize(p, SRS_TS_PACKET_SIZE)) != ERROR_SUCCESS) { if ((ret = stream->initialize(p, SRS_TS_PACKET_SIZE)) != ERROR_SUCCESS) {

12
trunk/src/app/srs_app_server.hpp
View file

@ -64,17 +64,17 @@ class SrsKafkaProducer;
enum SrsListenerType enum SrsListenerType
{ {
// RTMP client, // RTMP client,
SrsListenerRtmpStream = 0, SrsListenerRtmpStream = 0,
// HTTP api, // HTTP api,
SrsListenerHttpApi = 1, SrsListenerHttpApi = 1,
// HTTP stream, HDS/HLS/DASH // HTTP stream, HDS/HLS/DASH
SrsListenerHttpStream = 2, SrsListenerHttpStream = 2,
// UDP stream, MPEG-TS over udp. // UDP stream, MPEG-TS over udp.
SrsListenerMpegTsOverUdp = 3, SrsListenerMpegTsOverUdp = 3,
// TCP stream, RTSP stream. // TCP stream, RTSP stream.
SrsListenerRtsp = 4, SrsListenerRtsp = 4,
// TCP stream, FLV stream over HTTP. // TCP stream, FLV stream over HTTP.
SrsListenerFlv = 5, SrsListenerFlv = 5,
}; };
/** /**

2
trunk/src/app/srs_app_utility.cpp
View file

@ -1063,7 +1063,7 @@ SrsNetworkRtmpServer* srs_get_network_rtmp_server()
// @see: http://stackoverflow.com/questions/5992211/list-of-possible-internal-socket-statuses-from-proc // @see: http://stackoverflow.com/questions/5992211/list-of-possible-internal-socket-statuses-from-proc
enum { enum {
SYS_TCP_ESTABLISHED = 0x01, SYS_TCP_ESTABLISHED = 0x01,
SYS_TCP_SYN_SENT, // 0x02 SYS_TCP_SYN_SENT, // 0x02
SYS_TCP_SYN_RECV, // 0x03 SYS_TCP_SYN_RECV, // 0x03
SYS_TCP_FIN_WAIT1, // 0x04 SYS_TCP_FIN_WAIT1, // 0x04

44
trunk/src/kernel/srs_kernel_codec.cpp
View file

@ -388,34 +388,34 @@ int SrsCodecSample::add_sample_unit(char* bytes, int size)
SrsAvcAacCodec::SrsAvcAacCodec() SrsAvcAacCodec::SrsAvcAacCodec()
{ {
avc_parse_sps = true; avc_parse_sps = true;
width = 0; width = 0;
height = 0; height = 0;
duration = 0; duration = 0;
NAL_unit_length = 0; NAL_unit_length = 0;
frame_rate = 0; frame_rate = 0;
video_data_rate = 0; video_data_rate = 0;
video_codec_id = 0; video_codec_id = 0;
audio_data_rate = 0; audio_data_rate = 0;
audio_codec_id = 0; audio_codec_id = 0;
avc_profile = SrsAvcProfileReserved; avc_profile = SrsAvcProfileReserved;
avc_level = SrsAvcLevelReserved; avc_level = SrsAvcLevelReserved;
aac_object = SrsAacObjectTypeReserved; aac_object = SrsAacObjectTypeReserved;
aac_sample_rate = SRS_AAC_SAMPLE_RATE_UNSET; // sample rate ignored aac_sample_rate = SRS_AAC_SAMPLE_RATE_UNSET; // sample rate ignored
aac_channels = 0; aac_channels = 0;
avc_extra_size = 0; avc_extra_size = 0;
avc_extra_data = NULL; avc_extra_data = NULL;
aac_extra_size = 0; aac_extra_size = 0;
aac_extra_data = NULL; aac_extra_data = NULL;
sequenceParameterSetLength = 0; sequenceParameterSetLength = 0;
sequenceParameterSetNALUnit = NULL; sequenceParameterSetNALUnit = NULL;
pictureParameterSetLength = 0; pictureParameterSetLength = 0;
pictureParameterSetNALUnit = NULL; pictureParameterSetNALUnit = NULL;
payload_format = SrsAvcPayloadFormatGuess; payload_format = SrsAvcPayloadFormatGuess;
stream = new SrsBuffer(); stream = new SrsBuffer();

100
trunk/src/kernel/srs_kernel_codec.hpp
View file

@ -41,10 +41,10 @@ class SrsBuffer;
enum SrsCodecAudioType enum SrsCodecAudioType
{ {
// set to the max value to reserved, for array map. // set to the max value to reserved, for array map.
SrsCodecAudioTypeReserved = 2, SrsCodecAudioTypeReserved = 2,
SrsCodecAudioTypeSequenceHeader = 0, SrsCodecAudioTypeSequenceHeader = 0,
SrsCodecAudioTypeRawData = 1, SrsCodecAudioTypeRawData = 1,
}; };
// E.4.3.1 VIDEODATA // E.4.3.1 VIDEODATA
@ -58,14 +58,14 @@ enum SrsCodecAudioType
enum SrsCodecVideoAVCFrame enum SrsCodecVideoAVCFrame
{ {
// set to the zero to reserved, for array map. // set to the zero to reserved, for array map.
SrsCodecVideoAVCFrameReserved = 0, SrsCodecVideoAVCFrameReserved = 0,
SrsCodecVideoAVCFrameReserved1 = 6, SrsCodecVideoAVCFrameReserved1 = 6,
SrsCodecVideoAVCFrameKeyFrame = 1, SrsCodecVideoAVCFrameKeyFrame = 1,
SrsCodecVideoAVCFrameInterFrame = 2, SrsCodecVideoAVCFrameInterFrame = 2,
SrsCodecVideoAVCFrameDisposableInterFrame = 3, SrsCodecVideoAVCFrameDisposableInterFrame = 3,
SrsCodecVideoAVCFrameGeneratedKeyFrame = 4, SrsCodecVideoAVCFrameGeneratedKeyFrame = 4,
SrsCodecVideoAVCFrameVideoInfoFrame = 5, SrsCodecVideoAVCFrameVideoInfoFrame = 5,
}; };
// AVCPacketType IF CodecID == 7 UI8 // AVCPacketType IF CodecID == 7 UI8
@ -77,11 +77,11 @@ enum SrsCodecVideoAVCFrame
enum SrsCodecVideoAVCType enum SrsCodecVideoAVCType
{ {
// set to the max value to reserved, for array map. // set to the max value to reserved, for array map.
SrsCodecVideoAVCTypeReserved = 3, SrsCodecVideoAVCTypeReserved = 3,
SrsCodecVideoAVCTypeSequenceHeader = 0, SrsCodecVideoAVCTypeSequenceHeader = 0,
SrsCodecVideoAVCTypeNALU = 1, SrsCodecVideoAVCTypeNALU = 1,
SrsCodecVideoAVCTypeSequenceHeaderEOF = 2, SrsCodecVideoAVCTypeSequenceHeaderEOF = 2,
}; };
// E.4.3.1 VIDEODATA // E.4.3.1 VIDEODATA
@ -96,19 +96,19 @@ enum SrsCodecVideoAVCType
enum SrsCodecVideo enum SrsCodecVideo
{ {
// set to the zero to reserved, for array map. // set to the zero to reserved, for array map.
SrsCodecVideoReserved = 0, SrsCodecVideoReserved = 0,
SrsCodecVideoReserved1 = 1, SrsCodecVideoReserved1 = 1,
SrsCodecVideoReserved2 = 9, SrsCodecVideoReserved2 = 9,
// for user to disable video, for example, use pure audio hls. // for user to disable video, for example, use pure audio hls.
SrsCodecVideoDisabled = 8, SrsCodecVideoDisabled = 8,
SrsCodecVideoSorensonH263 = 2, SrsCodecVideoSorensonH263 = 2,
SrsCodecVideoScreenVideo = 3, SrsCodecVideoScreenVideo = 3,
SrsCodecVideoOn2VP6 = 4, SrsCodecVideoOn2VP6 = 4,
SrsCodecVideoOn2VP6WithAlphaChannel = 5, SrsCodecVideoOn2VP6WithAlphaChannel = 5,
SrsCodecVideoScreenVideoVersion2 = 6, SrsCodecVideoScreenVideoVersion2 = 6,
SrsCodecVideoAVC = 7, SrsCodecVideoAVC = 7,
}; };
std::string srs_codec_video2str(SrsCodecVideo codec); std::string srs_codec_video2str(SrsCodecVideo codec);
@ -134,25 +134,25 @@ std::string srs_codec_video2str(SrsCodecVideo codec);
enum SrsCodecAudio enum SrsCodecAudio
{ {
// set to the max value to reserved, for array map. // set to the max value to reserved, for array map.
SrsCodecAudioReserved1 = 16, SrsCodecAudioReserved1 = 16,
// for user to disable audio, for example, use pure video hls. // for user to disable audio, for example, use pure video hls.
SrsCodecAudioDisabled = 17, SrsCodecAudioDisabled = 17,
SrsCodecAudioLinearPCMPlatformEndian = 0, SrsCodecAudioLinearPCMPlatformEndian = 0,
SrsCodecAudioADPCM = 1, SrsCodecAudioADPCM = 1,
SrsCodecAudioMP3 = 2, SrsCodecAudioMP3 = 2,
SrsCodecAudioLinearPCMLittleEndian = 3, SrsCodecAudioLinearPCMLittleEndian = 3,
SrsCodecAudioNellymoser16kHzMono = 4, SrsCodecAudioNellymoser16kHzMono = 4,
SrsCodecAudioNellymoser8kHzMono = 5, SrsCodecAudioNellymoser8kHzMono = 5,
SrsCodecAudioNellymoser = 6, SrsCodecAudioNellymoser = 6,
SrsCodecAudioReservedG711AlawLogarithmicPCM = 7, SrsCodecAudioReservedG711AlawLogarithmicPCM = 7,
SrsCodecAudioReservedG711MuLawLogarithmicPCM = 8, SrsCodecAudioReservedG711MuLawLogarithmicPCM = 8,
SrsCodecAudioReserved = 9, SrsCodecAudioReserved = 9,
SrsCodecAudioAAC = 10, SrsCodecAudioAAC = 10,
SrsCodecAudioSpeex = 11, SrsCodecAudioSpeex = 11,
SrsCodecAudioReservedMP3_8kHz = 14, SrsCodecAudioReservedMP3_8kHz = 14,
SrsCodecAudioReservedDeviceSpecificSound = 15, SrsCodecAudioReservedDeviceSpecificSound = 15,
}; };
std::string srs_codec_audio2str(SrsCodecAudio codec); std::string srs_codec_audio2str(SrsCodecAudio codec);
@ -167,12 +167,12 @@ std::string srs_codec_audio2str(SrsCodecAudio codec);
enum SrsCodecAudioSampleRate enum SrsCodecAudioSampleRate
{ {
// set to the max value to reserved, for array map. // set to the max value to reserved, for array map.
SrsCodecAudioSampleRateReserved = 4, SrsCodecAudioSampleRateReserved = 4,
SrsCodecAudioSampleRate5512 = 0, SrsCodecAudioSampleRate5512 = 0,
SrsCodecAudioSampleRate11025 = 1, SrsCodecAudioSampleRate11025 = 1,
SrsCodecAudioSampleRate22050 = 2, SrsCodecAudioSampleRate22050 = 2,
SrsCodecAudioSampleRate44100 = 3, SrsCodecAudioSampleRate44100 = 3,
}; };
/** /**
@ -257,10 +257,10 @@ extern int aac_sample_rates[];
enum SrsCodecAudioSampleSize enum SrsCodecAudioSampleSize
{ {
// set to the max value to reserved, for array map. // set to the max value to reserved, for array map.
SrsCodecAudioSampleSizeReserved = 2, SrsCodecAudioSampleSizeReserved = 2,
SrsCodecAudioSampleSize8bit = 0, SrsCodecAudioSampleSize8bit = 0,
SrsCodecAudioSampleSize16bit = 1, SrsCodecAudioSampleSize16bit = 1,
}; };
/** /**
@ -272,10 +272,10 @@ enum SrsCodecAudioSampleSize
enum SrsCodecAudioSoundType enum SrsCodecAudioSoundType
{ {
// set to the max value to reserved, for array map. // set to the max value to reserved, for array map.
SrsCodecAudioSoundTypeReserved = 2, SrsCodecAudioSoundTypeReserved = 2,
SrsCodecAudioSoundTypeMono = 0, SrsCodecAudioSoundTypeMono = 0,
SrsCodecAudioSoundTypeStereo = 1, SrsCodecAudioSoundTypeStereo = 1,
}; };
/** /**

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

@ -974,14 +974,14 @@ int SrsTsAdaptationField::decode(SrsBuffer* stream)
int pos_af = stream->pos(); int pos_af = stream->pos();
int8_t tmpv = stream->read_1bytes(); int8_t tmpv = stream->read_1bytes();
discontinuity_indicator = (tmpv >> 7) & 0x01; discontinuity_indicator = (tmpv >> 7) & 0x01;
random_access_indicator = (tmpv >> 6) & 0x01; random_access_indicator = (tmpv >> 6) & 0x01;
elementary_stream_priority_indicator = (tmpv >> 5) & 0x01; elementary_stream_priority_indicator = (tmpv >> 5) & 0x01;
PCR_flag = (tmpv >> 4) & 0x01; PCR_flag = (tmpv >> 4) & 0x01;
OPCR_flag = (tmpv >> 3) & 0x01; OPCR_flag = (tmpv >> 3) & 0x01;
splicing_point_flag = (tmpv >> 2) & 0x01; splicing_point_flag = (tmpv >> 2) & 0x01;
transport_private_data_flag = (tmpv >> 1) & 0x01; transport_private_data_flag = (tmpv >> 1) & 0x01;
adaptation_field_extension_flag = tmpv & 0x01; adaptation_field_extension_flag = tmpv & 0x01;
if (PCR_flag) { if (PCR_flag) {
if (!stream->require(6)) { if (!stream->require(6)) {

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

@ -65,19 +65,19 @@ class SrsTsContext;
enum SrsTsPid enum SrsTsPid
{ {
// Program Association Table(see Table 2-25). // Program Association Table(see Table 2-25).
SrsTsPidPAT = 0x00, SrsTsPidPAT = 0x00,
// Conditional Access Table (see Table 2-27). // Conditional Access Table (see Table 2-27).
SrsTsPidCAT = 0x01, SrsTsPidCAT = 0x01,
// Transport Stream Description Table // Transport Stream Description Table
SrsTsPidTSDT = 0x02, SrsTsPidTSDT = 0x02,
// Reserved // Reserved
SrsTsPidReservedStart = 0x03, SrsTsPidReservedStart = 0x03,
SrsTsPidReservedEnd = 0x0f, SrsTsPidReservedEnd = 0x0f,
// May be assigned as network_PID, Program_map_PID, elementary_PID, or for other purposes // May be assigned as network_PID, Program_map_PID, elementary_PID, or for other purposes
SrsTsPidAppStart = 0x10, SrsTsPidAppStart = 0x10,
SrsTsPidAppEnd = 0x1ffe, SrsTsPidAppEnd = 0x1ffe,
// null packets (see Table 2-3) // null packets (see Table 2-3)
SrsTsPidNULL = 0x01FFF, SrsTsPidNULL = 0x01FFF,
}; };
/** /**
@ -87,13 +87,13 @@ enum SrsTsPid
enum SrsTsScrambled enum SrsTsScrambled
{ {
// Not scrambled // Not scrambled
SrsTsScrambledDisabled = 0x00, SrsTsScrambledDisabled = 0x00,
// User-defined // User-defined
SrsTsScrambledUserDefined1 = 0x01, SrsTsScrambledUserDefined1 = 0x01,
// User-defined // User-defined
SrsTsScrambledUserDefined2 = 0x02, SrsTsScrambledUserDefined2 = 0x02,
// User-defined // User-defined
SrsTsScrambledUserDefined3 = 0x03, SrsTsScrambledUserDefined3 = 0x03,
}; };
/** /**
@ -103,13 +103,13 @@ enum SrsTsScrambled
enum SrsTsAdaptationFieldType enum SrsTsAdaptationFieldType
{ {
// Reserved for future use by ISO/IEC // Reserved for future use by ISO/IEC
SrsTsAdaptationFieldTypeReserved = 0x00, SrsTsAdaptationFieldTypeReserved = 0x00,
// No adaptation_field, payload only // No adaptation_field, payload only
SrsTsAdaptationFieldTypePayloadOnly = 0x01, SrsTsAdaptationFieldTypePayloadOnly = 0x01,
// Adaptation_field only, no payload // Adaptation_field only, no payload
SrsTsAdaptationFieldTypeAdaptionOnly = 0x02, SrsTsAdaptationFieldTypeAdaptionOnly = 0x02,
// Adaptation_field followed by payload // Adaptation_field followed by payload
SrsTsAdaptationFieldTypeBoth = 0x03, SrsTsAdaptationFieldTypeBoth = 0x03,
}; };
/** /**
@ -133,12 +133,12 @@ enum SrsTsPidApply
enum SrsTsStream enum SrsTsStream
{ {
// ITU-T | ISO/IEC Reserved // ITU-T | ISO/IEC Reserved
SrsTsStreamReserved = 0x00, SrsTsStreamReserved = 0x00,
// ISO/IEC 11172 Video // ISO/IEC 11172 Video
// ITU-T Rec. H.262 | ISO/IEC 13818-2 Video or ISO/IEC 11172-2 constrained parameter video stream // ITU-T Rec. H.262 | ISO/IEC 13818-2 Video or ISO/IEC 11172-2 constrained parameter video stream
// ISO/IEC 11172 Audio // ISO/IEC 11172 Audio
// ISO/IEC 13818-3 Audio // ISO/IEC 13818-3 Audio
SrsTsStreamAudioMp3 = 0x04, SrsTsStreamAudioMp3 = 0x04,
// ITU-T Rec. H.222.0 | ISO/IEC 13818-1 private_sections // ITU-T Rec. H.222.0 | ISO/IEC 13818-1 private_sections
// ITU-T Rec. H.222.0 | ISO/IEC 13818-1 PES packets containing private data // ITU-T Rec. H.222.0 | ISO/IEC 13818-1 PES packets containing private data
// ISO/IEC 13522 MHEG // ISO/IEC 13522 MHEG
@ -150,21 +150,21 @@ enum SrsTsStream
// ISO/IEC 13818-6 type D // ISO/IEC 13818-6 type D
// ITU-T Rec. H.222.0 | ISO/IEC 13818-1 auxiliary // ITU-T Rec. H.222.0 | ISO/IEC 13818-1 auxiliary
// ISO/IEC 13818-7 Audio with ADTS transport syntax // ISO/IEC 13818-7 Audio with ADTS transport syntax
SrsTsStreamAudioAAC = 0x0f, SrsTsStreamAudioAAC = 0x0f,
// ISO/IEC 14496-2 Visual // ISO/IEC 14496-2 Visual
SrsTsStreamVideoMpeg4 = 0x10, SrsTsStreamVideoMpeg4 = 0x10,
// ISO/IEC 14496-3 Audio with the LATM transport syntax as defined in ISO/IEC 14496-3 / AMD 1 // ISO/IEC 14496-3 Audio with the LATM transport syntax as defined in ISO/IEC 14496-3 / AMD 1
SrsTsStreamAudioMpeg4 = 0x11, SrsTsStreamAudioMpeg4 = 0x11,
// ISO/IEC 14496-1 SL-packetized stream or FlexMux stream carried in PES packets // ISO/IEC 14496-1 SL-packetized stream or FlexMux stream carried in PES packets
// ISO/IEC 14496-1 SL-packetized stream or FlexMux stream carried in ISO/IEC14496_sections. // ISO/IEC 14496-1 SL-packetized stream or FlexMux stream carried in ISO/IEC14496_sections.
// ISO/IEC 13818-6 Synchronized Download Protocol // ISO/IEC 13818-6 Synchronized Download Protocol
// ITU-T Rec. H.222.0 | ISO/IEC 13818-1 Reserved // ITU-T Rec. H.222.0 | ISO/IEC 13818-1 Reserved
// 0x15-0x7F // 0x15-0x7F
SrsTsStreamVideoH264 = 0x1b, SrsTsStreamVideoH264 = 0x1b,
// User Private // User Private
// 0x80-0xFF // 0x80-0xFF
SrsTsStreamAudioAC3 = 0x81, SrsTsStreamAudioAC3 = 0x81,
SrsTsStreamAudioDTS = 0x8a, SrsTsStreamAudioDTS = 0x8a,
}; };
std::string srs_ts_stream2string(SrsTsStream stream); std::string srs_ts_stream2string(SrsTsStream stream);
@ -192,58 +192,58 @@ struct SrsTsChannel
enum SrsTsPESStreamId enum SrsTsPESStreamId
{ {
// program_stream_map // program_stream_map
SrsTsPESStreamIdProgramStreamMap = 0xbc, // 0b10111100 SrsTsPESStreamIdProgramStreamMap = 0xbc, // 0b10111100
// private_stream_1 // private_stream_1
SrsTsPESStreamIdPrivateStream1 = 0xbd, // 0b10111101 SrsTsPESStreamIdPrivateStream1 = 0xbd, // 0b10111101
// padding_stream // padding_stream
SrsTsPESStreamIdPaddingStream = 0xbe, // 0b10111110 SrsTsPESStreamIdPaddingStream = 0xbe, // 0b10111110
// private_stream_2 // private_stream_2
SrsTsPESStreamIdPrivateStream2 = 0xbf, // 0b10111111 SrsTsPESStreamIdPrivateStream2 = 0xbf, // 0b10111111
// 110x xxxx // 110x xxxx
// ISO/IEC 13818-3 or ISO/IEC 11172-3 or ISO/IEC 13818-7 or ISO/IEC // ISO/IEC 13818-3 or ISO/IEC 11172-3 or ISO/IEC 13818-7 or ISO/IEC
// 14496-3 audio stream number x xxxx // 14496-3 audio stream number x xxxx
// ((sid >> 5) & 0x07) == SrsTsPESStreamIdAudio // ((sid >> 5) & 0x07) == SrsTsPESStreamIdAudio
// @remark, use SrsTsPESStreamIdAudioCommon as actually audio, SrsTsPESStreamIdAudio to check whether audio. // @remark, use SrsTsPESStreamIdAudioCommon as actually audio, SrsTsPESStreamIdAudio to check whether audio.
SrsTsPESStreamIdAudioChecker = 0x06, // 0b110 SrsTsPESStreamIdAudioChecker = 0x06, // 0b110
SrsTsPESStreamIdAudioCommon = 0xc0, SrsTsPESStreamIdAudioCommon = 0xc0,
// 1110 xxxx // 1110 xxxx
// ITU-T Rec. H.262 | ISO/IEC 13818-2 or ISO/IEC 11172-2 or ISO/IEC // ITU-T Rec. H.262 | ISO/IEC 13818-2 or ISO/IEC 11172-2 or ISO/IEC
// 14496-2 video stream number xxxx // 14496-2 video stream number xxxx
// ((stream_id >> 4) & 0x0f) == SrsTsPESStreamIdVideo // ((stream_id >> 4) & 0x0f) == SrsTsPESStreamIdVideo
// @remark, use SrsTsPESStreamIdVideoCommon as actually video, SrsTsPESStreamIdVideo to check whether video. // @remark, use SrsTsPESStreamIdVideoCommon as actually video, SrsTsPESStreamIdVideo to check whether video.
SrsTsPESStreamIdVideoChecker = 0x0e, // 0b1110 SrsTsPESStreamIdVideoChecker = 0x0e, // 0b1110
SrsTsPESStreamIdVideoCommon = 0xe0, SrsTsPESStreamIdVideoCommon = 0xe0,
// ECM_stream // ECM_stream
SrsTsPESStreamIdEcmStream = 0xf0, // 0b11110000 SrsTsPESStreamIdEcmStream = 0xf0, // 0b11110000
// EMM_stream // EMM_stream
SrsTsPESStreamIdEmmStream = 0xf1, // 0b11110001 SrsTsPESStreamIdEmmStream = 0xf1, // 0b11110001
// DSMCC_stream // DSMCC_stream
SrsTsPESStreamIdDsmccStream = 0xf2, // 0b11110010 SrsTsPESStreamIdDsmccStream = 0xf2, // 0b11110010
// 13522_stream // 13522_stream
SrsTsPESStreamId13522Stream = 0xf3, // 0b11110011 SrsTsPESStreamId13522Stream = 0xf3, // 0b11110011
// H_222_1_type_A // H_222_1_type_A
SrsTsPESStreamIdH2221TypeA = 0xf4, // 0b11110100 SrsTsPESStreamIdH2221TypeA = 0xf4, // 0b11110100
// H_222_1_type_B // H_222_1_type_B
SrsTsPESStreamIdH2221TypeB = 0xf5, // 0b11110101 SrsTsPESStreamIdH2221TypeB = 0xf5, // 0b11110101
// H_222_1_type_C // H_222_1_type_C
SrsTsPESStreamIdH2221TypeC = 0xf6, // 0b11110110 SrsTsPESStreamIdH2221TypeC = 0xf6, // 0b11110110
// H_222_1_type_D // H_222_1_type_D
SrsTsPESStreamIdH2221TypeD = 0xf7, // 0b11110111 SrsTsPESStreamIdH2221TypeD = 0xf7, // 0b11110111
// H_222_1_type_E // H_222_1_type_E
SrsTsPESStreamIdH2221TypeE = 0xf8, // 0b11111000 SrsTsPESStreamIdH2221TypeE = 0xf8, // 0b11111000
// ancillary_stream // ancillary_stream
SrsTsPESStreamIdAncillaryStream = 0xf9, // 0b11111001 SrsTsPESStreamIdAncillaryStream = 0xf9, // 0b11111001
// SL_packetized_stream // SL_packetized_stream
SrsTsPESStreamIdSlPacketizedStream = 0xfa, // 0b11111010 SrsTsPESStreamIdSlPacketizedStream = 0xfa, // 0b11111010
// FlexMux_stream // FlexMux_stream
SrsTsPESStreamIdFlexMuxStream = 0xfb, // 0b11111011 SrsTsPESStreamIdFlexMuxStream = 0xfb, // 0b11111011
// reserved data stream // reserved data stream
// 1111 1100 ... 1111 1110 // 1111 1100 ... 1111 1110
// program_stream_directory // program_stream_directory
SrsTsPESStreamIdProgramStreamDirectory = 0xff, // 0b11111111 SrsTsPESStreamIdProgramStreamDirectory = 0xff, // 0b11111111
}; };
/** /**
@ -857,28 +857,28 @@ public:
enum SrsTsPsiId enum SrsTsPsiId
{ {
// program_association_section // program_association_section
SrsTsPsiIdPas = 0x00, SrsTsPsiIdPas = 0x00,
// conditional_access_section (CA_section) // conditional_access_section (CA_section)
SrsTsPsiIdCas = 0x01, SrsTsPsiIdCas = 0x01,
// TS_program_map_section // TS_program_map_section
SrsTsPsiIdPms = 0x02, SrsTsPsiIdPms = 0x02,
// TS_description_section // TS_description_section
SrsTsPsiIdDs = 0x03, SrsTsPsiIdDs = 0x03,
// ISO_IEC_14496_scene_description_section // ISO_IEC_14496_scene_description_section
SrsTsPsiIdSds = 0x04, SrsTsPsiIdSds = 0x04,
// ISO_IEC_14496_object_descriptor_section // ISO_IEC_14496_object_descriptor_section
SrsTsPsiIdOds = 0x05, SrsTsPsiIdOds = 0x05,
// ITU-T Rec. H.222.0 | ISO/IEC 13818-1 reserved // ITU-T Rec. H.222.0 | ISO/IEC 13818-1 reserved
SrsTsPsiIdIso138181Start = 0x06, SrsTsPsiIdIso138181Start = 0x06,
SrsTsPsiIdIso138181End = 0x37, SrsTsPsiIdIso138181End = 0x37,
// Defined in ISO/IEC 13818-6 // Defined in ISO/IEC 13818-6
SrsTsPsiIdIso138186Start = 0x38, SrsTsPsiIdIso138186Start = 0x38,
SrsTsPsiIdIso138186End = 0x3F, SrsTsPsiIdIso138186End = 0x3F,
// User private // User private
SrsTsPsiIdUserStart = 0x40, SrsTsPsiIdUserStart = 0x40,
SrsTsPsiIdUserEnd = 0xFE, SrsTsPsiIdUserEnd = 0xFE,
// forbidden // forbidden
SrsTsPsiIdForbidden = 0xFF, SrsTsPsiIdForbidden = 0xFF,
}; };
/** /**

2
trunk/src/main/srs_main_ingest_hls.cpp
View file

@ -294,7 +294,7 @@ int SrsIngestSrsInput::parseTs(ISrsTsHandler* handler, char* body, int nb_body)
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
// use stream to parse ts packet. // use stream to parse ts packet.
int nb_packet = (int)nb_body / SRS_TS_PACKET_SIZE; int nb_packet = (int)nb_body / SRS_TS_PACKET_SIZE;
for (int i = 0; i < nb_packet; i++) { for (int i = 0; i < nb_packet; i++) {
char* p = (char*)body + (i * SRS_TS_PACKET_SIZE); char* p = (char*)body + (i * SRS_TS_PACKET_SIZE);
if ((ret = stream->initialize(p, SRS_TS_PACKET_SIZE)) != ERROR_SUCCESS) { if ((ret = stream->initialize(p, SRS_TS_PACKET_SIZE)) != ERROR_SUCCESS) {

16
trunk/src/protocol/srs_rtmp_stack.hpp
View file

@ -1960,7 +1960,7 @@ enum SrcPCUCEventType
* the stream ID of the stream that became * the stream ID of the stream that became
* functional. * functional.
*/ */
SrcPCUCStreamBegin = 0x00, SrcPCUCStreamBegin = 0x00,
/** /**
* The server sends this event to notify the client * The server sends this event to notify the client
@ -1971,7 +1971,7 @@ enum SrcPCUCEventType
* 4 bytes of event data represent the ID of the * 4 bytes of event data represent the ID of the
* stream on which playback has ended. * stream on which playback has ended.
*/ */
SrcPCUCStreamEOF = 0x01, SrcPCUCStreamEOF = 0x01,
/** /**
* The server sends this event to notify the client * The server sends this event to notify the client
@ -1981,7 +1981,7 @@ enum SrcPCUCEventType
* that the stream is dry. The 4 bytes of event * that the stream is dry. The 4 bytes of event
* data represent the stream ID of the dry stream. * data represent the stream ID of the dry stream.
*/ */
SrcPCUCStreamDry = 0x02, SrcPCUCStreamDry = 0x02,
/** /**
* The client sends this event to inform the server * The client sends this event to inform the server
@ -1993,7 +1993,7 @@ enum SrcPCUCEventType
* 4 bytes represent the buffer length, in * 4 bytes represent the buffer length, in
* milliseconds. * milliseconds.
*/ */
SrcPCUCSetBufferLength = 0x03, // 8bytes event-data SrcPCUCSetBufferLength = 0x03, // 8bytes event-data
/** /**
* The server sends this event to notify the client * The server sends this event to notify the client
@ -2001,7 +2001,7 @@ enum SrcPCUCEventType
* 4 bytes event data represent the stream ID of * 4 bytes event data represent the stream ID of
* the recorded stream. * the recorded stream.
*/ */
SrcPCUCStreamIsRecorded = 0x04, SrcPCUCStreamIsRecorded = 0x04,
/** /**
* The server sends this event to test whether the * The server sends this event to test whether the
@ -2011,7 +2011,7 @@ enum SrcPCUCEventType
* client responds with kMsgPingResponse on * client responds with kMsgPingResponse on
* receiving kMsgPingRequest. * receiving kMsgPingRequest.
*/ */
SrcPCUCPingRequest = 0x06, SrcPCUCPingRequest = 0x06,
/** /**
* The client sends this event to the server in * The client sends this event to the server in
@ -2019,14 +2019,14 @@ enum SrcPCUCEventType
* a 4-byte timestamp, which was received with the * a 4-byte timestamp, which was received with the
* kMsgPingRequest request. * kMsgPingRequest request.
*/ */
SrcPCUCPingResponse = 0x07, SrcPCUCPingResponse = 0x07,
/** /**
* for PCUC size=3, the payload is "00 1A 01", * for PCUC size=3, the payload is "00 1A 01",
* where we think the event is 0x001a, fms defined msg, * where we think the event is 0x001a, fms defined msg,
* which has only 1bytes event data. * which has only 1bytes event data.
*/ */
SrsPCUCFmsEvent0 = 0x1a, SrsPCUCFmsEvent0 = 0x1a,
}; };
/** /**

28
trunk/src/protocol/srs_rtsp_stack.hpp
View file

@ -45,11 +45,11 @@ class SrsCodecSample;
class ISrsProtocolReaderWriter; class ISrsProtocolReaderWriter;
// rtsp specification // rtsp specification
// CR = <US-ASCII CR, carriage return (13)> // CR = <US-ASCII CR, carriage return (13)>
#define SRS_RTSP_CR SRS_CONSTS_CR // 0x0D #define SRS_RTSP_CR SRS_CONSTS_CR // 0x0D
// LF = <US-ASCII LF, linefeed (10)> // LF = <US-ASCII LF, linefeed (10)>
#define SRS_RTSP_LF SRS_CONSTS_LF // 0x0A #define SRS_RTSP_LF SRS_CONSTS_LF // 0x0A
// SP = <US-ASCII SP, space (32)> // SP = <US-ASCII SP, space (32)>
#define SRS_RTSP_SP ' ' // 0x20 #define SRS_RTSP_SP ' ' // 0x20
// 4 RTSP Message, @see rtsp-rfc2326-1998.pdf, page 37 // 4 RTSP Message, @see rtsp-rfc2326-1998.pdf, page 37
@ -118,17 +118,17 @@ enum SrsRtspSdpState
*/ */
enum SrsRtspMethod enum SrsRtspMethod
{ {
SrsRtspMethodDescribe = 0x0001, SrsRtspMethodDescribe = 0x0001,
SrsRtspMethodAnnounce = 0x0002, SrsRtspMethodAnnounce = 0x0002,
SrsRtspMethodGetParameter = 0x0004, SrsRtspMethodGetParameter = 0x0004,
SrsRtspMethodOptions = 0x0008, SrsRtspMethodOptions = 0x0008,
SrsRtspMethodPause = 0x0010, SrsRtspMethodPause = 0x0010,
SrsRtspMethodPlay = 0x0020, SrsRtspMethodPlay = 0x0020,
SrsRtspMethodRecord = 0x0040, SrsRtspMethodRecord = 0x0040,
SrsRtspMethodRedirect = 0x0080, SrsRtspMethodRedirect = 0x0080,
SrsRtspMethodSetup = 0x0100, SrsRtspMethodSetup = 0x0100,
SrsRtspMethodSetParameter = 0x0200, SrsRtspMethodSetParameter = 0x0200,
SrsRtspMethodTeardown = 0x0400, SrsRtspMethodTeardown = 0x0400,
}; };
/** /**

4
trunk/src/utest/srs_utest_reload.cpp
View file

@ -69,7 +69,7 @@ int MockReloadHandler::count_total()
int MockReloadHandler::count_true() int MockReloadHandler::count_true()
{ {
int count_true = 0; int count_true = 0;
if (listen_reloaded) count_true++; if (listen_reloaded) count_true++;
if (pid_reloaded) count_true++; if (pid_reloaded) count_true++;
@ -99,7 +99,7 @@ int MockReloadHandler::count_true()
int MockReloadHandler::count_false() int MockReloadHandler::count_false()
{ {
int count_false = 0; int count_false = 0;
if (!listen_reloaded) count_false++; if (!listen_reloaded) count_false++;
if (!pid_reloaded) count_false++; if (!pid_reloaded) count_false++;