Changeset 139 in 3DVCSoftware for branches/HTM-4.0-Nokia/source/Lib/TLibEncoder

Timestamp:

24 Sep 2012, 14:08:01 (13 years ago)

Author:

nokia

Message:

3DV-HTM v4.0: FCO

Location:

branches/HTM-4.0-Nokia/source/Lib/TLibEncoder

Files:

• TEncCfg.h (modified) (2 diffs)
• TEncGOP.cpp (modified) (3 diffs)
• TEncSbac.cpp (modified) (1 diff)
• TEncSearch.cpp (modified) (9 diffs)
• TEncSearch.h (modified) (1 diff)
• TEncSlice.cpp (modified) (2 diffs)
• TEncTop.cpp (modified) (1 diff)

branches/HTM-4.0-Nokia/source/Lib/TLibEncoder/TEncCfg.h

@@ -312 +312 @@
 #endif
 
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+  Bool m_bUseDMM34;
+#endif
+
   Int      m_iViewOrderIdx;
 
@@ -799 +803 @@
 #endif
 
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+  Void setUseDMM34( Bool b) { m_bUseDMM34 = b;    }
+  Bool getUseDMM34()        { return m_bUseDMM34; }
+#endif
+
   Void      setViewOrderIdx       ( Int   i )      { m_iViewOrderIdx          = i; }
   Void      setCamParPrecision              ( UInt  u )      { m_uiCamParPrecision      = u; }

branches/HTM-4.0-Nokia/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -167 +167 @@
   TEncSbac* pcSbacCoders = NULL;
   TComOutputBitstream* pcSubstreamsOut = NULL;
+  int is_Depth;
 
   {
@@ -255 +256 @@
       pcSlice->setViewId( m_pcEncTop->getViewId() );
       pcSlice->setIsDepth( m_pcEncTop->getIsDepth() ); 
-
+      is_Depth = m_pcEncTop->getIsDepth();
       m_pcEncTop->getSPS()->setDisInter4x4(m_pcEncTop->getDisInter4x4());
       pcSlice->setScalingList ( m_pcEncTop->getScalingList()  );
@@ -461 +462 @@
 
 #if SAIT_VSO_EST_A0033
-    m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, true ) );
+    
+{
+Bool flag_rec;
+
+    flag_rec =  ((m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, true) == NULL) ? false: true);
+    m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, flag_rec ) );
     m_pcRdCost->setDepthPicYuv   ( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), true, false ) );
-#endif
-
-
+}
+#endif
   }
 #endif

branches/HTM-4.0-Nokia/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -964 +964 @@
 #endif
 #if HHI_DMM_PRED_TEX
+
+#if FLEX_CODING_ORDER
+    if ( !pcCU->getSlice()->getSPS()->getUseDMM34() )
+    {
+      assert( uiDir != DMM_WEDGE_PREDTEX_D_IDX );
+      assert( uiDir != DMM_CONTOUR_PREDTEX_D_IDX );
+    }
+#endif
+
     if( uiDir == DMM_WEDGE_PREDTEX_D_IDX )     { xCodeWedgePredTexDeltaInfo  ( pcCU, uiAbsPartIdx ); }
     if( uiDir == DMM_CONTOUR_PREDTEX_D_IDX )   { xCodeContourPredTexDeltaInfo( pcCU, uiAbsPartIdx ); }

branches/HTM-4.0-Nokia/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2025 +2025 @@
 #endif
 #if HHI_DMM_PRED_TEX
+
+#if FLEX_CODING_ORDER
+      if ( pcCU->getSlice()->getSPS()->getUseDMM34() )
+      {
+#endif
       UInt uiTexTabIdx  = 0;
       Int  iTexDeltaDC1 = 0;
@@ -2048 +2053 @@
         uiRdModeList[ numModesForFullRD++ ] = DMM_CONTOUR_PREDTEX_D_IDX;
       }
+#if FLEX_CODING_ORDER
+      }
+#endif
 #endif
     }
@@ -2083 +2091 @@
 
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+      if( m_pcEncCfg->getIsDepth() && !predIntraLumaDMMAvailable( uiOrgMode, uiWidth, uiHeight, pcCU->getSlice()->getSPS()->getUseDMM34() ) 
+#if LGE_EDGE_INTRA
+        && uiOrgMode < EDGE_INTRA_IDX
+#endif
+        )
+
+#else
+
       if( m_pcEncCfg->getIsDepth() && !predIntraLumaDMMAvailable( uiOrgMode, uiWidth, uiHeight ) 
 #if LGE_EDGE_INTRA
@@ -2088 +2105 @@
 #endif
         )
+#endif
       {
         continue;
@@ -6014 +6032 @@
 }
 
