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 bug of ts_info

Browse source
This commit is contained in:
winlin 2013-11-25 10:59:21 +08:00
parent d5b84b5e20
commit 164392f6aa
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/research/ts_info.cc
View file

@ -1269,7 +1269,7 @@ int64_t TSPayloadPES::decode_33bits_int(int64_t& temp)
// marker_bit 1bit // marker_bit 1bit
temp = temp >> 1; temp = temp >> 1;
// PTS [14..0] 15bits // PTS [14..0] 15bits
ret |= temp & 0x3fff; ret |= temp & 0x7fff;
// marker_bit 1bit // marker_bit 1bit
temp = temp >> 1; temp = temp >> 1;
// PTS [29..15] 15bits, 15zero, 29-15+1one // PTS [29..15] 15bits, 15zero, 29-15+1one

5
trunk/src/core/srs_core_hls.cpp
View file

@ -277,7 +277,8 @@ u_int8_t mpegts_header[] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff 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 #define SRS_HLS_DELAY 63000
// @see: ngx_rtmp_mpegts.c // @see: ngx_rtmp_mpegts.c
@ -645,7 +646,7 @@ int SrsTSMuxer::write_video(u_int32_t time, SrsCodec* codec, SrsCodecSample* sam
return ret; return ret;
} }
if (video_frame.key && !sps_pps_sent) { if (false && video_frame.key && !sps_pps_sent) {
// sample start prefix // sample start prefix
video_buffer->append(aud_nal, 4); video_buffer->append(aud_nal, 4);
// sps and pps // sps and pps