Changeset 747 in 3DVCSoftware for branches/HTM-9.0r1-F0122/source/App/TAppEncoder

Timestamp:

17 Dec 2013, 21:57:52 (11 years ago)

Author:

qualcomm

Message:

MV-HEVC+D support based on JCT3V-F0122

Location:

branches/HTM-9.0r1-F0122/source/App/TAppEncoder

Files:

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

branches/HTM-9.0r1-F0122/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -243 +243 @@
   {"main-stereo",    Profile::MAINSTEREO},
   {"main-multiview", Profile::MAINMULTIVIEW},
-#if H_3D
+#if H_3DV
   {"main-3d"    , Profile::MAIN3D},
 #endif
@@ -775 +775 @@
   ("ViewSynthesisPred",               m_viewSynthesisPredFlag,  true           , "view synthesis prediction " )  
 #endif
-#if H_3D
+#if H_3DV
   ("IvMvScaling",                     m_ivMvScalingFlag      ,  true            , "inter view motion vector scaling" )    
 #endif
@@ -2461 +2461 @@
   printf("ViewSynthesisPred:%d ", m_viewSynthesisPredFlag );
 #endif
-#if H_3D
+#if H_3DV
   printf("IvMvScaling:%d ", m_ivMvScalingFlag ? 1 : 0  );
 #endif

branches/HTM-9.0r1-F0122/source/App/TAppEncoder/TAppEncCfg.h

@@ -141 +141 @@
   Bool m_viewSynthesisPredFlag;
 #endif
-#if H_3D
+#if H_3DV
   Bool m_ivMvScalingFlag; 
 #endif

branches/HTM-9.0r1-F0122/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1651 +1651 @@
   for ( Int layer = 0; layer <= vps.getMaxLayersMinus1(); layer++ )
   {
+#if H_3DV
     Bool isDepth      = ( vps.getDepthId( layer ) == 1 ) ;
     Bool isLayerZero  = ( layer == 0 ); 
+#endif
 
 #if H_3D_ARP
@@ -1715 +1717 @@
 #endif
   }  
-#if H_3D
+#if H_3DV
   vps.setIvMvScalingFlag( m_ivMvScalingFlag );   
 #endif