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

Use auto when initializing to avoid duplicating the type name

master
jcdr428 2022-04-24 18:14:26 +00:00
parent eccdf885c3
commit eacc766ad2
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tsMuxer/metaDemuxer.cpp
View File

@ -740,73 +740,73 @@ CheckStreamRez METADemuxer::detectTrackReader(uint8_t* tmpBuffer, int len,
if (len == 0)
return rez;
LPCMStreamReader* lpcmReader = new LPCMStreamReader();
auto lpcmReader = new LPCMStreamReader();
rez = lpcmReader->checkStream(tmpBuffer, len, containerType, containerDataType, containerStreamIndex);
delete lpcmReader;
if (rez.codecInfo.codecID)
return rez;
H264StreamReader* h264codec = new H264StreamReader();
auto h264codec = new H264StreamReader();
rez = h264codec->checkStream(tmpBuffer, len);
delete h264codec;
if (rez.codecInfo.codecID)
return rez;
DTSStreamReader* dtscodec = new DTSStreamReader();
auto dtscodec = new DTSStreamReader();
rez = dtscodec->checkStream(tmpBuffer, len, containerType, containerDataType, containerStreamIndex);
delete dtscodec;
if (rez.codecInfo.codecID)
return rez;
AC3StreamReader* ac3codec = new AC3StreamReader();
auto ac3codec = new AC3StreamReader();
rez = ac3codec->checkStream(tmpBuffer, len, containerType, containerDataType, containerStreamIndex);
delete ac3codec;
if (rez.codecInfo.codecID)
return rez;
MLPStreamReader* mlpcodec = new MLPStreamReader();
auto mlpcodec = new MLPStreamReader();
rez = mlpcodec->checkStream(tmpBuffer, len, containerType, containerDataType, containerStreamIndex);
delete mlpcodec;
if (rez.codecInfo.codecID)
return rez;
AACStreamReader* aaccodec = new AACStreamReader();
auto aaccodec = new AACStreamReader();
rez = aaccodec->checkStream(tmpBuffer, len, containerType, containerDataType, containerStreamIndex);
delete aaccodec;
if (rez.codecInfo.codecID)
return rez;
VC1StreamReader* vc1ccodec = new VC1StreamReader();
auto vc1ccodec = new VC1StreamReader();
rez = vc1ccodec->checkStream(tmpBuffer, len);
delete vc1ccodec;
if (rez.codecInfo.codecID)
return rez;
HEVCStreamReader* hevcCodec = new HEVCStreamReader();
auto hevcCodec = new HEVCStreamReader();
rez = hevcCodec->checkStream(tmpBuffer, len);
delete hevcCodec;
if (rez.codecInfo.codecID)
return rez;
VVCStreamReader* vvcCodec = new VVCStreamReader();
auto vvcCodec = new VVCStreamReader();
rez = vvcCodec->checkStream(tmpBuffer, len);
delete vvcCodec;
if (rez.codecInfo.codecID)
return rez;
MPEG2StreamReader* mpeg2ccodec = new MPEG2StreamReader();
auto mpeg2ccodec = new MPEG2StreamReader();
rez = mpeg2ccodec->checkStream(tmpBuffer, len);
delete mpeg2ccodec;
if (rez.codecInfo.codecID)
return rez;
MpegAudioStreamReader* mpegAudioCodec = new MpegAudioStreamReader();
auto mpegAudioCodec = new MpegAudioStreamReader();
rez = mpegAudioCodec->checkStream(tmpBuffer, len, containerType, containerDataType, containerStreamIndex);
delete mpegAudioCodec;
if (rez.codecInfo.codecID)
return rez;
DVBSubStreamReader* supReader = new DVBSubStreamReader();
auto supReader = new DVBSubStreamReader();
rez = supReader->checkStream(tmpBuffer, len, containerType, containerDataType, containerStreamIndex);
delete supReader;
if (rez.codecInfo.codecID)

6
tsMuxer/movDemuxer.cpp
View File

@ -1044,7 +1044,7 @@ int MovDemuxer::mov_read_trex(MOVAtom atom)
int MovDemuxer::mov_read_trak(MOVAtom atom)
{
MOVStreamContext* sc = new MOVStreamContext();
auto sc = new MOVStreamContext();
Track* st = tracks[num_tracks] = sc;
num_tracks++;
st->type = IOContextTrackType::DATA;
@ -1168,7 +1168,7 @@ int MovDemuxer::mov_read_extradata(MOVAtom atom)
return -1;
int64_t oldSize = st->codec_priv_size;
uint8_t* tmp = new uint8_t[oldSize];
auto tmp = new uint8_t[oldSize];
memcpy(tmp, st->codec_priv, oldSize);
delete[] st->codec_priv;
st->codec_priv = new uint8_t[newSize];
@ -1650,7 +1650,7 @@ int MovDemuxer::mov_read_elst(MOVAtom atom)
double MovDemuxer::getTrackFps(uint32_t trackId)
{
MOVStreamContext* st = (MOVStreamContext*)tracks[trackId - 1];
auto st = (MOVStreamContext*)tracks[trackId - 1];
return st->fps;
}

4
tsMuxer/nalUnits.cpp
View File

@ -765,7 +765,7 @@ void SPSUnit::updateTimingInfo()
const int EXTRA_SPACE = 64;
uint8_t* newNalBuffer = new uint8_t[m_nalBufferLen + EXTRA_SPACE];
auto newNalBuffer = new uint8_t[m_nalBufferLen + EXTRA_SPACE];
int beforeBytes = bitPos >> 3;
memcpy(newNalBuffer, m_nalBuffer, m_nalBufferLen);
@ -823,7 +823,7 @@ void SPSUnit::insertHrdData(int bitPos, int nal_hrd_len, int vcl_hrd_len, bool a
// replace hrd parameters not implemented. only insert
const int EXTRA_SPACE = 64;
uint8_t* newNalBuffer = new uint8_t[m_nalBufferLen + EXTRA_SPACE];
auto newNalBuffer = new uint8_t[m_nalBufferLen + EXTRA_SPACE];
int beforeBytes = bitPos >> 3;
memcpy(newNalBuffer, m_nalBuffer, m_nalBufferLen);

6
tsMuxer/programStreamDemuxer.cpp
View File

@ -27,7 +27,7 @@ ProgramStreamDemuxer::ProgramStreamDemuxer(const BufferedReaderManager& readMana
void ProgramStreamDemuxer::setFileIterator(FileNameIterator* itr)
{
BufferedReader* br = dynamic_cast<BufferedReader*>(m_bufferedReader);
auto br = dynamic_cast<BufferedReader*>(m_bufferedReader);
if (br)
br->setFileIterator(itr, m_readerID);
else if (itr != 0)
@ -351,7 +351,7 @@ int ProgramStreamDemuxer::simpleDemuxBlock(DemuxedData& demuxedData, const PIDSe
int64_t getLastPCR(File& file, int bufferSize, int64_t fileSize)
{
file.seek(FFMAX(0, fileSize - bufferSize), File::SeekMethod::smBegin);
uint8_t* tmpBuffer = new uint8_t[bufferSize];
auto tmpBuffer = new uint8_t[bufferSize];
int len = file.read(tmpBuffer, bufferSize);
if (len < 1)
return -2;
@ -387,7 +387,7 @@ int64_t getPSDuration(const char* fileName)
if (!file.size(&fileSize))
return 0;
uint8_t* tmpBuffer = new uint8_t[BUF_SIZE];
auto tmpBuffer = new uint8_t[BUF_SIZE];
// pcr from start of file
int len = file.read(tmpBuffer, BUF_SIZE);

4
tsMuxer/singleFileMuxer.cpp
View File

@ -156,7 +156,7 @@ void SingleFileMuxer::intAddStream(const std::string& streamName, const std::str
fileName += itr->second;
}
StreamInfo* streamInfo = new StreamInfo((unsigned)DEFAULT_FILE_BLOCK_SIZE);
auto streamInfo = new StreamInfo((unsigned)DEFAULT_FILE_BLOCK_SIZE);
streamInfo->m_fileName = fileName + fileExt;
if (streamInfo->m_fileName.size() > 254)
LTRACE(LT_ERROR, 2, "Error: File name too long.");
@ -190,7 +190,7 @@ void SingleFileMuxer::writeOutBuffer(StreamInfo* streamInfo)
int toFileLen = blockSize & 0xffff0000;
if (m_owner->isAsyncMode())
{
uint8_t* newBuf = new uint8_t[blockSize + MAX_AV_PACKET_SIZE];
auto newBuf = new uint8_t[blockSize + MAX_AV_PACKET_SIZE];
memcpy(newBuf, streamInfo->m_buffer + toFileLen, streamInfo->m_bufLen - toFileLen);
m_owner->asyncWriteBuffer(this, streamInfo->m_buffer, toFileLen, &streamInfo->m_file);
streamInfo->m_buffer = newBuf;

2
tsMuxer/tsDemuxer.cpp
View File

@ -507,7 +507,7 @@ int64_t getTSDuration(const char* fileName)
return -1;
int bufferSize = 1024 * 256;
bufferSize -= bufferSize % frameSize;
uint8_t* tmpBuffer = new uint8_t[bufferSize];
auto tmpBuffer = new uint8_t[bufferSize];
// pcr from start of file
int len = file.read(tmpBuffer, bufferSize);
if (len < 1)

8
tsMuxer/tsMuxer.cpp
View File

@ -437,7 +437,7 @@ bool TSMuxer::doFlush(uint64_t newPCR, int64_t pcrGAP)
if (lastBlockSize > 0)
{
assert(m_sectorSize == 0); // we should not be here in interleaved mode!
uint8_t* newBuff = new uint8_t[lastBlockSize];
auto newBuff = new uint8_t[lastBlockSize];
memcpy(newBuff, m_outBuf + roundBufLen, lastBlockSize);
m_owner->asyncWriteBuffer(this, m_outBuf, roundBufLen, m_muxFile);
m_outBuf = newBuff;
@ -1206,7 +1206,7 @@ bool TSMuxer::appendM2TSNullPacketToFile(uint64_t curFileSize, int counter, int*
if (readCnt != 192)
return false;
memcpy(tmpBuff + 4, m_nullBuffer, TS_FRAME_SIZE);
TSPacket* tsPacket = (TSPacket*)(tmpBuff);
auto tsPacket = (TSPacket*)(tmpBuff);
for (uint64_t newFileSize = curFileSize; newFileSize % (2048 * 3) != 0; newFileSize += 192)
{
tsPacket->counter = counter++;
@ -1284,7 +1284,7 @@ void TSMuxer::writeOutBuffer()
int toFileLen = m_writeBlockSize & ~(MuxerManager::PHYSICAL_SECTOR_SIZE - 1);
if (m_owner->isAsyncMode())
{
uint8_t* newBuf = new uint8_t[m_writeBlockSize + 1024];
auto newBuf = new uint8_t[m_writeBlockSize + 1024];
memcpy(newBuf, m_outBuf + toFileLen, m_outBufLen - toFileLen);
if (m_m2tsMode)
{
@ -1313,7 +1313,7 @@ void TSMuxer::writeOutBuffer()
}
else
{
uint8_t* newBuf = new uint8_t[toFileLen];
auto newBuf = new uint8_t[toFileLen];
memcpy(newBuf, m_outBuf, toFileLen);
m_m2tsDelayBlocks.push_back(std::make_pair(newBuf, toFileLen));
}