Changeset 262 in 3DVCSoftware for branches/HTM-5.1-dev2-Sony/source/Lib/TLibEncoder

Timestamp:

7 Feb 2013, 06:01:05 (12 years ago)

Author:

sony

Message:

JCT2-C0115 Inter-view vector scaling for TMVP & flag
The macro is INTER_VIEW_VECTOR_SCALING_C0115.

Location:

branches/HTM-5.1-dev2-Sony/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (1 diff)
• TEncCfg.h (modified) (3 diffs)
• TEncGOP.cpp (modified) (1 diff)
• TEncSlice.cpp (modified) (1 diff)
• TEncTop.cpp (modified) (1 diff)

branches/HTM-5.1-dev2-Sony/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -498 +498 @@
       }
     }
+#if INTER_VIEW_VECTOR_SCALING_C0115
+      WRITE_FLAG( pcVPS->getIVScalingFlag(),                      "inter_view_vector_scaling_flag" );
+#endif
   }
   

branches/HTM-5.1-dev2-Sony/source/Lib/TLibEncoder/TEncCfg.h

@@ -170 +170 @@
   Bool      m_bUseIC;
 #endif
+#if INTER_VIEW_VECTOR_SCALING_C0115
+  Bool      m_bUseIVS;
+#endif
 #if SAO_UNIT_INTERLEAVING
   Int       m_maxNumOffsetsPerPic;
@@ -713 +716 @@
   Void  setUseIC                       ( Bool bVal )   {m_bUseIC = bVal;}
   Bool  getUseIC                       ()              {return m_bUseIC;}
+#endif
+#if INTER_VIEW_VECTOR_SCALING_C0115
+  Void  setUseIVS                       ( Bool bVal )   {m_bUseIVS = bVal;}
+  Bool  getUseIVS                       ()              {return m_bUseIVS;}
 #endif
 #if SAO_UNIT_INTERLEAVING
@@ -869 +876 @@
   Void      setCodedOffset                  ( Int** p )      { m_aaiCodedOffset         = p; }
 
-#if SONY_COLPIC_AVAILABILITY
-  Int       getViewOrderIdx                 ()      { return  m_iViewOrderIdx; }
+#if INTER_VIEW_VECTOR_SCALING_C0115
+  Int       getViewOrderIdx                 ()      { return  m_iViewOrderIdx; }    // will be changed to view_id
 #endif
 };

branches/HTM-5.1-dev2-Sony/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -259 +259 @@
       pcSlice->setViewId( m_pcEncTop->getViewId() );
       pcSlice->setIsDepth( m_pcEncTop->getIsDepth() ); 
+#if INTER_VIEW_VECTOR_SCALING_C0115
+      pcSlice->setIVScalingFlag( m_pcEncTop->getUseIVS() );
+#endif
 
       m_pcEncTop->getSPS()->setDisInter4x4(m_pcEncTop->getDisInter4x4());

branches/HTM-5.1-dev2-Sony/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -190 +190 @@
   rpcSlice->setPOC( uiPOCCurr );
   
-#if SONY_COLPIC_AVAILABILITY
-  rpcSlice->setViewOrderIdx(m_pcCfg->getViewOrderIdx());
+#if INTER_VIEW_VECTOR_SCALING_C0115
+  rpcSlice->setViewOrderIdx(m_pcCfg->getViewOrderIdx());    // will be changed to view_id
 #endif 
 #if LGE_ILLUCOMP_B0045

branches/HTM-5.1-dev2-Sony/source/Lib/TLibEncoder/TEncTop.cpp

@@ -404 +404 @@
   pcPicYuvOrg->copyToPic( pcPicCurr->getPicYuvOrg() );
 
-#if SONY_COLPIC_AVAILABILITY
-  pcPicCurr->setViewOrderIdx(m_iViewOrderIdx);
+#if INTER_VIEW_VECTOR_SCALING_C0115
+  pcPicCurr->setViewOrderIdx(m_iViewOrderIdx);    // will be changed to view_id
 #endif
   pcPicCurr->setScaleOffset( m_aaiCodedScale, m_aaiCodedOffset );