justdan96
/
tsMuxer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initialize avPacket.data to nullptr instead of 0

master
jcdr428 2022-04-24 17:16:13 +00:00
parent cad2b42fd5
commit eccdf885c3
11 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tsMuxer/avPacket.h
View File

@ -31,7 +31,7 @@ class BaseAbstractStreamReader;
struct AVPacket
{
AVPacket()
: pts(0), dts(0), data(0), size(0), stream_index(0), flags(0), duration(0), pos(0), pcr(0), codec(), codecID(0)
: pts(0), dts(0), data(nullptr), size(0), stream_index(0), flags(0), duration(0), pos(0), pcr(0), codec(), codecID(0)
{
}
int64_t pts; // presentation time stamp in time_base units

2
tsMuxer/h264StreamReader.cpp
View File

@ -298,7 +298,7 @@ int H264StreamReader::writeAdditionData(uint8_t* dstBuffer, uint8_t* dstEnd, AVP
memcpy(curPos, avPacket.data, avPacket.size);
curPos += avPacket.size;
avPacket.size = 0;
avPacket.data = 0;
avPacket.data = nullptr;
}
}

2
tsMuxer/hevcStreamReader.cpp
View File

@ -631,7 +631,7 @@ int HEVCStreamReader::writeAdditionData(uint8_t* dstBuffer, uint8_t* dstEnd, AVP
memcpy(curPos, avPacket.data, avPacket.size);
curPos += avPacket.size;
avPacket.size = 0;
avPacket.data = 0;
avPacket.data = nullptr;
}
}

8
tsMuxer/lpcmStreamReader.cpp
View File

@ -748,7 +748,7 @@ int LPCMStreamReader::readPacket(AVPacket& avPacket)
avPacket.stream_index = m_streamIndex;
avPacket.codecID = getCodecInfo().codecID;
avPacket.codec = this;
avPacket.data = 0;
avPacket.data = nullptr;
avPacket.size = 0;
avPacket.duration = 0;
avPacket.dts = avPacket.pts = (int64_t)(m_curPts * m_stretch) + m_timeOffset;
@ -846,7 +846,7 @@ int LPCMStreamReader::readPacket(AVPacket& avPacket)
int LPCMStreamReader::flushPacket(AVPacket& avPacket)
{
avPacket.duration = 0;
avPacket.data = 0;
avPacket.data = nullptr;
avPacket.size = 0;
avPacket.stream_index = m_streamIndex;
avPacket.flags = m_flags + AVPacket::IS_COMPLETE_FRAME;
@ -864,7 +864,7 @@ int LPCMStreamReader::flushPacket(AVPacket& avPacket)
if (m_tmpBuffer.size() > 0)
avPacket.data = &m_tmpBuffer[0];
else
avPacket.data = 0;
avPacket.data = nullptr;
avPacket.data += skipBeforeBytes;
if (m_tmpBufferLen > 0)
{
@ -884,7 +884,7 @@ int LPCMStreamReader::flushPacket(AVPacket& avPacket)
int64_t samplesRest = m_frameRest / m_channels;
m_frameRest = samplesRest * ((m_channels + 1) & 0xfe);
m_frameRest -= avPacket.size - (m_needPCMHdr ? 4 : 0);
if (m_frameRest > 0)
if (avPacket.data != nullptr && m_frameRest > 0)
{
memset(avPacket.data + avPacket.size, 0, m_frameRest);
avPacket.size += (int)m_frameRest;

2
tsMuxer/metaDemuxer.cpp
View File

@ -67,7 +67,7 @@ int METADemuxer::readPacket(AVPacket& avPacket)
{
avPacket.stream_index = 0;
avPacket.data = 0;
avPacket.data = nullptr;
avPacket.size = 0;
avPacket.codec = 0;
m_lastReadRez = 0;

4
tsMuxer/mpegStreamReader.cpp
View File

@ -39,7 +39,7 @@ int MPEGStreamReader::flushPacket(AVPacket& avPacket)
m_eof = true;
avPacket.codec = this;
avPacket.duration = 0;
avPacket.data = 0;
avPacket.data = nullptr;
avPacket.size = 0;
avPacket.flags = m_flags;
avPacket.stream_index = m_streamIndex;
@ -103,7 +103,7 @@ int MPEGStreamReader::readPacket(AVPacket& avPacket)
avPacket.codecID = getCodecInfo().codecID;
avPacket.duration = 0;
avPacket.data = 0;
avPacket.data = nullptr;
avPacket.size = 0;
avPacket.pts = m_curPts + m_timeOffset;
avPacket.dts = m_curDts + m_timeOffset - m_pcrIncPerFrame * getFrameDepth(); // shift dts back

2
tsMuxer/psgStreamReader.cpp
View File

@ -418,7 +418,7 @@ int PGSStreamReader::readPacket(AVPacket& avPacket)
avPacket.codec = this;
avPacket.codecID = CODEC_S_PGS;
avPacket.stream_index = m_streamIndex;
avPacket.data = 0;
avPacket.data = nullptr;
avPacket.size = 0;
avPacket.flags = 0;
avPacket.duration = 0;

4
tsMuxer/simplePacketizerReader.cpp
View File

@ -66,7 +66,7 @@ uint64_t SimplePacketizerReader::getProcessedSize() { return m_processedBytes; }
int SimplePacketizerReader::flushPacket(AVPacket& avPacket)
{
avPacket.duration = 0;
avPacket.data = 0;
avPacket.data = nullptr;
avPacket.size = 0;
avPacket.stream_index = m_streamIndex;
avPacket.flags = m_flags + AVPacket::IS_COMPLETE_FRAME;
@ -104,7 +104,7 @@ int SimplePacketizerReader::readPacket(AVPacket& avPacket)
avPacket.stream_index = m_streamIndex;
avPacket.codecID = getCodecInfo().codecID;
avPacket.codec = this;
avPacket.data = 0;
avPacket.data = nullptr;
avPacket.size = 0;
avPacket.duration = 0;
avPacket.dts = avPacket.pts = (int64_t)(m_curPts * m_stretch) + m_timeOffset;

2
tsMuxer/singleFileMuxer.cpp
View File

@ -237,7 +237,7 @@ void SingleFileMuxer::writeOutBuffer(StreamInfo* streamInfo)
bool SingleFileMuxer::muxPacket(AVPacket& avPacket)
{
if (avPacket.data == 0 || avPacket.size == 0)
if (avPacket.data == nullptr || avPacket.size == 0)
return true;
StreamInfo* streamInfo = m_streamInfo[avPacket.stream_index];
if (avPacket.dts != streamInfo->m_dts || avPacket.pts != streamInfo->m_pts ||

2
tsMuxer/tsMuxer.cpp
View File

@ -925,7 +925,7 @@ bool TSMuxer::blockFull() const { return m_processedBlockSize >= m_interliaveBlo
bool TSMuxer::muxPacket(AVPacket& avPacket)
{
if (avPacket.data == 0 || avPacket.size == 0)
if (avPacket.data == nullptr || avPacket.size == 0)
{
return true;
}

2
tsMuxer/vvcStreamReader.cpp
View File

@ -436,7 +436,7 @@ int VVCStreamReader::writeAdditionData(uint8_t* dstBuffer, uint8_t* dstEnd, AVPa
memcpy(curPos, avPacket.data, avPacket.size);
curPos += avPacket.size;
avPacket.size = 0;
avPacket.data = 0;
avPacket.data = nullptr;
}
}