fenix/exhale
1
0
Fork 0
mirror of https://gitlab.com/ecodis/exhale.git synced 2025-03-12 01:00:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

temporary workaround for Apple issue FB8928108

Browse Source
This commit is contained in:
Christian R. Helmrich 2020-12-05 12:00:00 +01:00
parent c71ec4805a
commit 4002bff2bf
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/bitStreamWriter.cpp
View File

@ -516,7 +516,8 @@ unsigned BitStreamWriter::writeStereoCoreToolInfo (const CoreCoderData& elData,
const IcsInfo& icsInfo1 = elData.icsInfoCurr[1];
const TnsData& tnsData0 = elData.tnsData[0];
const TnsData& tnsData1 = elData.tnsData[1];
const unsigned nWinGrps = elData.groupingData[0].numWindowGroups;
const uint16_t nWinGrps = elData.groupingData[0].numWindowGroups;
const bool eightShorts0 = (icsInfo0.windowSequence == EIGHT_SHORT);
unsigned bitCount = 2, g, b;
m_auBitStream.write (elData.tnsActive ? 1 : 0, 1); // tns_active
@ -524,7 +525,7 @@ unsigned BitStreamWriter::writeStereoCoreToolInfo (const CoreCoderData& elData,
if (elData.commonWindow)
{
const unsigned maxSfbSte = __max (icsInfo0.maxSfb, icsInfo1.maxSfb);
const unsigned sfb1Bits = (icsInfo1.windowSequence == EIGHT_SHORT ? 4 : 6);
const unsigned sfb1Bits = (eightShorts0 ? 4 : 6);
const uint8_t msMaskMode = getOptMsMaskModeValue (elData.stereoDataCurr, nWinGrps, m_numSwbShort, elData.stereoMode, maxSfbSte);
bitCount += writeChannelWiseIcsInfo (icsInfo0); // ics_info()
@ -578,6 +579,16 @@ unsigned BitStreamWriter::writeStereoCoreToolInfo (const CoreCoderData& elData,
m_auBitStream.write (elData.stereoConfig & 4 ? 1 : 0, 1);
bitCount++;
}
#ifndef NO_WORKAROUND_FOR_APPLE_ISSUE_FB8928108
if ((eightShorts0 && elData.icsInfoPrev[0].windowSequence != EIGHT_SHORT) || // first ch. in CPE
(elData.icsInfoPrev[0].windowSequence == EIGHT_SHORT && !eightShorts0) ||
(eightShorts0 && elData.icsInfoPrev[1].windowSequence != EIGHT_SHORT) || // second ch. in CPE
(elData.icsInfoPrev[1].windowSequence == EIGHT_SHORT && !eightShorts0))
{
deltaCodeTime = 0;
}
else
#endif
deltaCodeTime = getDeltaCodeTimeFlag (elData.stereoDataCurr, nWinGrps, m_numSwbShort, elData.stereoDataPrev, maxSfbSte, entrCoder, complexCoef);
m_auBitStream.write (deltaCodeTime, 1);
bitCount++;
@ -650,7 +661,7 @@ unsigned BitStreamWriter::writeStereoCoreToolInfo (const CoreCoderData& elData,
bitCount++;
if (commonTns)
{
bitCount += writeChannelWiseTnsData (tnsData0, icsInfo0.windowSequence == EIGHT_SHORT);
bitCount += writeChannelWiseTnsData (tnsData0, eightShorts0);
}
else // tns_present_both and tns_data_present[1]
{