Changeset 100 in 3DVCSoftware for trunk/source/Lib/TLibRenderer/TRenTop.cpp

Timestamp:

9 Aug 2012, 12:53:16 (13 years ago)

Author:

tech

Message:

Adopted modifications:

• disparity vector generation (A0097)
• inter-view motion prediction modification (A0049)
• simplification of disparity vector derivation (A0126)
• region boundary chain coding (A0070)
• residual skip intra (A0087)
• VSO modification (A0033/A0093)

+ Clean ups + Bug fixes

Update of cfg files (A0033 modification 2)

File:

• trunk/source/Lib/TLibRenderer/TRenTop.cpp (modified) (5 diffs)

trunk/source/Lib/TLibRenderer/TRenTop.cpp

@@ -1013 +1013 @@
           if ((iPrevShiftedPos + (iStep >> 1) ) > iPrevShiftedPosCeiled )
           {
-#if HHI_FIX
             if ( !((iInterPolPos < (Int) 0) || (iInterPolPos >= iOutputWidth)))
             {
@@ -1026 +1025 @@
             iInterPolPos++;
           }          
-#else
-          if ( (iInterPolPos < (Int) 0) || (iInterPolPos >= iOutputWidth))
-          {
-            // skip Interpolation if Interpolation position is outside frame
-            iPrevShiftedPos = iShiftedPos;
-            continue;
-          };
-
-          for( UInt uiCurPlane = 0; uiCurPlane < uiNumberOfPlanes; uiCurPlane++)
-          {
-              apcOutputData[uiCurPlane][iInterPolPos]  = apcInputData[uiCurPlane][iPosX - iStep];
-          }
-          pcFilledData[iInterPolPos]  = REN_IS_FILLED;
-            iInterPolPos++;
-        }
-#endif
 
           // Fill Disocclusion
@@ -1064 +1047 @@
         {
           iInterPolPos = iShiftedPosFloor >> m_iRelShiftLUTPrec;
-#if HHI_FIX
           if ( !((iInterPolPos < (Int) 0) || (iInterPolPos >= iOutputWidth)))
           {        
@@ -1074 +1056 @@
             pcFilledData[iInterPolPos]  = REN_IS_FILLED;
           }
-#else
-          if ( (iInterPolPos < (Int) 0) || (iInterPolPos >= iOutputWidth))
-          {
-            // skip Interpolation if Interpolation position is outside frame
-            iPrevShiftedPos = iShiftedPos;
-            continue;
-          };
-
-          for( UInt uiCurPlane = 0; uiCurPlane < uiNumberOfPlanes; uiCurPlane++)
-          {
-            apcOutputData[uiCurPlane][iInterPolPos]  = apcInputData[uiCurPlane][iPosX ];
-          }
-
-          pcFilledData[iInterPolPos]  = REN_IS_FILLED;
-#endif
         }
       }
@@ -1959 +1926 @@
           for( Int iCurPosX = 0; iCurPosX < 4; iCurPosX++)
           {
-            iSAD += abs( pcVideoLastDataBlk[iCurPosX] - pcVideoCurDataBlk[iCurPosX] );   //SAD
+            iSAD += abs( pcVideoLastDataBlk[iCurPosX] - pcVideoCurDataBlk[iCurPosX] );   //SAD
           }
           pcVideoLastDataBlk += iVideoLastStride;