diff --git a/trunk/research/ts_info.cc b/trunk/research/ts_info.cc index 747c5e6fd..eab6fbe96 100644 --- a/trunk/research/ts_info.cc +++ b/trunk/research/ts_info.cc @@ -1269,7 +1269,7 @@ int64_t TSPayloadPES::decode_33bits_int(int64_t& temp) // marker_bit 1bit temp = temp >> 1; // PTS [14..0] 15bits - ret |= temp & 0x3fff; + ret |= temp & 0x7fff; // marker_bit 1bit temp = temp >> 1; // PTS [29..15] 15bits, 15zero, 29-15+1one diff --git a/trunk/src/core/srs_core_hls.cpp b/trunk/src/core/srs_core_hls.cpp index ca58451ad..e9665e214 100644 --- a/trunk/src/core/srs_core_hls.cpp +++ b/trunk/src/core/srs_core_hls.cpp @@ -277,7 +277,8 @@ u_int8_t mpegts_header[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; -// @see: NGX_RTMP_HLS_DELAY, 700ms, ts_tbn=90000 +// @see: NGX_RTMP_HLS_DELAY, +// 63000: 700ms, ts_tbn=90000 #define SRS_HLS_DELAY 63000 // @see: ngx_rtmp_mpegts.c @@ -645,7 +646,7 @@ int SrsTSMuxer::write_video(u_int32_t time, SrsCodec* codec, SrsCodecSample* sam return ret; } - if (video_frame.key && !sps_pps_sent) { + if (false && video_frame.key && !sps_pps_sent) { // sample start prefix video_buffer->append(aud_nal, 4); // sps and pps