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

Standart to Standard (#121)

Browse Source 
Straightforward orthographic correction
This commit is contained in:
jcdr428 2020-01-08 22:24:33 +02:00 committed by Daniel Kamil Kozar
parent b55b4df64f
commit eff8dfd118
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tsMuxer/ac3Codec.cpp
View File

@ -212,7 +212,7 @@ int AC3Codec::parseHeader(uint8_t* buf, uint8_t* end)
if (gbc.getBit()) if (gbc.getBit())
{ {
int chanLayout = gbc.getBits(16); int chanLayout = gbc.getBits(16);
if (chanLayout & 0x7fe0) // mask standart 5.1 channels if (chanLayout & 0x7fe0) // mask standard 5.1 channels
m_extChannelsExists = true; m_extChannelsExists = true;
} }
} }

6
tsMuxer/lpcmStreamReader.cpp
View File

@ -187,7 +187,7 @@ uint32_t LPCMStreamReader::convertWavToPCM(uint8_t* start, uint8_t* end)
curPos[2] = tmp; curPos[2] = tmp;
} }
} }
// 2. Remap channels to Blu-ray standart // 2. Remap channels to Blu-ray standard
if (m_channels == 6) { if (m_channels == 6) {
uint8_t* tmpData = new uint8_t[ch1FullSize]; uint8_t* tmpData = new uint8_t[ch1FullSize];
storeChannelData(start, end, 4, tmpData, m_channels); // copy channel 6(LFE) to tmpData storeChannelData(start, end, 4, tmpData, m_channels); // copy channel 6(LFE) to tmpData
@ -292,7 +292,7 @@ uint32_t LPCMStreamReader::convertLPCMToWAV(uint8_t* start, uint8_t* end)
curPos[2] = tmp; curPos[2] = tmp;
} }
} }
// 2. Remap channels to WAV standart // 2. Remap channels to WAV standard
if (m_channels == 1) { if (m_channels == 1) {
removeChannel(start, end, 2, mch); removeChannel(start, end, 2, mch);
} }
@ -403,7 +403,7 @@ int LPCMStreamReader::decodeWaveHeader(uint8_t* buff, uint8_t* end)
if (!(waveFormatPCMEx->SubFormat == KSDATAFORMAT_SUBTYPE_PCM)) if (!(waveFormatPCMEx->SubFormat == KSDATAFORMAT_SUBTYPE_PCM))
THROW (ERR_COMMON, "Unsupported WAVE format. Only PCM audio is supported."); THROW (ERR_COMMON, "Unsupported WAVE format. Only PCM audio is supported.");
} }
else if (waveFormatPCMEx->wFormatTag == 0x01) { // standart format else if (waveFormatPCMEx->wFormatTag == 0x01) { // standard format
if (m_channels > 2) { if (m_channels > 2) {
if (m_channels == 3) { if (m_channels == 3) {
LTRACE(LT_WARN, 2, "Warning! Multi channels WAVE file for stream " << m_streamIndex << " do not contain channels configuration info. Applying default value: L R LFE"); LTRACE(LT_WARN, 2, "Warning! Multi channels WAVE file for stream " << m_streamIndex << " do not contain channels configuration info. Applying default value: L R LFE");

2
tsMuxer/mpegVideo.cpp
View File

@ -283,7 +283,7 @@ void MPEGSequenceHeader::setFrameRate(uint8_t* buff, double fps)
buff[3] = (buff[3] & 0xf0) + i; buff[3] = (buff[3] & 0xf0) + i;
return; return;
} }
THROW(ERR_MPEG2_ERR_FPS, "Can't set fps to value " << fps << ". Only standart fps values allowed for mpeg2 streams."); THROW(ERR_MPEG2_ERR_FPS, "Can't set fps to value " << fps << ". Only standard fps values allowed for mpeg2 streams.");
} }
void MPEGSequenceHeader::setAspectRation(uint8_t* buff, VideoAspectRatio ar) void MPEGSequenceHeader::setAspectRation(uint8_t* buff, VideoAspectRatio ar)

4
tsMuxer/vc1Parser.cpp
View File

@ -112,7 +112,7 @@ void VC1SequenceHeader::setFPS(double value)
time_base_num = num_units_in_tick; time_base_num = num_units_in_tick;
} }
else else
THROW(ERR_VC1_ERR_FPS, "Can't overwrite stream fps. Non standart fps values not supported for VC-1 streams"); THROW(ERR_VC1_ERR_FPS, "Can't overwrite stream fps. Non standard fps values not supported for VC-1 streams");
if (time_scale == 24000) if (time_scale == 24000)
nr = 1; nr = 1;
else if (time_scale == 25000) else if (time_scale == 25000)
@ -131,7 +131,7 @@ void VC1SequenceHeader::setFPS(double value)
updateBits(m_fpsFieldBitVal + 8, 4, dr); updateBits(m_fpsFieldBitVal + 8, 4, dr);
} }
else else
THROW(ERR_VC1_ERR_FPS, "Can't overwrite stream fps. Non standart fps values not supported for VC-1 streams"); THROW(ERR_VC1_ERR_FPS, "Can't overwrite stream fps. Non standard fps values not supported for VC-1 streams");
} }
int VC1SequenceHeader::decode_sequence_header() int VC1SequenceHeader::decode_sequence_header()