正在显示
2 个修改的文件
包含
4 行增加
和
3 行删除
| @@ -1269,7 +1269,7 @@ int64_t TSPayloadPES::decode_33bits_int(int64_t& temp) | @@ -1269,7 +1269,7 @@ int64_t TSPayloadPES::decode_33bits_int(int64_t& temp) | ||
| 1269 | // marker_bit 1bit | 1269 | // marker_bit 1bit |
| 1270 | temp = temp >> 1; | 1270 | temp = temp >> 1; |
| 1271 | // PTS [14..0] 15bits | 1271 | // PTS [14..0] 15bits |
| 1272 | - ret |= temp & 0x3fff; | 1272 | + ret |= temp & 0x7fff; |
| 1273 | // marker_bit 1bit | 1273 | // marker_bit 1bit |
| 1274 | temp = temp >> 1; | 1274 | temp = temp >> 1; |
| 1275 | // PTS [29..15] 15bits, 15zero, 29-15+1one | 1275 | // PTS [29..15] 15bits, 15zero, 29-15+1one |
| @@ -277,7 +277,8 @@ u_int8_t mpegts_header[] = { | @@ -277,7 +277,8 @@ u_int8_t mpegts_header[] = { | ||
| 277 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff | 277 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff |
| 278 | }; | 278 | }; |
| 279 | 279 | ||
| 280 | -// @see: NGX_RTMP_HLS_DELAY, 700ms, ts_tbn=90000 | 280 | +// @see: NGX_RTMP_HLS_DELAY, |
| 281 | +// 63000: 700ms, ts_tbn=90000 | ||
| 281 | #define SRS_HLS_DELAY 63000 | 282 | #define SRS_HLS_DELAY 63000 |
| 282 | 283 | ||
| 283 | // @see: ngx_rtmp_mpegts.c | 284 | // @see: ngx_rtmp_mpegts.c |
| @@ -645,7 +646,7 @@ int SrsTSMuxer::write_video(u_int32_t time, SrsCodec* codec, SrsCodecSample* sam | @@ -645,7 +646,7 @@ int SrsTSMuxer::write_video(u_int32_t time, SrsCodec* codec, SrsCodecSample* sam | ||
| 645 | return ret; | 646 | return ret; |
| 646 | } | 647 | } |
| 647 | 648 | ||
| 648 | - if (video_frame.key && !sps_pps_sent) { | 649 | + if (false && video_frame.key && !sps_pps_sent) { |
| 649 | // sample start prefix | 650 | // sample start prefix |
| 650 | video_buffer->append(aud_nal, 4); | 651 | video_buffer->append(aud_nal, 4); |
| 651 | // sps and pps | 652 | // sps and pps |
-
请 注册 或 登录 后发表评论