Changeset 1169 in 3DVCSoftware for branches/HTM-13.1-dev0/source/Lib/TLibCommon

Timestamp:

5 Apr 2015, 22:37:43 (10 years ago)

Author:

tech

Message:

Disabled chroma for depth.

Location:

branches/HTM-13.1-dev0/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (3 diffs)
• TComDataCU.h (modified) (2 diffs)
• TComRom.cpp (modified) (3 diffs)
• TComRom.h (modified) (1 diff)
• TComSlice.h (modified) (1 diff)
• TypeDef.h (modified) (3 diffs)

branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComDataCU.cpp

@@ -2446 +2446 @@
 Void TComDataCU::setCbfSubParts( UInt uiCbfY, UInt uiCbfU, UInt uiCbfV, UInt uiAbsPartIdx, UInt uiDepth )
 {
+#if H_3D_DISABLE_CHROMA
+  if( this->getSlice()->getIsDepth() )
+  {
+    uiCbfU = 0;
+    uiCbfV = 0;
+  }
+#endif
   UInt uiCurrPartNumb = m_pcPic->getNumPartInCU() >> (uiDepth << 1);
   memset( m_puhCbf[0] + uiAbsPartIdx, uiCbfY, sizeof( UChar ) * uiCurrPartNumb );
@@ -2454 +2461 @@
 Void TComDataCU::setCbfSubParts( UInt uiCbf, TextType eTType, UInt uiAbsPartIdx, UInt uiDepth )
 {
+#if H_3D_DISABLE_CHROMA
+  assert( getSlice() != NULL );
+  if( this->getSlice()->getIsDepth() && g_aucConvertTxtTypeToIdx[eTType] > 0  )
+  {
+    uiCbf = 0;    
+  }
+#endif
+
   UInt uiCurrPartNumb = m_pcPic->getNumPartInCU() >> (uiDepth << 1);
   memset( m_puhCbf[g_aucConvertTxtTypeToIdx[eTType]] + uiAbsPartIdx, uiCbf, sizeof( UChar ) * uiCurrPartNumb );
@@ -2468 +2483 @@
 Void TComDataCU::setCbfSubParts ( UInt uiCbf, TextType eTType, UInt uiAbsPartIdx, UInt uiPartIdx, UInt uiDepth )
 {
+#if H_3D_DISABLE_CHROMA
+  assert( getSlice() != NULL );
+  if( this->getSlice()->getIsDepth() && g_aucConvertTxtTypeToIdx[eTType] > 0  )
+  {
+    uiCbf = 0;    
+  }
+#endif
   setSubPart<UChar>( uiCbf, m_puhCbf[g_aucConvertTxtTypeToIdx[eTType]], uiAbsPartIdx, uiDepth, uiPartIdx );
 }

branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComDataCU.h

@@ -313 +313 @@
   TComPic*      getPic                ()                        { return m_pcPic;           }
   TComSlice*    getSlice              ()                        { return m_pcSlice;         }
+#if H_3D_DISABLE_CHROMA
+  Void         setSlice              ( TComSlice* pcSlice)     { m_pcSlice = pcSlice;       }
+#endif
   UInt&         getAddr               ()                        { return m_uiCUAddr;        }
   UInt&         getZorderIdxInCU      ()                        { return m_uiAbsIdxInLCU; }
@@ -433 +436 @@
   Pel*&         getPCMSampleCr        ()                        { return m_pcIPCMSampleCr;    }
 
+#if H_3D_DISABLE_CHROMA
+  UChar         getCbf    ( UInt uiIdx, TextType eType )                  { assert( getSlice() != NULL ); assert(  g_aucConvertTxtTypeToIdx[eType] == 0 || !getSlice()->getIsDepth() || m_puhCbf[g_aucConvertTxtTypeToIdx[eType]][uiIdx] == 0 );  return m_puhCbf[g_aucConvertTxtTypeToIdx[eType]][uiIdx];  }
+  UChar*        getCbf    ( TextType eType )                              { assert( getSlice() != NULL ); assert(  g_aucConvertTxtTypeToIdx[eType] == 0 || !getSlice()->getIsDepth() || m_puhCbf[g_aucConvertTxtTypeToIdx[eType]] );              return m_puhCbf[g_aucConvertTxtTypeToIdx[eType]];         }  
+#else
   UChar         getCbf    ( UInt uiIdx, TextType eType )                  { return m_puhCbf[g_aucConvertTxtTypeToIdx[eType]][uiIdx];  }
   UChar*        getCbf    ( TextType eType )                              { return m_puhCbf[g_aucConvertTxtTypeToIdx[eType]];         }
+#endif
   UChar         getCbf    ( UInt uiIdx, TextType eType, UInt uiTrDepth )  { return ( ( getCbf( uiIdx, eType ) >> uiTrDepth ) & 0x1 ); }
+#if H_3D_DISABLE_CHROMA
+  Void          setCbf    ( UInt uiIdx, TextType eType, UChar uh )        { assert( getSlice() != NULL ); m_puhCbf[g_aucConvertTxtTypeToIdx[eType]][uiIdx] = ( g_aucConvertTxtTypeToIdx[eType] > 0 && getSlice()->getIsDepth() ) ? 0 : uh ;    }
+#else
   Void          setCbf    ( UInt uiIdx, TextType eType, UChar uh )        { m_puhCbf[g_aucConvertTxtTypeToIdx[eType]][uiIdx] = uh;    }
+#endif
   Void          clearCbf  ( UInt uiIdx, TextType eType, UInt uiNumParts );
   UChar         getQtRootCbf          ( UInt uiIdx )                      { return getCbf( uiIdx, TEXT_LUMA, 0 ) || getCbf( uiIdx, TEXT_CHROMA_U, 0 ) || getCbf( uiIdx, TEXT_CHROMA_V, 0 ); }

branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComRom.cpp

@@ -391 +391 @@
 Bool g_tracePU = false; 
 Bool g_traceTU = false; 
+Bool g_disableNumbering = true; 
 Bool g_disableHLSTrace = false; 
 UInt64 g_stopAtCounter       = 0; 
@@ -633 +634 @@
       std::cout << "Break point here." << std::endl; 
     }
-    fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
+    if ( !g_disableNumbering )
+    {  
+      fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
+    }
     fprintf( g_hTrace, "%-50s       : %d\n", symbolName, val );     
     fflush ( g_hTrace );
@@ -770 +774 @@
 
 #if SHARP_DMM_CLEAN_K0042
-    posEnd = racWedgeList.size();
+    posEnd = (Int) racWedgeList.size();
     if (uiOri == 0 || uiOri == 4)
     {

branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComRom.h

@@ -257 +257 @@
  extern Bool   g_traceTU; 
  extern Bool   g_disableHLSTrace;       // USE g_HLSTraceEnable to toggle HLS trace. Not this one!
+ extern Bool   g_disableNumbering;      // Don't print numbers to trace file
  extern UInt64 g_stopAtCounter;         // Counter to set breakpoint. 
  extern Bool   g_traceCopyBack;         // Output samples on copy back  

branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComSlice.h

@@ -1772 +1772 @@
   Void setChromaFormatIdc (Int i)    { m_chromaFormatIdc = i;          }
 
+#if H_3D_DISABLE_CHROMA
+  static Int getWinUnitX (Int chromaFormatIdc) { assert (chromaFormatIdc >= 0 && chromaFormatIdc <= MAX_CHROMA_FORMAT_IDC); return m_winUnitX[chromaFormatIdc];      }
+  static Int getWinUnitY (Int chromaFormatIdc) { assert (chromaFormatIdc >= 0 && chromaFormatIdc <= MAX_CHROMA_FORMAT_IDC); return m_winUnitY[chromaFormatIdc];      }
+#else
   static Int getWinUnitX (Int chromaFormatIdc) { assert (chromaFormatIdc > 0 && chromaFormatIdc <= MAX_CHROMA_FORMAT_IDC); return m_winUnitX[chromaFormatIdc];      }
   static Int getWinUnitY (Int chromaFormatIdc) { assert (chromaFormatIdc > 0 && chromaFormatIdc <= MAX_CHROMA_FORMAT_IDC); return m_winUnitY[chromaFormatIdc];      }
+#endif
   
   // structure

branches/HTM-13.1-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -67 +67 @@
 #if H_MV
 #define SONY_MV_V_CONST_C0078            1   // Control disparity vector search range via configuration file
+#define H_MV_FIX_CONF_WINDOW             1   
 #endif
 
@@ -80 +81 @@
 
 #if H_MV
-#define H_MV_ENC_DEC_TRAC                 1  //< CU/PU level tracking
+#define H_MV_ENC_DEC_TRAC                 0  //< CU/PU level tracking
 #endif
 
@@ -326 +327 @@
 
 #define FIX_TICKET_95                          1   // pps_scaling_list_ref_layer_id parsing
+#define H_3D_DISABLE_CHROMA                    1 
 
 #if H_3D