Changeset 483 in 3DVCSoftware

Timestamp:

19 Jun 2013, 17:57:12 (11 years ago)

Author:

tech

Message:

Merged fixes from other dev-branches.

Location:

branches/HTM-DEV-0.3-dev0/source

Files:

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

branches/HTM-DEV-0.3-dev0/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-dev0/source/App/TAppDecoder/TAppDecTop.cpp

@@ -95 +95 @@
     m_pchReconFile = NULL;
   }
+#if H_3D_FIX
+  if (m_pchScaleOffsetFile)
+  {
+    free (m_pchScaleOffsetFile);
+    m_pchScaleOffsetFile = NULL; 
+  }
+#endif
 }
 

branches/HTM-DEV-0.3-dev0/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-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -78 +78 @@
                                               // SAIT_VSO_EST_A0033, JCT3V-A0033 modification 3
                                               // LGE_WVSO_A0119
+#define H_3D_FIX                          1   // Temporary for minor fixes
 #endif 
 
@@ -91 +92 @@
 #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
 

branches/HTM-DEV-0.3-dev0/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();