Changeset 1128 in 3DVCSoftware for branches/HTM-13.0-MV-draft-2/source/App/TAppDecoder/TAppDecTop.cpp

Timestamp:

10 Nov 2014, 14:19:08 (10 years ago)

Author:

tech

Message:

Removed 3D-HEVC related code.

File:

• branches/HTM-13.0-MV-draft-2/source/App/TAppDecoder/TAppDecTop.cpp (modified) (9 diffs)

branches/HTM-13.0-MV-draft-2/source/App/TAppDecoder/TAppDecTop.cpp

@@ -67 +67 @@
   }
 #endif
-#if H_3D
-    m_pScaleOffsetFile  = 0;
-#endif
 
 #if H_MV
@@ -103 +100 @@
     m_pchReconFile = NULL;
   }
-#if H_3D
-  if (m_pchScaleOffsetFile)
-  {
-    free (m_pchScaleOffsetFile);
-    m_pchScaleOffsetFile = NULL; 
-  }
-#endif
 }
 
@@ -139 +129 @@
   }
 
-#if H_3D
-  if( m_pchScaleOffsetFile ) 
-  { 
-    m_pScaleOffsetFile = ::fopen( m_pchScaleOffsetFile, "wt" ); 
-    AOF( m_pScaleOffsetFile ); 
-  }
-#endif
   InputByteStream bytestream(bitstreamFile);
 
@@ -265 +248 @@
           }
         }
-#if H_3D
-        if (nalu.m_nalUnitType == NAL_UNIT_VPS )
-        {                  
-          m_cCamParsCollector.init( m_pScaleOffsetFile, m_tDecTop[decIdx]->getPrefetchedVPS() );
-        }       
-#endif
         bNewPicture       = ( newSliceDiffLayer || newSliceDiffPoc ) && !sliceSkippedFlag; 
         if ( nalu.isSlice() && firstSlice && !sliceSkippedFlag )        
@@ -346 +323 @@
 #endif
 #endif
-#if H_3D
-    if ( allLayersDecoded || !bitstreamFile )
-    {
-      for( Int dI = 0; dI < m_numDecoders; dI++ )
-      {
-        TComPic* picLastCoded = m_ivPicLists.getPic( m_tDecTop[dI]->getLayerId(), pocLastPic );
-        assert( picLastCoded != NULL );        
-        picLastCoded->compressMotion(1);
-      }
-    }
-#endif
 
     if( pcListPic )
@@ -469 +435 @@
   }
 #if H_MV
-#if H_3D
-  if( m_cCamParsCollector.isInitialized() )
-  {
-    m_cCamParsCollector.setSlice( 0 );
-  }
-#endif
   for(UInt decIdx = 0; decIdx < m_numDecoders; decIdx++)
   {
@@ -498 +458 @@
   // initialize global variables
   initROM();  
-#if H_3D_DIM_DMM
-  initWedgeLists();
-#endif
 #else
   // create decoder class
@@ -538 +495 @@
   // destroy decoder class
   m_cTDecTop.destroy();
-#endif
-#if H_3D
-  m_cCamParsCollector.uninit();
-  if( m_pScaleOffsetFile ) 
-  { 
-    ::fclose( m_pScaleOffsetFile ); 
-  }
 #endif
 }
@@ -1051 +1001 @@
     m_tDecTop[ decIdx ]->setTargetOptLayerSetIdx( m_targetOptLayerSetIdx );    
 
-#if H_3D
-   m_tDecTop[ decIdx ]->setCamParsCollector( &m_cCamParsCollector );
-#endif
 
     // append pic list of new decoder to PicLists