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, support h264 video for push mpegts over udp. 2.0.110

Browse source
This commit is contained in:
winlin 2015-01-31 19:46:55 +08:00
parent 66fccdbbd1
commit 70c8fe13c4
15 changed files with 942 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,7 @@ enum SrsCodecAudioType
// 5 = video info/command frame
enum SrsCodecVideoAVCFrame
{
// set to the max value to reserved, for array map.
// set to the zero to reserved, for array map.
SrsCodecVideoAVCFrameReserved = 0,
SrsCodecVideoAVCFrameReserved1 = 6,
@ -91,7 +91,7 @@ enum SrsCodecVideoAVCType
// 7 = AVC
enum SrsCodecVideo
{
// set to the max value to reserved, for array map.
// set to the zero to reserved, for array map.
SrsCodecVideoReserved = 0,
SrsCodecVideoReserved1 = 1,
SrsCodecVideoReserved2 = 8,
@ -163,6 +163,22 @@ enum SrsCodecAudioSampleRate
SrsCodecAudioSampleRate44100 = 3,
};
/**
* E.4.1 FLV Tag, page 75
*/
enum SrsCodecFlvTag
{
// set to the zero to reserved, for array map.
SrsCodecFlvTagReserved = 0,
// 8 = audio
SrsCodecFlvTagAudio = 8,
// 9 = video
SrsCodecFlvTagVideo = 9,
// 18 = script data
SrsCodecFlvTagScript = 18,
};
/**
* Annex E. The FLV File Format
* @see SrsAvcAacCodec for the media stream codec.

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

@ -228,6 +228,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define ERROR_STREAM_CASTER_TS_PMT 4018
#define ERROR_STREAM_CASTER_TS_PSE 4019
#define ERROR_STREAM_CASTER_TS_ES 4020
#define ERROR_STREAM_CASTER_TS_CODEC 4021
#define ERROR_STREAM_CASTER_AVC_SPS 4022
#define ERROR_STREAM_CASTER_AVC_PPS 4023
#define ERROR_STREAM_CASTER_FLV_TAG 4024
/**
* whether the error code is an system control error.