Changeset 280 in 3DVCSoftware for branches/HTM-5.1-dev0/source/App

Timestamp:

14 Feb 2013, 23:41:41 (12 years ago)

Author:

tech

Message:

Integration of branch dev 2.

Location:

branches/HTM-5.1-dev0/source/App

Files:

• TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• TAppEncoder/TAppEncCfg.cpp (modified) (2 diffs)
• TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• TAppEncoder/TAppEncTop.cpp (modified) (4 diffs)

branches/HTM-5.1-dev0/source/App/TAppDecoder/TAppDecTop.cpp

@@ -96 +96 @@
 #endif
 
-#if SONY_COLPIC_AVAILABILITY
-  m_tDecTop[0]->setViewOrderIdx(0);
-#endif
   Int                 viewDepthId = 0;
   Int                 previousViewDepthId  = 0;

branches/HTM-5.1-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -341 +341 @@
 #if LGE_ILLUCOMP_B0045
   ("IlluCompEnable",                  m_bUseIC                  , true         , "Use illumination compensation for inter-view prediction" )
+#endif
+#if INTER_VIEW_VECTOR_SCALING_C0115
+  ("IVSEnable",                       m_bUseIVS                 , true         , "Use inter-view vector scaling" )
 #endif
 #if DBL_CONTROL
@@ -1806 +1809 @@
   printf("IlluCompEnable: %d ", m_bUseIC);
 #endif
-
+#if INTER_VIEW_VECTOR_SCALING_C0115
+  printf("IVSEnable: %d ", m_bUseIVS);
+#endif
   printf("\n");
 

branches/HTM-5.1-dev0/source/App/TAppEncoder/TAppEncCfg.h

@@ -172 +172 @@
   Bool      m_bUseIC;                                     ///< flag for using illumination compensation for inter-view prediction
 #endif
+#if INTER_VIEW_VECTOR_SCALING_C0115
+  Bool      m_bUseIVS;                                        ///< flag for using inter-view vector scaling
+#endif
 #if SAO_UNIT_INTERLEAVING
   Int       m_maxNumOffsetsPerPic;                            ///< SAO maximun number of offset per picture

branches/HTM-5.1-dev0/source/App/TAppEncoder/TAppEncTop.cpp

@@ -121 +121 @@
     m_cVPS.setDependentFlag                                    ( iViewIdx ? true:false, layerId );
     m_cVPS.setDependentLayer                                   ( layerId - (m_bUsingDepthMaps ? 2:1), layerId );
+#if INTER_VIEW_VECTOR_SCALING_C0115
+    m_cVPS.setIVScalingFlag                                    ( m_bUseIVS );
+#endif
 #endif
     
@@ -316 +319 @@
 #if LGE_ILLUCOMP_B0045
     m_acTEncTopList[iViewIdx]->setUseIC                ( m_bUseIC          );
+#endif
+#if INTER_VIEW_VECTOR_SCALING_C0115
+    m_acTEncTopList[iViewIdx]->setUseIVS               ( m_bUseIVS          );
 #endif
 #if SAO_UNIT_INTERLEAVING
@@ -639 +645 @@
       m_acTEncDepthTopList[iViewIdx]->setUseIC                ( false     );
 #endif
+#if INTER_VIEW_VECTOR_SCALING_C0115
+     m_acTEncDepthTopList[iViewIdx]->setUseIVS                ( m_bUseIVS );
+#endif
 #if SAO_UNIT_INTERLEAVING
       m_acTEncDepthTopList[iViewIdx]->setMaxNumOffsetsPerPic (m_maxNumOffsetsPerPic);
@@ -793 +802 @@
   m_cUsedPelsRenderer.init(m_iSourceWidth, m_iSourceHeight, true, 0, LOG2_DISP_PREC_LUT, true, 0, 0, 0, 0, 0, 6, 4, 1, 0, 6 );
 #endif
+
 }