Changeset 363 in 3DVCSoftware for branches/HTM-DEV-0.1-dev/source/App

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/App

Files:

• TAppDecoder/TAppDecTop.cpp (modified) (3 diffs)
• TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• TAppEncoder/TAppEncCfg.h (modified) (7 diffs)

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();