Changeset 456 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source

Timestamp:

4 Jun 2013, 18:05:33 (12 years ago)

Author:

tech

Message:

Fixed linux compiler warnings and changed some variable names to match styleguide.

Location:

branches/HTM-DEV-0.3-dev2/source

Files:

• App/TAppDecoder/TAppDecCfg.h (modified) (1 diff)
• App/TAppDecoder/TAppDecTop.cpp (modified) (2 diffs)
• Lib/TAppCommon/TAppComCamPara.cpp (modified) (2 diffs)
• Lib/TLibCommon/TComDataCU.cpp (modified) (3 diffs)
• Lib/TLibCommon/TComPic.cpp (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibEncoder/TEncSearch.cpp (modified) (2 diffs)

branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecCfg.h

@@ -84 +84 @@
 #if H_MV
   , m_maxLayerId(0)
-  , m_pchReconFiles(NULL) 
 #endif
   , m_pchReconFile(NULL)

branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.cpp

@@ -145 +145 @@
   Int  pocCurrPic        = -MAX_INT;     
   Int  pocLastPic        = -MAX_INT;   
-  
-  Int  layerIdLastPic    = 0; 
+
   Int  layerIdCurrPic    = 0; 
 
@@ -223 +222 @@
         if ( bNewPicture || !bitstreamFile )
         { 
-          layerIdLastPic    = layerIdCurrPic;  
           layerIdCurrPic    = nalu.m_layerId; 
           

branches/HTM-DEV-0.3-dev2/source/Lib/TAppCommon/TAppComCamPara.cpp

@@ -965 +965 @@
   //--- determine (virtual) camera parameter shift between view order index 1 and base view (view order index 0) ---
   Double        dCamPosShift, dPicPosShift;
+#if H_3D_PDM_CAM_PARAS
   Int           iMinVOI       = (1<<30);
+#endif
   Int           iMinAbsVOI    = (1<<30);
   Int           iMinAbsVOIId  = 0;
@@ -973 +975 @@
     if( iAbsVOI < iMinAbsVOI )
     {
+#if H_3D_PDM_CAM_PARAS
       iMinVOI      = m_aiViewOrderIndex[ iBaseId ];
+#endif
       iMinAbsVOI   = iAbsVOI;
       iMinAbsVOIId = iBaseId;

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3985 +3985 @@
           pDInfo->m_acNBDV = cColMv;
           pDInfo->m_aVIdxCan  = iTargetViewIdx;
-          TComPic* picDepth = NULL;
 
 #if H_3D_NBDV_REF
@@ -4090 +4089 @@
   }
 
-  TComPic* picDepth = NULL;
   TComMv defaultDV(0, 0);
   pDInfo->m_acNBDV = defaultDV;
@@ -4125 +4123 @@
           pNbDvInfo->m_acNBDV = cMvPred;
           pNbDvInfo->m_aVIdxCan = refViewIdx;
-          TComPic* picDepth = NULL;
 #if H_3D_NBDV_REF
           /*Place DoNBDV*/

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComPic.cpp

@@ -558 +558 @@
 #endif // H_3D
 #endif // H_MV
+
 #if H_3D_NBDV 
-Int TComPic::getDisCandRefPictures(Int iColPOC)
-{
-  UInt uiTempLayerCurr=7;
-  TComSlice* currSlice = getSlice(getCurrSliceIdx());
-  UInt NumDdvCandPics = 0;
+Int TComPic::getDisCandRefPictures( Int iColPOC )
+{
+  UInt       uiTempLayerCurr = 7;
+  TComSlice* currSlice       = getSlice(getCurrSliceIdx());
+  UInt       numDdvCandPics  = 0;
+
   if ( !currSlice->getEnableTMVPFlag() )
-    return NumDdvCandPics;
-  NumDdvCandPics +=1;
-
-  UInt iPOCCurr=currSlice->getPOC();
-  UInt iPOCDiff = 255;
-  Bool bCheck = false;
+    return numDdvCandPics;
+
+  numDdvCandPics += 1;
+
+  UInt pocCurr = currSlice->getPOC();
+  UInt pocDiff = 255;
 
   for(UInt lpNr = 0; lpNr < (currSlice->isInterB() ? 2: 1); lpNr ++)
   {
-    UInt X = lpNr? currSlice->getColFromL0Flag() : 1-currSlice->getColFromL0Flag();
-    for (UInt i = 0; i < currSlice->getNumRefIdx(RefPicList(X)); i++)
-    {
-      if(currSlice->getViewIndex() == currSlice->getRefPic((RefPicList)X, i)->getViewIndex() 
-        && (X == currSlice->getColFromL0Flag()||currSlice->getRefPOC((RefPicList)X, i)!= iColPOC) && NumDdvCandPics!=2)
-      {
-        TComSlice* refSlice = currSlice->getRefPic((RefPicList)X, i)->getSlice(getCurrSliceIdx());
-        Bool bRAP = (refSlice->getViewIndex() && refSlice->isIRAP())? 1: 0; 
-        UInt uiTempLayer = currSlice->getRefPic((RefPicList)X, i)->getSlice(getCurrSliceIdx())->getTLayer(); 
-        Int iTempPoc = currSlice->getRefPic((RefPicList)X, i)->getPOC();
-        Int iTempDiff = (iTempPoc > iPOCCurr) ? (iTempPoc - iPOCCurr): (iPOCCurr - iTempPoc);
-        if(bRAP)
+    UInt x = lpNr ? currSlice->getColFromL0Flag() : 1 - currSlice->getColFromL0Flag();
+
+    for (UInt i = 0; i < currSlice->getNumRefIdx(RefPicList(x)); i++)
+    {
+      if(currSlice->getViewIndex() == currSlice->getRefPic((RefPicList)x, i)->getViewIndex() 
+        && (x == currSlice->getColFromL0Flag()||currSlice->getRefPOC((RefPicList)x, i)!= iColPOC) && numDdvCandPics!=2)
+      {
+        TComSlice* refSlice    = currSlice->getRefPic((RefPicList)x, i)->getSlice(getCurrSliceIdx());
+        Bool       bRAP        = (refSlice->getViewIndex() && refSlice->isIRAP())? 1: 0; 
+        UInt       uiTempLayer = currSlice->getRefPic((RefPicList)x, i)->getSlice(getCurrSliceIdx())->getTLayer(); 
+        
+        if( bRAP )
         {
           this->setRapRefIdx(i);
-          this->setRapRefList((RefPicList)X);
-          NumDdvCandPics = 2;
-          return NumDdvCandPics;
+          this->setRapRefList((RefPicList)x);
+          numDdvCandPics = 2;
+
+          return numDdvCandPics;
         }
         else if (uiTempLayerCurr > uiTempLayer) 
+        {
            uiTempLayerCurr = uiTempLayer; 
-      }
-    }
-  }
-  UInt Z;
-  UInt idx=0;
+        }
+      }
+    }
+  }
+
+  UInt z   = -1; // GT: Added to make code compile needs to be checked!
+  UInt idx = 0;
+  
   for(UInt lpNr = 0; lpNr < (currSlice->isInterB() ? 2: 1); lpNr ++)
   {
-    UInt X = lpNr? currSlice->getColFromL0Flag() : 1-currSlice->getColFromL0Flag();
-    for (UInt i = 0; i < currSlice->getNumRefIdx(RefPicList(X)); i++)
-    {
-      Int iTempPoc = currSlice->getRefPic((RefPicList)X, i)->getPOC();
-      Int iTempDiff = (iTempPoc > iPOCCurr) ? (iTempPoc - iPOCCurr): (iPOCCurr - iTempPoc);
-      if(currSlice->getViewIndex() == currSlice->getRefPic((RefPicList)X, i)->getViewIndex() &&  (X == currSlice->getColFromL0Flag()||currSlice->getRefPOC((RefPicList)X, i)!= iColPOC) 
-        && currSlice->getRefPic((RefPicList)X, i)->getSlice(getCurrSliceIdx())->getTLayer() == uiTempLayerCurr && iPOCDiff > iTempDiff)
-      {
-        iPOCDiff=iTempDiff;
-        Z=X;
-        idx = i;
-      }
-    }
-  }
-  if(iPOCDiff<255)
+    UInt x = lpNr? currSlice->getColFromL0Flag() : 1-currSlice->getColFromL0Flag();
+    
+    for (UInt i = 0; i < currSlice->getNumRefIdx(RefPicList(x)); i++)
+    {
+      Int iTempPoc = currSlice->getRefPic((RefPicList)x, i)->getPOC();
+      Int iTempDiff = (iTempPoc > pocCurr) ? (iTempPoc - pocCurr): (pocCurr - iTempPoc);
+      
+      if(currSlice->getViewIndex() == currSlice->getRefPic((RefPicList)x, i)->getViewIndex() &&  (x == currSlice->getColFromL0Flag()||currSlice->getRefPOC((RefPicList)x, i)!= iColPOC) 
+        && currSlice->getRefPic((RefPicList)x, i)->getSlice(getCurrSliceIdx())->getTLayer() == uiTempLayerCurr && pocDiff > iTempDiff)
+      {
+        pocDiff = iTempDiff;
+        z       = x;
+        idx     = i;
+      }
+    }
+  }
+
+  if( pocDiff < 255 )
   {
     this->setRapRefIdx(idx);
-    this->setRapRefList((RefPicList)Z);
-    NumDdvCandPics = 2;
-  }
-
-  return NumDdvCandPics;
+    this->setRapRefList((RefPicList) z );
+    numDdvCandPics = 2;
+  }
+
+  return numDdvCandPics;
 }
 #endif

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TypeDef.h

@@ -102 +102 @@
 #define H_3D_VSO_RM_ASSERTIONS            0   // Output VSO assertions
 #define H_3D_VSO_SYNTH_DIST_OUT           0   // Output of synthesized view distortion instead of depth distortion in encoder output
+
+#define H_3D_VSO_FIX                      0   // This fix should be enabled after verification 
+
 #endif
 ////   ****** Neighbouring block-based Disparity Vector  *********

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2576 +2576 @@
       
 #if H_3D_VSO // M35
+#if H_3D_VSO_FIX // This fix should be enabled after verification 
         Double dLambda;
         if ( m_pcRdCost->getUseLambdaScaleVSO() )
@@ -2583 +2584 @@
 
         Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();
+#else
+        Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();
+#endif
 #else
         Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();