Changeset 532 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder

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/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (3 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (4 diffs)

branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -730 +730 @@
 #endif //HHI_VSO
 #if H_3D_IV_MERGE
-  ("IvMvPred",                        m_ivMvPredFlag,           false           , "inter view motion prediction " )  
+  ("IvMvPred",                        m_ivMvPredFlag,           true            , "inter view motion prediction " )  
 #endif
 #if H_3D_NBDV_REF
-  ("DepthRefinement",                 m_depthRefinementFlag,    false           , "depth refinement by DoNBDV" )  
+  ("DepthRefinement",                 m_depthRefinementFlag,    true           , "depth refinement by DoNBDV" )  
 #endif
 #if H_3D_VSP
-  ("ViewSynthesisPred",               m_viewSynthesisPredFlag,  false           , "view synthesis prediction " )  
+  ("ViewSynthesisPred",               m_viewSynthesisPredFlag,  true           , "view synthesis prediction " )  
+#endif
+#if H_3D_TMVP
+  ("IvMvScaling",                     m_ivMvScalingFlag      ,  true            , "inter view motion vector scaling" )    
 #endif
 #endif //H_3D
@@ -988 +991 @@
 
   xResizeVector( m_bLoopFilterDisable ); 
-  xResizeVector( m_bUseSAO );   
+  xResizeVector( m_bUseSAO ); 
 
 #else
@@ -2322 +2325 @@
   printf("ViewSynthesisPred:%d ", m_viewSynthesisPredFlag );
 #endif
+#if H_3D_TMVP
+  printf("IvMvScaling:%d ", m_ivMvScalingFlag ? 1 : 0  );
+#endif
 #if H_3D_DIM
   printf("DMM:%d ", m_useDMM );

branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.h

@@ -101 +101 @@
 #if H_3D_VSP
   Bool m_viewSynthesisPredFlag;
+#endif
+#if H_3D_TMVP
+  Bool m_ivMvScalingFlag; 
 #endif
 #endif

branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.cpp

@@ -120 +120 @@
   xSetDirectDependencyFlags( vps );
 #if H_3D
-#if H_3D_DIM
-  for( Int layer = 0; layer < m_numberOfLayers; layer++ )
-  {
-    vps.setVpsDepthModesFlag( layer, ((vps.getDepthId( layer ) != 0) && (m_useDMM || m_useRBC || m_useSDC || m_useDLT)) ? true : false );
-#if H_3D_DIM_DLT
-    vps.setUseDLTFlag( layer , ((vps.getDepthId( layer ) != 0) && m_useDLT) ? true : false );
-    if( vps.getUseDLTFlag( layer ) )
-    {
-      xAnalyzeInputBaseDepth(layer, max(m_iIntraPeriod, 24), &vps);
-    }
-#endif
-  }
-#endif
   vps.initViewIndex(); 
 #if H_3D_GEN
@@ -138 +125 @@
 #endif
   m_ivPicLists.setVPS      ( &vps ); 
-#if H_3D_ARP
-  for(Int i = 0; i < m_numberOfLayers; i++)
-  {
-    Bool isDepth = vps.getDepthId( i );
-    vps.setUseAdvRP        ( i, ( isDepth || 0==i ) ? 0 : m_uiUseAdvResPred );
-    vps.setARPStepNum      ( i, ( isDepth || 0==i ) ? 1 : H_3D_ARP_WFNR     );
-  }
-#endif  
 #endif
 
@@ -1055 +1034 @@
   
   depthVideoFile->close();
+  delete depthVideoFile; 
   
   pcDepthPicYuvOrg->destroy();
@@ -1152 +1132 @@
   for ( Int layer = 0; layer < vps.getMaxLayers(); layer++ )
   {
-    if ( layer != 0 ) 
-    {    
-      if( ( vps.getDepthId( layer ) == 0 ) )
-      {
+    Bool isDepth      = ( vps.getDepthId( layer ) == 1 ) ;
+    Bool isLayerZero  = ( layer == 0 ); 
+
+#if H_3D_ARP
+    vps.setUseAdvRP        ( layer, ( isDepth || isLayerZero ) ? 0 : m_uiUseAdvResPred );
+    vps.setARPStepNum      ( layer, ( isDepth || isLayerZero ) ? 1 : H_3D_ARP_WFNR     );
+#endif  
+
+#if H_3D_DIM
+    vps.setVpsDepthModesFlag( layer, isDepth && !isLayerZero && (m_useDMM || m_useRBC || m_useSDC || m_useDLT ) );
+#if H_3D_DIM_DLT
+    vps.setUseDLTFlag( layer , isDepth && m_useDLT );
+    if( vps.getUseDLTFlag( layer ) )
+    {
+      xAnalyzeInputBaseDepth(layer, max(m_iIntraPeriod, 24), &vps);
+    }
+#endif
+#endif
+
 #if H_3D_IV_MERGE
-        vps.setIvMvPredFlag       ( layer, m_ivMvPredFlag ); 
+    vps.setIvMvPredFlag         ( layer, !isLayerZero && !isDepth && m_ivMvPredFlag ); 
 #endif
 #if H_3D_NBDV_REF
-        vps.setDepthRefinementFlag( layer, m_depthRefinementFlag );         
+    vps.setDepthRefinementFlag  ( layer, !isLayerZero && !isDepth && m_depthRefinementFlag );         
 #endif
 #if H_3D_VSP
-        vps.setViewSynthesisPredFlag( layer, m_viewSynthesisPredFlag );         
-#endif
-      }
-    }
-  }
+    vps.setViewSynthesisPredFlag( layer, !isLayerZero && !isDepth && m_viewSynthesisPredFlag );         
+#endif      
+  }  
+#if H_3D_TMVP
+  vps.setIvMvScalingFlag( m_ivMvScalingFlag );   
+#endif
 }
 #endif