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

fix #203, srs-librtmp drop any video before sps/pps(sequence header). 2.0.21.

Browse source
This commit is contained in:
winlin 2014-11-15 16:30:37 +08:00
parent ecfbcd68d8
commit 278ff845d3
6 changed files with 50 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
trunk/src/libs/srs_librtmp.cpp
View file

@ -76,11 +76,15 @@ struct Context
// about SPS, @see: 7.3.2.1.1, H.264-AVC-ISO_IEC_14496-10-2012.pdf, page 62
std::string h264_sps;
std::string h264_pps;
// whether the sps and pps sent,
// @see https://github.com/winlinvip/simple-rtmp-server/issues/203
bool h264_sps_pps_sent;
Context() {
rtmp = NULL;
skt = NULL;
stream_id = 0;
h264_sps_pps_sent = false;
}
virtual ~Context() {
srs_freep(rtmp);
@ -1205,6 +1209,7 @@ int __srs_write_h264_sps_pps(Context* context, u_int32_t dts, u_int32_t pts)
// reset sps and pps.
context->h264_pps = "";
context->h264_sps = "";
context->h264_sps_pps_sent = true;
// TODO: FIXME: for more profile.
// 5.3.4.2.1 Syntax, H.264-AVC-ISO_IEC_14496-15.pdf, page 16
@ -1227,6 +1232,12 @@ int __srs_write_h264_ipb_frame(Context* context,
) {
int ret = ERROR_SUCCESS;
// when sps or pps not sent, ignore the packet.
// @see https://github.com/winlinvip/simple-rtmp-server/issues/203
if (!context->h264_sps_pps_sent) {
return ERROR_H264_DROP_BEFORE_SPS_PPS;
}
// 5bits, 7.3.1 NAL unit syntax,
// H.264-AVC-ISO_IEC_14496-10.pdf, page 44.
// 7: SPS, 8: PPS, 5: I Frame, 1: P Frame
@ -1315,7 +1326,7 @@ int __srs_write_h264_raw_frame(Context* context,
/**
* write h264 multiple frames, in annexb format.
*/
int srs_write_h264_raw_frames(srs_rtmp_t rtmp,
int srs_h264_write_raw_frames(srs_rtmp_t rtmp,
char* frames, int frames_size, u_int32_t dts, u_int32_t pts
) {
int ret = ERROR_SUCCESS;
@ -1360,6 +1371,11 @@ int srs_write_h264_raw_frames(srs_rtmp_t rtmp,
return ret;
}
srs_h264_bool srs_h264_is_dvbsp_error(int error_code)
{
return error_code == ERROR_H264_DROP_BEFORE_SPS_PPS;
}
int srs_h264_startswith_annexb(char* h264_raw_data, int h264_raw_size, int* pnb_start_code)
{
SrsStream stream;