Changeset 1107 in 3DVCSoftware

Timestamp:

6 Nov 2014, 20:57:06 (9 years ago)

Author:

tech

Message:

Fixed linux compiler warnings.

Location:

branches/HTM-12.2-dev2-HHI/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• Lib/TLibCommon/TComSlice.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecSbac.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncCu.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncSbac.cpp (modified) (2 diffs)
• Lib/TLibExtractor/TExtrTop.cpp (modified) (1 diff)

branches/HTM-12.2-dev2-HHI/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -2656 +2656 @@
 
 
-  printf( "IvMvPred:%d %d "    , m_ivMvPredFlag[0], m_ivMvPredFlag[1] );
-  printf( "IvMvScaling:%d %d "    , m_ivMvScalingFlag[0], m_ivMvScalingFlag[1] );
+  printf( "IvMvPred:%d %d "            , m_ivMvPredFlag[0] ? 1 : 0, m_ivMvPredFlag[1]  ? 1 : 0);
+  printf( "IvMvScaling:%d %d "         , m_ivMvScalingFlag[0] ? 1 : 0 , m_ivMvScalingFlag[1]  ? 1 : 0);
 
   printf( "Log2SubPbSizeMinus3:%d "    , m_log2SubPbSizeMinus3            );

branches/HTM-12.2-dev2-HHI/source/Lib/TLibCommon/TComSlice.cpp

@@ -4026 +4026 @@
 #if H_3D_IV_MERGE
 #if HHI_TOOL_PARAMETERS_I2_J0107
-  setupLUT = setupLUT || getIvMvPredFlag() && getIsDepth() ;
+  setupLUT = setupLUT || ( getIvMvPredFlag() && getIsDepth() );
 #else
   setupLUT = setupLUT || ( getVPS()->getIvMvPredFlag(layerIdInVPS ) && getIsDepth() );

branches/HTM-12.2-dev2-HHI/source/Lib/TLibDecoder/TDecSbac.cpp

@@ -702 +702 @@
   Bool bParseSplitFlag    = true;
 
-  TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
+  
 #if HHI_TOOL_PARAMETERS_I2_J0107
   Bool    bLimQtPredFlag = pcCU->getPic()->getSlice(0)->getQtPredFlag();
 #else
+  TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
   Bool    bLimQtPredFlag = vps->getLimQtPredFlag(pcCU->getPic()->getSlice(0)->getLayerId());
 #endif
@@ -760 +761 @@
 #if H_3D_QTLPC
   Bool bParsePartSize    = true;
-  TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
+  
 #if HHI_TOOL_PARAMETERS_I2_J0107
   Bool    bLimQtPredFlag = pcCU->getPic()->getSlice(0)->getQtPredFlag();
 #else
+  TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
   Bool    bLimQtPredFlag = vps->getLimQtPredFlag(pcCU->getPic()->getSlice(0)->getLayerId());
 #endif

branches/HTM-12.2-dev2-HHI/source/Lib/TLibEncoder/TEncCu.cpp

@@ -409 +409 @@
 
 #if H_3D_QTLPC
-  TComVPS *vps            = pcPic->getSlice(0)->getVPS();
 #if HHI_TOOL_PARAMETERS_I2_J0107
   Bool  bLimQtPredFalg    = pcPic->getSlice(0)->getQtPredFlag(); 
 #else
+    TComVPS *vps            = pcPic->getSlice(0)->getVPS();
   Bool  bLimQtPredFalg    = vps->getLimQtPredFlag(pcPic->getSlice(0)->getLayerId()); 
 #endif
@@ -2204 +2204 @@
   UChar uhDepth = rpcTempCU->getDepth( 0 );
 #if H_3D_ARP
+#if !HHI_TOOL_PARAMETERS_I2_J0107
   Int iLayerId    = rpcTempCU->getSlice()->getLayerId();
+#endif
   Bool bFirstTime = true;
   Int nARPWMax    = rpcTempCU->getSlice()->getARPStepNum() - 1;

branches/HTM-12.2-dev2-HHI/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -633 +633 @@
   PartSize eSize         = pcCU->getPartitionSize( uiAbsPartIdx );
 #if H_3D_QTLPC
-  TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
 #if HHI_TOOL_PARAMETERS_I2_J0107
   Bool    bLimQtPredFlag = pcCU->getPic()->getSlice(0)->getQtPredFlag();
 #else
+  TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
   Bool    bLimQtPredFlag = vps->getLimQtPredFlag(pcCU->getPic()->getSlice(0)->getLayerId());
 #endif
@@ -1010 +1010 @@
   Bool bCodeSplitFlag    = true;
 
-  TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
+  
 #if HHI_TOOL_PARAMETERS_I2_J0107
   Bool    bLimQtPredFlag = pcCU->getPic()->getSlice(0)->getQtPredFlag(); 
 #else
+  TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
   Bool    bLimQtPredFlag = vps->getLimQtPredFlag(pcCU->getPic()->getSlice(0)->getLayerId());
 #endif

branches/HTM-12.2-dev2-HHI/source/Lib/TLibExtractor/TExtrTop.cpp

@@ -73 +73 @@
      TComSPS     cSPS;
 #if H_3D
-     Int layerIdInVPS = m_cVPS.getLayerIdInVps( uiLayerId ); 
+
 #if HHI_TOOL_PARAMETERS_I2_J0107
      m_cEntropyDecoder   .decodeSPS( &cSPS );
 #else
+      Int layerIdInVPS = m_cVPS.getLayerIdInVps( uiLayerId ); 
      m_cEntropyDecoder   .decodeSPS( &cSPS, m_cVPS.getViewIndex( layerIdInVPS ), ( m_cVPS.getDepthId( layerIdInVPS ) == 1 ) );
 #endif