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

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2016-09-09 14:14:22 +08:00
commit eb915413ad
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1323,9 +1323,10 @@ int srs_write_h264_ipb_frame(Context* context,
// 5bits, 7.3.1 NAL unit syntax,
// H.264-AVC-ISO_IEC_14496-10.pdf, page 44.
// 5: I Frame, 1: P/B Frame
// @remark for rtmp, we only need to send the I/P/B frames to server,
// the aud is used for server to remux stream to annexb.
// TODO: FIXME: we must group NALUs between AUD to a frame.
// @remark we already group sps/pps to sequence header frame;
// for I/P NALU, we send them in isolate frame, each NALU in a frame;
// for other NALU, for example, AUD/SEI, we just ignore them, because
// AUD used in annexb to split frame, while SEI generally we can ignore it.
SrsAvcNaluType nut = (SrsAvcNaluType)(frame[0] & 0x1f);
if (nut != SrsAvcNaluTypeIDR && nut != SrsAvcNaluTypeNonIDR) {
return ret;