Changeset 884 in 3DVCSoftware for trunk/source/App/TAppDecoder

Timestamp:

29 Mar 2014, 18:55:16 (11 years ago)

Author:

tech

Message:

Merged HTM-10.1-dev0@883. (MV-HEVC 7 HLS)

File:

• trunk/source/App/TAppDecoder/TAppDecTop.cpp (modified) (4 diffs)

trunk/source/App/TAppDecoder/TAppDecTop.cpp

@@ -140 +140 @@
     AOF( m_pScaleOffsetFile ); 
   }
-#if !FIX_CAM_PARS_COLLECTOR
-  m_cCamParsCollector.init( m_pScaleOffsetFile );
-#endif
 #endif
   InputByteStream bytestream(bitstreamFile);
@@ -209 +206 @@
       read(nalu, nalUnit);
 #if H_MV      
-#if H_MV_FIX_VPS_LAYER_ID_NOT_EQUAL_ZERO
       if( (m_iMaxTemporalLayer >= 0 && nalu.m_temporalId > m_iMaxTemporalLayer) 
           || !isNaluWithinTargetDecLayerIdSet(&nalu)
           || nalu.m_layerId > MAX_NUM_LAYER_IDS-1
           || (nalu.m_nalUnitType == NAL_UNIT_VPS && nalu.m_layerId > 0)           
-#if H_MV_HLS_7_MISC_P0130_EOS
           || (nalu.m_nalUnitType == NAL_UNIT_EOB && nalu.m_layerId > 0)           
-#endif
          ) 
-#else
-      if( (m_iMaxTemporalLayer >= 0 && nalu.m_temporalId > m_iMaxTemporalLayer) || !isNaluWithinTargetDecLayerIdSet(&nalu) || nalu.m_layerId > MAX_NUM_LAYER_IDS-1 ) 
-#endif
       {
         bNewPicture = false;
@@ -248 +239 @@
           }
 
-#if H_MV_HLS_7_OUTPUT_LAYERS_5_10_22_27
           if ( m_targetOptLayerSetIdx < 0 || m_targetOptLayerSetIdx >= vps->getNumOutputLayerSets() )
           {
@@ -254 +244 @@
             exit(EXIT_FAILURE);
           }
-#endif
           m_targetDecLayerIdSet = vps->getTargetDecLayerIdList( m_targetOptLayerSetIdx ); 
         }
 
-#if FIX_CAM_PARS_COLLECTOR
 #if H_3D
         if (nalu.m_nalUnitType == NAL_UNIT_VPS )
-        {        
-          
+        {                  
           m_cCamParsCollector.init( m_pScaleOffsetFile, m_tDecTop[decIdx]->getPrefetchedVPS() );
         }       
-#endif
 #endif
         bNewPicture       = ( newSliceDiffLayer || newSliceDiffPoc ) && !sliceSkippedFlag;