Changeset 730 in SHVCSoftware

Timestamp:

23 Apr 2014, 23:16:15 (11 years ago)

Author:

seregin

Message:

fix typos

Location:

branches/SHM-6-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (3 diffs)
• TLibEncoder/TEncCu.cpp (modified) (1 diff)

branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -811 +811 @@
     {
       // number of ILRPs included into the reference picture list with the list modification
-      Int inlucdeNumILRP = min(m_aiNumRefIdx[REF_PIC_LIST_0]-numberOfPocBeforeCurr, m_activeNumILRRefIdx);
-
-      for(Int i = inlucdeNumILRP; i > 0; i-- )
+      Int includeNumILRP = min(m_aiNumRefIdx[REF_PIC_LIST_0]-numberOfPocBeforeCurr, m_activeNumILRRefIdx);
+
+      for(Int i = includeNumILRP; i > 0; i-- )
       {
 #if RPL_INIT_N0316_N0082
@@ -825 +825 @@
           for (Int j = numberOfPocBeforeCurr; j < (m_aiNumRefIdx[REF_PIC_LIST_0] - i); j++)
           {
-            assert( j + inlucdeNumILRP < numberOfRpsCurrTempList );
-            refPicListModification->setRefPicSetIdxL0(j, j + inlucdeNumILRP);
+            assert( j + includeNumILRP < numberOfRpsCurrTempList );
+            refPicListModification->setRefPicSetIdxL0(j, j + includeNumILRP);
           }
         }
@@ -859 +859 @@
     else
     {
-      Int inlucdeNumILRP = min(m_aiNumRefIdx[REF_PIC_LIST_1], m_activeNumILRRefIdx);
-
-      for(Int i = inlucdeNumILRP; i > 0; i-- )
+      Int includeNumILRP = min(m_aiNumRefIdx[REF_PIC_LIST_1], m_activeNumILRRefIdx);
+
+      for(Int i = includeNumILRP; i > 0; i-- )
       {
         refPicListModification->setRefPicSetIdxL1(m_aiNumRefIdx[REF_PIC_LIST_1] - i, numberOfRpsCurrTempList - i);

branches/SHM-6-dev/source/Lib/TLibEncoder/TEncCu.cpp

@@ -696 +696 @@
 #if (ENCODER_FAST_MODE)
         if( rpcBestCU->getSlice()->getSliceType() == I_SLICE || 
-          rpcBestCU->getPredictionMode(0) == SIZE_NONE ||  // if there is no valid inter prediction
+          rpcBestCU->getPredictionMode(0) == MODE_NONE ||  // if there is no valid inter prediction
           !testInter ||
           rpcBestCU->getCbf( 0, TEXT_LUMA     ) != 0   ||