Changeset 838 in 3DVCSoftware for branches/HTM-10.0rc1-dev0/source/Lib/TLibCommon

Timestamp:

8 Feb 2014, 01:07:38 (11 years ago)

Author:

tech

Message:

Further fixes.

Location:

branches/HTM-10.0rc1-dev0/source/Lib/TLibCommon

Files:

• TComPic.cpp (modified) (1 diff)
• TComPic.h (modified) (1 diff)
• TComPicSym.cpp (modified) (1 diff)
• TComRom.cpp (modified) (1 diff)
• TComTrQuant.h (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

branches/HTM-10.0rc1-dev0/source/Lib/TLibCommon/TComPic.cpp

@@ -111 +111 @@
   memcpy(m_numReorderPics, numReorderPics, MAX_TLAYER*sizeof(Int));
 
-  /* initialize the texture to depth reference status */
 #if H_3D_FCO
+/* initialize the texture to depth reference status */
   for (int j=0; j<2; j++)
   {

branches/HTM-10.0rc1-dev0/source/Lib/TLibCommon/TComPic.h

@@ -192 +192 @@
   Window&       getDefDisplayWindow()   { return m_defaultDisplayWindow; }
 
+  Bool          getSAOMergeAvailability(Int currAddr, Int mergeAddr);
 
   /* field coding parameters*/

branches/HTM-10.0rc1-dev0/source/Lib/TLibCommon/TComPicSym.cpp

@@ -123 +123 @@
     m_puiInverseCUOrderMap[i] = i;
   }
+
+  m_saoBlkParams = new SAOBlkParam[m_uiNumCUsInFrame];
 }
 

branches/HTM-10.0rc1-dev0/source/Lib/TLibCommon/TComRom.cpp

@@ -327 +327 @@
 UInt g_uiPCMBitDepthChroma   = 8;    // PCM bit-depth
 
+#if H_3D_DIM_DMM
 // ====================================================================================================================
 // Depth coding modes
 // ====================================================================================================================
-#if H_3D_DIM_DMM
 const WedgeResolution g_dmmWedgeResolution[6] = 
 {

branches/HTM-10.0rc1-dev0/source/Lib/TLibCommon/TComTrQuant.h

@@ -150 +150 @@
 
 #if RDOQ_CHROMA_LAMBDA 
+  Void setLambdas ( const Double lambdas[3] ) { for (Int component = 0; component < 3; component++) m_lambdas[component] = lambdas[component]; }
   Void setLambda(Double dLambdaLuma, Double dLambdaChroma) { m_dLambdaLuma = dLambdaLuma; m_dLambdaChroma = dLambdaChroma; }
   Void selectLambda(TextType eTType) { m_dLambda = (eTType == TEXT_LUMA) ? m_lambdas[0] : ((eTType == TEXT_CHROMA_U) ? m_lambdas[1] : m_lambdas[2]); }

branches/HTM-10.0rc1-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -551 +551 @@
 };
 
+enum SAOComponentIdx
+{
+  SAO_Y =0,
+  SAO_Cb,
+  SAO_Cr,
+  NUM_SAO_COMPONENTS
+};
 
 enum SAOMode //mode