Changeset 479 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp

Timestamp:

18 Jun 2013, 23:24:53 (11 years ago)

Author:

tech

Message:

• changed IV-MERGE HLS to match Test Model 4 spec
• incorporated iv-refpic list to TComSlice
• removed TComDepthMapGenerator

File:

• branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp (modified) (8 diffs)

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

@@ -68 +68 @@
 , m_iSliceQpDeltaCb               ( 0 )
 , m_iSliceQpDeltaCr               ( 0 )
-#if H_3D_IV_MERGE
-, m_pcTexturePic                  ( NULL )
-#endif
 , m_iDepth                        ( 0 )
 , m_bRefenced                     ( false )
@@ -174 +171 @@
   
   m_colRefIdx = 0;
-#if H_3D_IV_MERGE
-  m_pcTexturePic = NULL;
-#endif
   initEqualRef();
 #if !L0034_COMBINED_LIST_CLEANUP
@@ -1497 +1491 @@
     }
   }
+#if H_3D_IV_MERGE
+  for( Int i = 0; i < MAX_NUM_LAYERS; i++ )
+  {
+    m_ivMvPredFlag[ i ] = false;
+  }
+#endif
 #endif
 }
@@ -1857 +1857 @@
   }
 }
-#if H_3D_IV_MERGE
-Void
-TComSPS::setPredDepthMapGeneration( UInt uiViewIndex, Bool bIsDepth, UInt uiPdmGenMode, UInt uiPdmMvPredMode)
-{ 
-  AOF( m_uiViewIndex == uiViewIndex );
-  AOF( m_bDepth   == bIsDepth );
-  AOT( ( uiViewIndex == 0 || bIsDepth ) && uiPdmGenMode );
-  AOT( uiPdmMvPredMode && uiPdmGenMode == 0 );
-
-  m_uiPredDepthMapGeneration = uiPdmGenMode;
-  m_uiMultiviewMvPredMode    = uiPdmMvPredMode;
-}
-#endif
 const Int TComSPS::m_winUnitX[]={1,2,2,1};
 const Int TComSPS::m_winUnitY[]={1,2,1,1};
@@ -1936 +1923 @@
   ::memset( m_aaiCodedOffset, 0x00, sizeof( m_aaiCodedOffset ) );
 
-#if H_3D_IV_MERGE  
-  m_uiViewIndex           = uiViewIndex;
-  m_bDepth                = false;
-#endif
   if( !m_bCamParInSliceHeader )
   {
@@ -1951 +1934 @@
   }
 }
-#if H_3D_IV_MERGE
-Void
-TComSPS::initCamParaSPSDepth( UInt uiViewIndex)
-{  
-  m_uiCamParPrecision     = 0;
-  m_bCamParInSliceHeader  = false;
-
-  ::memset( m_aaiCodedScale,  0x00, sizeof( m_aaiCodedScale  ) );
-  ::memset( m_aaiCodedOffset, 0x00, sizeof( m_aaiCodedOffset ) );
-
-  m_uiViewIndex           = uiViewIndex;
-  m_bDepth                = true;
-}
-#endif
 #endif
 
@@ -2298 +2267 @@
   }
 }
+#if H_3D_GEN
+Void TComSlice::setIvPicLists( TComPicLists* m_ivPicLists )
+{
+  for (Int i = 0; i < MAX_NUM_LAYERS; i++ )
+  {     
+    for ( Int depthId = 0; depthId < 2; depthId++ )
+    {
+      m_ivPicsCurrPoc[ depthId ][ i ] = ( i <= m_viewIndex ) ? m_ivPicLists->getPic( i, ( depthId == 1) , getPOC() ) : NULL;
+    }        
+  }  
+}
+#endif
 #endif
 /** get scaling matrix from RefMatrixID
@@ -2606 +2587 @@
 }
 #endif
+
 //! \}