Changeset 48 in 3DVCSoftware for branches/0.3-poznan-univ/source/Lib/TLibCommon

Timestamp:

30 Mar 2012, 18:57:41 (13 years ago)

Author:

poznan-univ

Message:

some bug fix on high level syntax
fixed some compiler warning issues under windows and linux

Location:

branches/0.3-poznan-univ/source/Lib/TLibCommon

Files:

• SEI.h (modified) (2 diffs)
• TComLoopFilter.cpp (modified) (1 diff)
• TComPic.cpp (modified) (1 diff)
• TComPrediction.cpp (modified) (2 diffs)
• TComSlice.cpp (modified) (2 diffs)
• TComSlice.h (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

branches/0.3-poznan-univ/source/Lib/TLibCommon/SEI.h

@@ -41 +41 @@
 class SEI
 {
+#if BITSTREAM_EXTRACTION
+protected:
+  UInt m_uiLayerId;
+#endif
+
 public:
   enum PayloadType {
@@ -51 +56 @@
   
   virtual PayloadType payloadType() const = 0;
+
+#if BITSTREAM_EXTRACTION
+  Void      setLayerId              ( UInt u )       { m_uiLayerId = u; }
+  UInt      getLayerId              ()         const { return m_uiLayerId; }
+#endif
 };
 

branches/0.3-poznan-univ/source/Lib/TLibCommon/TComLoopFilter.cpp

@@ -419 +419 @@
   UInt uiPartP;
   TComDataCU* pcCUP;
-  UInt uiBs;
+  UInt uiBs = 0;
   
 #if MTK_NONCROSS_INLOOP_FILTER

branches/0.3-poznan-univ/source/Lib/TLibCommon/TComPic.cpp

@@ -490 +490 @@
   
   Int x, y;
-  Bool bAvailable = true;
   Pel* pAvail  = getPicYuvAvail()->getLumaAddr ( iCuAddr, uiAbsZorderIdx );
   Int CUHeight = g_uiMaxCUHeight >> uiPartDepth; //rpcCU->getHeight(uiAbsZorderIdx);

branches/0.3-poznan-univ/source/Lib/TLibCommon/TComPrediction.cpp

@@ -1640 +1640 @@
 
 #if DEPTH_MAP_GENERATION
-  Int             ref_frame0_idx_1st, ref_frame1_idx_1st;
+  Int             ref_frame0_idx_1st = 0, ref_frame1_idx_1st = 0;
   TComMv          mv0_1st,mv1_1st;
 #endif
@@ -1648 +1648 @@
   Pel aiUTab[MAX_CU_SIZE];
   Pel aiVTab[MAX_CU_SIZE];
-  Pel iULast;
-  Pel iVLast;
+  Pel iULast = 0;
+  Pel iVLast = 0;
   Pel iTemp;
 

branches/0.3-poznan-univ/source/Lib/TLibCommon/TComSlice.cpp

@@ -737 +737 @@
 }
 
+#if FLEXCO_CAMPARAM_IN_DEPTH
+Void
+TComSPS::initMultiviewSPS( UInt uiViewId, Int iViewOrderIdx, UInt uiCamParPrecision, Bool bCamParSlice, Int** aaiScale, Int** aaiOffset , Bool bDepth)
+#else
 Void
 TComSPS::initMultiviewSPS( UInt uiViewId, Int iViewOrderIdx, UInt uiCamParPrecision, Bool bCamParSlice, Int** aaiScale, Int** aaiOffset )
+#endif
 {
   AOT( uiViewId == 0 && iViewOrderIdx != 0 );
@@ -746 +751 @@
   m_uiViewId              = uiViewId;
   m_iViewOrderIdx         = iViewOrderIdx;
+#if FLEXCO_CAMPARAM_IN_DEPTH
+  m_bDepth                = bDepth;
+#else
   m_bDepth                = false;
+#endif
   m_uiCamParPrecision     = ( m_uiViewId ? uiCamParPrecision : 0 );
   m_bCamParInSliceHeader  = ( m_uiViewId ? bCamParSlice  : false );

branches/0.3-poznan-univ/source/Lib/TLibCommon/TComSlice.h

@@ -221 +221 @@
   Int* getPad         ( )        { return m_aiPad; }
 
+#if FLEX_CODING_ORDER 
+  Void        initMultiviewSPS      ( UInt uiViewId, Int iViewOrderIdx = 0, UInt uiCamParPrecision = 0, Bool bCamParSlice = false, Int** aaiScale = 0, Int** aaiOffset = 0, Bool bDepth = false );
+#else
   Void        initMultiviewSPS      ( UInt uiViewId, Int iViewOrderIdx = 0, UInt uiCamParPrecision = 0, Bool bCamParSlice = false, Int** aaiScale = 0, Int** aaiOffset = 0 );
+#endif
   Void        initMultiviewSPSDepth ( UInt uiViewId, Int iViewOrderIdx );
 

branches/0.3-poznan-univ/source/Lib/TLibCommon/TypeDef.h

@@ -44 +44 @@
 #define FLEX_CODING_ORDER               1
 
+#define FLEXCO_CAMPARAM_IN_DEPTH        FLEX_CODING_ORDER // encode pamera parameters in depth SPS
+
 #define SONY_COLPIC_AVAILABILITY        1