Changeset 363 in 3DVCSoftware for branches

Timestamp:

3 May 2013, 15:59:14 (12 years ago)

Author:

tech

Message:

Fixed wrongly merged parts.

Location:

branches/HTM-DEV-0.1-dev/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (3 diffs)
• App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• App/TAppEncoder/TAppEncCfg.h (modified) (7 diffs)
• Lib/TLibCommon/TComSlice.cpp (modified) (1 diff)
• Lib/TLibCommon/TComSlice.h (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncCfg.h (modified) (1 diff)
• Lib/TLibEncoder/TEncGOP.h (modified) (1 diff)

branches/HTM-DEV-0.1-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -115 +115 @@
   poc = -1; 
 #endif
-
   TComList<TComPic*>* pcListPic = NULL;
 
@@ -147 +146 @@
   Bool firstSlice        = true; 
 #endif
-
  
   while (!!bitstreamFile)
@@ -296 +294 @@
       }
       if ( bNewPicture && 
+#endif
            (   nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL
             || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP

branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -78 +78 @@
 #if !H_MV
   m_aidQP = NULL;
+#endif
 #if J0149_TONE_MAPPING_SEI
   m_startOfCodedInterval = NULL;

branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncCfg.h

@@ -60 +60 @@
   Char*     m_pchInputFile;                                   ///< source file name
 #endif
-
   Char*     m_pchBitstreamFile;                               ///< output bitstream file
-
 #if H_MV
   std::vector<char*>     m_pchReconFileList;                  ///< output reconstruction file names
@@ -69 +67 @@
   Char*     m_pchReconFile;                                   ///< output reconstruction file
 #endif
-
-
   // VPS specification
 #if H_MV
@@ -83 +79 @@
   std::vector<Int>       m_dimensionIdLen;                   ///< Length of scalability dimension s 
 #endif
-
-
   Double    m_adLambdaModifier[ MAX_TLAYER ];                 ///< Lambda modifier array for each temporal layer
   // source specification
@@ -103 +97 @@
   Level::Tier   m_levelTier;
   Level::Name   m_level;
-
 #if L0046_CONSTRAINT_FLAGS
   Bool m_progressiveSourceFlag;
@@ -128 +121 @@
 #else
   Int       m_maxDecPicBuffering[MAX_TLAYER];                 ///< total number of reference pictures needed for decoding
+#endif
 #endif
 #if !L0034_COMBINED_LIST_CLEANUP
@@ -378 +372 @@
   Void  xPrintParameter ();                                   ///< print configuration values
   Void  xPrintUsage     ();                                   ///< print usage
-
 #if H_MV
   template <typename T>
@@ -429 +422 @@
   Int*      m_constantPicRateIdc;                                ///< Indicates constant picture rate idc for various sub-layers
 #endif
-  
 #if H_MV
   Int   getGOPSize() { return m_iGOPSize; }
 #endif
-
 public:
   TAppEncCfg();

branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -421 +421 @@
 
 #if H_MV
-Void TComSlice::setRefPicList( TComList<TComPic*>& rcListPic, Bool checkNumPocTotalCurr,std::vector<TComPic*>& refPicSetInterLayer )
+Void TComSlice::setRefPicList( TComList<TComPic*>& rcListPic, std::vector<TComPic*>& refPicSetInterLayer , Bool checkNumPocTotalCurr)
 #else
 #if FIX1071

branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.h

@@ -1584 +1584 @@
 #endif
 #if H_MV
-  Void      setRefPicList       ( TComList<TComPic*>& rcListPic, Bool checkNumPocTotalCurr = false , std::vector<TComPic*>& interLayerRefPicSet );
+  Void      setRefPicList       ( TComList<TComPic*>& rcListPic, std::vector<TComPic*>& interLayerRefPicSet , Bool checkNumPocTotalCurr = false );
 #else
 #if FIX1071

branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -591 +591 @@
     // Set reference list
 #if H_MV    
-    pcSlice->setRefPicList( m_cListPic, true, m_refPicSetInterLayer );    
+    pcSlice->setRefPicList( m_cListPic, m_refPicSetInterLayer, true );    
 #else
 #if FIX1071
@@ -782 +782 @@
     case NAL_UNIT_CODED_SLICE_RASL_N:
     case NAL_UNIT_CODED_SLICE_RASL_R:
+#if H_MV
+      return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay, newLayerFlag);
+#else
       return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay);
+#endif
       break;
     default:

branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -97 +97 @@
 #if H_MV
     ::memset( m_interViewRefs,   0, sizeof(m_interViewRefs) );
-    ::memset( m_interViewRefPosL[0], -1, sizeof(m_interViewRefPosL[0]) );    ::memset( m_interViewRefPosL[1], -1, sizeof(m_interViewRefPosL[1]) );#endif
+    ::memset( m_interViewRefPosL[0], -1, sizeof(m_interViewRefPosL[0]) );    ::memset( m_interViewRefPosL[1], -1, sizeof(m_interViewRefPosL[1]) );
+#endif
   }
 };

branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.h

@@ -211 +211 @@
   }
 #endif
+#endif
 #if H_MV
    Void  xSetRefPicListModificationsMvc( TComSlice* pcSlice, UInt uiPOCCurr, UInt iGOPid );