Changeset 841 in 3DVCSoftware

Timestamp:

8 Feb 2014, 18:03:54 (10 years ago)

Author:

tech

Message:

Further fixes.

Location:

branches/HTM-10.0rc1-dev0/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncSlice.cpp (modified) (1 diff)

branches/HTM-10.0rc1-dev0/source/App/TAppDecoder/TAppDecTop.cpp

@@ -165 +165 @@
   Bool firstSlice        = true; 
 #endif
-  Bool loopFiltered = false;
+  Bool loopFiltered      = false;
 
   while (!!bitstreamFile)
@@ -297 +297 @@
     if (bNewPicture || !bitstreamFile || nalu.m_nalUnitType == NAL_UNIT_EOS )
     {
-#if H_MV
-      assert( decIdxLastPic != -1 ); 
-      // TODO add loop filtered variable here
-      m_tDecTop[decIdxLastPic]->endPicDecoding(poc, pcListPic, m_targetDecLayerIdSet );
-#else
       if (!loopFiltered || bitstreamFile)
       {
+#if H_MV
+        assert( decIdxLastPic != -1 ); 
+        m_tDecTop[decIdxLastPic]->endPicDecoding(poc, pcListPic, m_targetDecLayerIdSet );
+#else
         m_cTDecTop.executeLoopFilters(poc, pcListPic);
+#endif
       }
       loopFiltered = (nalu.m_nalUnitType == NAL_UNIT_EOS);
-#endif
     }
 #if H_3D

branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -393 +393 @@
   // store lambda
   m_pcRdCost ->setLambda( dLambda );
+
+#if H_3D_VSO
+  m_pcRdCost->setUseLambdaScaleVSO  ( (m_pcCfg->getUseVSO() ||  m_pcCfg->getForceLambdaScaleVSO()) && m_pcCfg->getIsDepth() );
+  m_pcRdCost->setLambdaVSO          ( dLambda * m_pcCfg->getLambdaScaleVSO() );
+
+  // Should be moved to TEncTop
+  
+  // SAIT_VSO_EST_A0033
+  m_pcRdCost->setDisparityCoeff( m_pcCfg->getDispCoeff() );
+
+  // LGE_WVSO_A0119
+  if( m_pcCfg->getUseWVSO() && m_pcCfg->getIsDepth() )
+  {
+    m_pcRdCost->setDWeight  ( m_pcCfg->getDWeight()   );
+    m_pcRdCost->setVSOWeight( m_pcCfg->getVSOWeight() );
+    m_pcRdCost->setVSDWeight( m_pcCfg->getVSDWeight() );
+  }
+
+#endif
+
 // for RDO
   // in RdCost there is only one lambda because the luma and chroma bits are not separated, instead we weight the distortion of chroma.