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

Clang format check

Browse Source
This commit is contained in:
jcdr428 2022-01-21 17:09:50 +01:00
parent be59064694
commit 6fdf694a16
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tsMuxer/ac3Codec.cpp
View File

@ -246,9 +246,9 @@ AC3Codec::AC3ParseError AC3Codec::parseHeader(uint8_t* buf, uint8_t* end)
m_bsmod = gbc.getBits(3);
m_acmod = gbc.getBits(3);
if ((m_acmod & 1) && m_acmod != AC3_ACMOD_MONO) // 3 front channels
gbc.skipBits(2); // m_cmixlev
if (m_acmod & 4) // surround channel exists
gbc.skipBits(2); // m_surmixlev
gbc.skipBits(2); // m_cmixlev
if (m_acmod & 4) // surround channel exists
gbc.skipBits(2); // m_surmixlev
if (m_acmod == AC3_ACMOD_STEREO)
m_dsurmod = gbc.getBits(2);
m_lfeon = gbc.getBit();

5
tsMuxer/mlpCodec.h
View File

@ -15,7 +15,10 @@ enum class MlpSubType
class MLPCodec
{
public:
MLPCodec() : m_channels(0), m_samples(0), m_samplerate(0), m_bitrate(0), m_substreams(0), m_subType(MlpSubType::stUnknown) {}
MLPCodec()
: m_channels(0), m_samples(0), m_samplerate(0), m_bitrate(0), m_substreams(0), m_subType(MlpSubType::stUnknown)
{
}
uint8_t* findFrame(uint8_t* buffer, uint8_t* end);
int getFrameSize(uint8_t* buffer);
bool decodeFrame(uint8_t* buffer, uint8_t* end);

2
tsMuxer/mlpStreamReader.cpp
View File

@ -35,7 +35,7 @@ int MLPStreamReader::getTSDescriptor(uint8_t* dstBuff, bool blurayMode, bool hdm
*dstBuff++ = (int)TSDescriptorTag::REGISTRATION; // descriptor tag
*dstBuff++ = 4; // descriptor length
// https://smpte-ra.org/registered-mpeg-ts-ids
memcpy(dstBuff, "mlpa", 4); // format_identifier
memcpy(dstBuff, "mlpa", 4); // format_identifier
return 6; // total descriptor length
}

6
tsMuxer/muxerManager.cpp
View File

@ -188,9 +188,11 @@ void MuxerManager::checkTrackList(const vector<StreamInfo>& ci)
}
if (m_bluRayMode && aacFound)
LTRACE(LT_ERROR, 2, "Warning! AAC codec is not standard for BD disks, the m2ts will not play on a Blu-ray player.");
LTRACE(LT_ERROR, 2,
"Warning! AAC codec is not standard for BD disks, the m2ts will not play on a Blu-ray player.");
else if (m_bluRayMode && mlpFound)
LTRACE(LT_ERROR, 2, "Warning! MLP codec is not standard for BD disks, the m2ts will not play on a Blu-ray player.");
LTRACE(LT_ERROR, 2,
"Warning! MLP codec is not standard for BD disks, the m2ts will not play on a Blu-ray player.");
else if (!avcFound && mvcFound)
THROW(ERR_INVALID_STREAMS_SELECTED,
"Fatal error: MVC depended view track can't be muxed without AVC base view track");