Ticket #513: sao_merge_up_bug.patch

File sao_merge_up_bug.patch, 1.1 KB (added by bheng, 11 years ago)

Fix to allow merge-up when above CU is first in the slice.

  • Lib/TLibDecoder/TDecSbac.cpp

     
    18371837
    18381838      if (pSaoParam->saoLcuParam[iCompIdx][iAddr].mergeLeftFlag==0)
    18391839      {
    1840         if ((ry > 0) && (iCUAddrUpInSlice>0||bLFCrossSliceBoundaryFlag))
     1840        if ((ry > 0) && (iCUAddrUpInSlice>=0||bLFCrossSliceBoundaryFlag))
    18411841        {
    18421842          parseSaoMergeUp(uiSymbol);  pSaoParam->saoLcuParam[iCompIdx][iAddr].mergeUpFlag = uiSymbol;
    18431843        }

  • Lib/TLibEncoder/TEncEntropy.cpp

     
    17181718      }
    17191719      if (saoParam->saoLcuParam[compIdx][addr].mergeLeftFlag == 0)
    17201720      {
    1721         if ( (ry > 0) && (cuAddrUpInSlice>0||lfCrossSliceBoundaryFlag))
     1721        if ( (ry > 0) && (cuAddrUpInSlice>=0||lfCrossSliceBoundaryFlag))
    17221722        {
    17231723          m_pcEntropyCoderIf->codeSaoMergeUp(saoParam->saoLcuParam[compIdx][addr].mergeUpFlag);
    17241724        }