Skip to content

Commit 136a7ef

Browse files
committed
for #299, refine docs.
1 parent e8353cb commit 136a7ef

22 files changed

+73
-70
lines changed
239 KB
Binary file not shown.

trunk/doc/readme.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ H.264-AVC-ISO_IEC_14496-10.pdf
2222
H.264-AVC-ISO_IEC_14496-12_2012-mp4.pdf
2323
mp4标准。
2424

25+
ISO_14496-14_2003_mp4-file-format.pdf
26+
mp4文件格式。
27+
2528
MPEG-DASH-ISO_IEC_23009-1_2012.pdf
2629
MPEG-DASH标准。
2730

trunk/research/librtmp/srs_h264_raw_publish.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ int main(int argc, char** argv)
181181
}
182182

183183
// 5bits, 7.3.1 NAL unit syntax,
184-
// H.264-AVC-ISO_IEC_14496-10.pdf, page 44.
184+
// ISO_IEC_14496-10-AVC-2003.pdf, page 44.
185185
// 7: SPS, 8: PPS, 5: I Frame, 1: P Frame, 9: AUD, 6: SEI
186186
u_int8_t nut = (char)data[nb_start_code] & 0x1f;
187187
srs_human_trace("sent packet: type=%s, time=%d, size=%d, fps=%.2f, b[%d]=%#x(%s)",

trunk/src/app/srs_app_mpegts_udp.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@ int SrsMpegtsOverUdp::on_ts_message(SrsTsMessage* msg)
259259
// for example, when SrsTsStream of SrsTsChannel indicates stream_type is SrsTsStreamVideoMpeg4 and SrsTsStreamAudioMpeg4,
260260
// the elementary stream can be mux in "2.11 Carriage of ISO/IEC 14496 data" in hls-mpeg-ts-iso13818-1.pdf, page 103
261261
// @remark, the most popular stream_id is 0xe0 for h.264 over mpegts, which indicates the stream_id is video and
262-
// stream_number is 0, where I guess the elementary is specified in annexb format(H.264-AVC-ISO_IEC_14496-10.pdf, page 211).
263-
// because when audio stream_number is 0, the elementary is ADTS(aac-mp4a-format-ISO_IEC_14496-3+2001.pdf, page 75, 1.A.2.2 ADTS).
262+
// stream_number is 0, where I guess the elementary is specified in annexb format(ISO_IEC_14496-10-AVC-2003.pdf, page 211).
263+
// because when audio stream_number is 0, the elementary is ADTS(ISO_IEC_14496-3-AAC-2001.pdf, page 75, 1.A.2.2 ADTS).
264264

265265
// about the bytes of PES_packet_data_byte, defined in hls-mpeg-ts-iso13818-1.pdf, page 58
266266
// PES_packet_data_byte "C PES_packet_data_bytes shall be contiguous bytes of data from the elementary stream
@@ -361,7 +361,7 @@ int SrsMpegtsOverUdp::on_ts_video(SrsTsMessage* msg, SrsBuffer* avs)
361361
}
362362

363363
// 5bits, 7.3.1 NAL unit syntax,
364-
// H.264-AVC-ISO_IEC_14496-10.pdf, page 44.
364+
// ISO_IEC_14496-10-AVC-2003.pdf, page 44.
365365
// 7: SPS, 8: PPS, 5: I Frame, 1: P Frame
366366
SrsAvcNaluType nal_unit_type = (SrsAvcNaluType)(frame[0] & 0x1f);
367367

@@ -471,7 +471,7 @@ int SrsMpegtsOverUdp::write_h264_ipb_frame(char* frame, int frame_size, u_int32_
471471
}
472472

473473
// 5bits, 7.3.1 NAL unit syntax,
474-
// H.264-AVC-ISO_IEC_14496-10.pdf, page 44.
474+
// ISO_IEC_14496-10-AVC-2003.pdf, page 44.
475475
// 7: SPS, 8: PPS, 5: I Frame, 1: P Frame
476476
SrsAvcNaluType nal_unit_type = (SrsAvcNaluType)(frame[0] & 0x1f);
477477

0 commit comments

Comments
 (0)