-#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
+#if ((HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX)&&FLEX_CODING_ORDER)
+Bool TEncSearch::predIntraLumaDMMAvailable( UInt uiMode, UInt uiWidth, UInt uiHeight, Bool bDMMAvailable34 )
+#else
 Bool TEncSearch::predIntraLumaDMMAvailable( UInt uiMode, UInt uiWidth, UInt uiHeight )
+#endif
 {
   if( uiMode < NUM_INTRA_MODE ) return true;
@@ -6023 +6044 @@
 #if HHI_DMM_WEDGE_INTRA
   if( uiMode == DMM_WEDGE_FULL_IDX        ||
-      uiMode == DMM_WEDGE_FULL_D_IDX      ||
-      uiMode == DMM_WEDGE_PREDDIR_IDX     ||
-      uiMode == DMM_WEDGE_PREDDIR_D_IDX )
+    uiMode == DMM_WEDGE_FULL_D_IDX      ||
+    uiMode == DMM_WEDGE_PREDDIR_IDX     ||
+    uiMode == DMM_WEDGE_PREDDIR_D_IDX )
   {
     if( (uiWidth != uiHeight) || (uiWidth < DMM_WEDGEMODEL_MIN_SIZE) || (uiWidth > DMM_WEDGEMODEL_MAX_SIZE) || ( ( uiMode == DMM_WEDGE_PREDDIR_IDX || uiMode == DMM_WEDGE_PREDDIR_D_IDX ) && uiWidth == 4 ) )
@@ -6035 +6056 @@
 #if HHI_DMM_PRED_TEX
   if( uiMode == DMM_WEDGE_PREDTEX_IDX     ||
-      uiMode == DMM_WEDGE_PREDTEX_D_IDX   ||
-      uiMode == DMM_CONTOUR_PREDTEX_IDX   ||
-      uiMode == DMM_CONTOUR_PREDTEX_D_IDX )
+    uiMode == DMM_WEDGE_PREDTEX_D_IDX   ||
+    uiMode == DMM_CONTOUR_PREDTEX_IDX   ||
+    uiMode == DMM_CONTOUR_PREDTEX_D_IDX )
   {
     if( (uiWidth != uiHeight) || (uiWidth < DMM_WEDGEMODEL_MIN_SIZE) || (uiWidth > DMM_WEDGEMODEL_MAX_SIZE) || ( ( uiMode == DMM_CONTOUR_PREDTEX_IDX || uiMode == DMM_CONTOUR_PREDTEX_D_IDX ) && uiWidth == 4 ) )
@@ -6043 +6064 @@
       bDMMAvailable = false;
     }
+
+#if FLEX_CODING_ORDER
+    if ( !bDMMAvailable34 )
+    {
+      bDMMAvailable = false;
+    }
+#endif
+
   }
 #endif
@@ -6148 +6177 @@
   xDeltaDCQuantScaleDown( pcCU, riDeltaDC2 );
 }
-#endif
-#if HHI_DMM_WEDGE_INTRA
+//#endif
+#if HHI_DMM_WEDGE_INTRA  
 Void TEncSearch::findWedgeFullMinDist( TComDataCU*  pcCU,
                                        UInt         uiAbsPtIdx,

branches/HTM-4.0-Nokia/source/Lib/TLibEncoder/TEncSearch.h

@@ -315 +315 @@
   Bool predIntraLumaDMMAvailable  ( UInt           uiMode, 
                                     UInt           uiWidth, 
-                                    UInt           uiHeight );
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+                                    UInt         uiHeight, 
+                                    Bool         bDMMAvailable34 );
+#else
+                                    UInt         uiHeight );
+#endif
+
   Void xGetWedgeDeltaDCsMinDist   ( TComWedgelet*  pcWedgelet, 
                                     TComDataCU*    pcCU, 

branches/HTM-4.0-Nokia/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -729 +729 @@
  {
 
-   Int frameWidth = m_pcCfg->getSourceWidth();
+ 
+#if 0
+  Int frameWidth = m_pcCfg->getSourceWidth();
    Pel* pVideoRec = m_pcRdCost->getVideoRecPicYuv()->getLumaAddr();
    Int iVideoRecStride = m_pcRdCost->getVideoRecPicYuv()->getStride();
@@ -746 +748 @@
      pDepthOrg += iDepthOrgStride;
    }
+#endif
  }
 #endif

branches/HTM-4.0-Nokia/source/Lib/TLibEncoder/TEncTop.cpp

@@ -768 +768 @@
   m_cSPS.setUseDMM( m_bUseDMM );
 #endif
+
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+  m_cSPS.setUseDMM34( m_bUseDMM34 );
+#endif
+
+
 #if HHI_MPI
   m_cSPS.setUseMVI( m_bUseMVI );