THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改时间戳溢出的bug

This commit is contained in:
xiongziliang 2018-12-25 09:30:49 +08:00
parent a904a42125
commit 8b7986b4fc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/MediaFile/HLSMaker.cpp
View File

@ -162,11 +162,11 @@ void HLSMaker::inputH264(const Frame::Ptr &frame) {
case H264Frame::NAL_B_P: //P case H264Frame::NAL_B_P: //P
//insert aud frame before p and SPS frame //insert aud frame before p and SPS frame
if(dts != _ui32LastFrameStamp){ if(dts != _ui32LastFrameStamp){
_ts.inputH264("\x0\x0\x0\x1\x9\xf0", 6, dts * 90L , frame->pts() * 90L); _ts.inputH264("\x0\x0\x0\x1\x9\xf0", 6, dts * 90LL , frame->pts() * 90LL);
} }
case H264Frame::NAL_IDR: //IDR case H264Frame::NAL_IDR: //IDR
case H264Frame::NAL_PPS: //PPS case H264Frame::NAL_PPS: //PPS
_ts.inputH264(frame->data(), frame->size(), dts * 90L , frame->pts() * 90L); _ts.inputH264(frame->data(), frame->size(), dts * 90LL , frame->pts() * 90LL);
break; break;
default: default:
break; break;
@ -176,7 +176,7 @@ void HLSMaker::inputH264(const Frame::Ptr &frame) {
} }
void HLSMaker::inputAAC(const Frame::Ptr &frame) { void HLSMaker::inputAAC(const Frame::Ptr &frame) {
_ts.inputAAC(frame->data(), frame->size(), frame->dts() * 90L , frame->pts() * 90L); _ts.inputAAC(frame->data(), frame->size(), frame->dts() * 90LL , frame->pts() * 90LL);
} }
bool HLSMaker::removets() { bool HLSMaker::removets() {

2
src/Rtsp/RtpReceiver.cpp
View File

@ -60,7 +60,7 @@ bool RtpReceiver::handleOneRtp(int iTrackidx,SdpTrack::Ptr &track, unsigned char
return false; return false;
} }
//时间戳转换成毫秒 //时间戳转换成毫秒
rtppt.timeStamp = ntohl(rtppt.timeStamp) * 1000L / track->_samplerate; rtppt.timeStamp = ntohl(rtppt.timeStamp) * 1000LL / track->_samplerate;
//ssrc //ssrc
memcpy(&rtppt.ssrc,pucData+8,4);//内存对齐 memcpy(&rtppt.ssrc,pucData+8,4);//内存对齐
rtppt.ssrc = ntohl(rtppt.ssrc); rtppt.ssrc = ntohl(rtppt.ssrc);