mirror/ZLMediaKit
2
0
Fork 1
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-27 04:20:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复编译错误

Browse Source
This commit is contained in:
xiongziliang 2020-04-18 23:58:29 +08:00
parent 49596bd97f
commit b7b839a06f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Common/Device.cpp
View File

@ -64,8 +64,8 @@ void DevChannel::inputPCM(char* pcData, int iDataLen, uint32_t uiStamp) {
if (_pAacEnc) { if (_pAacEnc) {
unsigned char *pucOut; unsigned char *pucOut;
int iRet = _pAacEnc->inputData(pcData, iDataLen, &pucOut); int iRet = _pAacEnc->inputData(pcData, iDataLen, &pucOut);
if (iRet > 0) { if (iRet > 7) {
inputAAC((char *) pucOut + 7, iRet, uiStamp, pucOut); inputAAC((char *) pucOut + 7, iRet - 7, uiStamp, (char *)pucOut);
} }
} }
} }
@ -147,10 +147,10 @@ void DevChannel::inputAAC(const char *data_without_adts, int len, uint32_t dts,
if(adts_header){ if(adts_header){
if(adts_header + 7 == data_without_adts){ if(adts_header + 7 == data_without_adts){
//adts头和帧再一起 //adts头和帧在一起
inputFrame(std::make_shared<AACFrameNoCacheAble>((char *)data_without_adts - 7, len + 7, dts, 0, 7)); inputFrame(std::make_shared<AACFrameNoCacheAble>((char *)data_without_adts - 7, len + 7, dts, 0, 7));
}else{ }else{
//adts头和帧不再一起 //adts头和帧不在一起
char *dataWithAdts = new char[len + 7]; char *dataWithAdts = new char[len + 7];
memcpy(dataWithAdts, adts_header, 7); memcpy(dataWithAdts, adts_header, 7);
memcpy(dataWithAdts + 7 , data_without_adts , len); memcpy(dataWithAdts + 7 , data_without_adts , len);