Changeset 532 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon

Timestamp:

12 Jul 2013, 17:57:35 (12 years ago)

Author:

tech

Message:

• Fixed cfg files.
• Fixed several memory leaks.
• Fixed encoder/decoder mismatch and aligned order of vps syntax elements with draft text.
• Added missing iv_mv_scaling flag.

Location:

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (1 diff)
• TComPrediction.cpp (modified) (2 diffs)
• TComSlice.cpp (modified) (6 diffs)
• TComSlice.h (modified) (5 diffs)
• TypeDef.h (modified) (1 diff)

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

@@ -4381 +4381 @@
   {
 #if H_3D_TMVP
-     Int iCurrViewId    = m_pcSlice->getViewIndex (); 
-     Int iCurrRefViewId = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getViewIndex (); 
-     Int iColViewId     = pColCU->getSlice()->getViewIndex(); 
-     Int iColRefViewId  = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewIndex(); 
-     iScale = xGetDistScaleFactor( iCurrViewId, iCurrRefViewId, iColViewId, iColRefViewId );
-     if ( iScale != 4096 )
-     {
-        rcMv = cColMv.scaleMv( iScale );
-     }
-     else
-     {
+    Int iCurrViewId    = m_pcSlice->getViewIndex (); 
+    Int iCurrRefViewId = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getViewIndex (); 
+    Int iColViewId     = pColCU->getSlice()->getViewIndex(); 
+    Int iColRefViewId  = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewIndex(); 
+    iScale = xGetDistScaleFactor( iCurrViewId, iCurrRefViewId, iColViewId, iColRefViewId );
+    if ( iScale != 4096 && m_pcSlice->getVPS()->getIvMvScalingFlag() ) 
+    {
+      rcMv = cColMv.scaleMv( iScale );
+    }
+    else
+    {
 #endif
        rcMv = cColMv;

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

@@ -2104 +2104 @@
 UInt TComPrediction::xPredWedgeFromTex( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, UInt intraTabIdx )
 {
-  TComPic*      pcPicTex = pcCU->getSlice()->getPicLists()->getPic( pcCU->getSlice()->getViewIndex(), false, pcCU->getSlice()->getPOC() );
+  TComPic*      pcPicTex = pcCU->getSlice()->getTexturePic();
   assert( pcPicTex != NULL );
   TComDataCU*   pcColTexCU = pcPicTex->getCU(pcCU->getAddr());
@@ -2147 +2147 @@
 Void TComPrediction::xCopyTextureLumaBlock( TComDataCU* pcCU, UInt uiAbsPartIdx, Pel* piDestBlockY, UInt uiWidth, UInt uiHeight )
 {
-  TComPicYuv* pcPicYuvRef = pcCU->getSlice()->getPicLists()->getPic( pcCU->getSlice()->getViewIndex(), false, pcCU->getSlice()->getPOC() )->getPicYuvRec();
+  TComPicYuv* pcPicYuvRef = pcCU->getSlice()->getTexturePic()->getPicYuvRec();
   assert( pcPicYuvRef != NULL );
   Int         iRefStride = pcPicYuvRef->getStride();

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

@@ -73 +73 @@
 , m_pcPPS                         ( NULL )
 , m_pcPic                         ( NULL )
-#if H_3D
-, m_picLists                      ( NULL )
-#endif
 , m_colFromL0Flag                 ( 1 )
 , m_colRefIdx                     ( 0 )
@@ -973 +970 @@
 
   m_pcPic                = pSrc->m_pcPic;
-#if H_3D
-  m_picLists             = pSrc->m_picLists;
-#endif
   m_colFromL0Flag        = pSrc->m_colFromL0Flag;
   m_colRefIdx            = pSrc->m_colRefIdx;
@@ -1566 +1560 @@
     }
 #endif
+    m_ivMvScalingFlag = true; 
 #endif
 
@@ -1584 +1579 @@
   }
 #if H_3D_GEN
-  for( Int i = 0; i < MAX_NUM_LAYERS; i++ )  {
+  for( Int i = 0; i < MAX_NUM_LAYERS; i++ )
+  {
 #if H_3D_IV_MERGE
     m_ivMvPredFlag         [ i ] = false;
@@ -1594 +1590 @@
     m_depthRefinementFlag  [ i ] = false;
 #endif
-  }
+  }  
 #endif
 #endif
@@ -1604 +1600 @@
   if( m_hrdOpSetIdx      != NULL )     delete[] m_hrdOpSetIdx;
   if( m_cprmsPresentFlag != NULL )     delete[] m_cprmsPresentFlag;
+#if H_3D_DIM_DLT
+  for( Int i = 0; i < MAX_NUM_LAYERS; i++ )
+  {
+    if ( m_iDepthValue2Idx[i] != 0 ) 
+    {
+       xFree( m_iDepthValue2Idx[i] );
+       m_iDepthValue2Idx[i] = 0; 
+    }
+
+    if ( m_iIdx2DepthValue[i] != 0 ) 
+    {
+      xFree( m_iIdx2DepthValue[i] );
+      m_iIdx2DepthValue[i] = 0; 
+
+    }
+  }
+#endif
 }
 

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

@@ -546 +546 @@
   Int*        m_iIdx2DepthValue          [MAX_NUM_LAYERS   ];
 #endif
+#if H_3D_TMVP
+  Bool        m_ivMvScalingFlag; 
+#endif
 
 #endif
@@ -696 +699 @@
 #endif
 
-#endif
-
+#if H_3D_TMVP
+  Bool    getIvMvScalingFlag   (  )                       { return m_ivMvScalingFlag; }
+  Void    setIvMvScalingFlag   ( Bool b )                 { m_ivMvScalingFlag = b;    }  
+#endif
+#endif
 
   Void    setVpsProfilePresentFlag( Int layerSet, Bool val )               { m_vpsProfilePresentFlag[layerSet] = val;  }
@@ -1478 +1484 @@
   TComPPS*    m_pcPPS;
   TComPic*    m_pcPic;
-#if H_3D
-  TComPicLists* m_picLists;
-#endif
 #if ADAPTIVE_QP_SELECTION
   TComTrQuant* m_pcTrQuant;
@@ -1616 +1619 @@
   Int       getNumRefIdx        ( RefPicList e )                { return  m_aiNumRefIdx[e];             }
   TComPic*  getPic              ()                              { return  m_pcPic;                      }
-#if H_3D
-  TComPicLists* getPicLists     ()                              { return m_picLists; }
-#endif
   TComPic*  getRefPic           ( RefPicList e, Int iRefIdx)    { return  m_apcRefPicList[e][iRefIdx];  }
   Int       getRefPOC           ( RefPicList e, Int iRefIdx)    { return  m_aiRefPOCList[e][iRefIdx];   }
@@ -1693 +1693 @@
   Void      setNumRefIdx        ( RefPicList e, Int i )         { m_aiNumRefIdx[e]    = i;      }
   Void      setPic              ( TComPic* p )                  { m_pcPic             = p;      }
-#if H_3D
-  Void      setPicLists         ( TComPicLists* p )             { m_picLists          = p;      }
-#endif
   Void      setDepth            ( Int iDepth )                  { m_iDepth            = iDepth; }
   

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

@@ -71 +71 @@
 #if H_MV
 #define H_MV_FIX1071                      1  //< Fix on Fix1071, same as in HTM 11
-#define H_MV_ENC_DEC_TRAC                 0  //< CU/PU level tracking
+#define H_MV_FIX_VPS_POINTER              1  //< Changed m_vps in TEncCfg to pointer to avoid mismatches between layers and avoid erroneous shallow copy. 
+#define H_MV_ENC_DEC_TRAC                 1  //< CU/PU level tracking
 #endif