Changeset 1072 in 3DVCSoftware for branches/HTM-12.1-MV-draft-1/source/App/TAppDecoder

Timestamp:

13 Oct 2014, 16:44:51 (11 years ago)

Author:

tech

Message:

Removed 3D-HEVC related integrations.

Location:

branches/HTM-12.1-MV-draft-1/source/App/TAppDecoder

Files:

• TAppDecCfg.cpp (modified) (3 diffs)
• TAppDecCfg.h (modified) (1 diff)
• TAppDecTop.cpp (modified) (9 diffs)
• TAppDecTop.h (modified) (1 diff)

branches/HTM-12.1-MV-draft-1/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -68 +68 @@
   string cfg_ReconFile;
   string cfg_TargetDecLayerIdSetFile;
-#if H_3D
-  string cfg_ScaleOffsetFile;
-#endif
 
   po::Options opts;
@@ -78 +75 @@
   ("ReconFile,o",     cfg_ReconFile,     string(""), "reconstructed YUV output file name\n"
                                                      "YUV writing is skipped if omitted")
-#if H_3D
-  ("ScaleOffsetFile,p", cfg_ScaleOffsetFile, string(""), "file with coded scales and offsets")
-#endif
   ("SkipFrames,s", m_iSkipFrame, 0, "number of frames to skip before random access")
   ("OutputBitDepth,d", m_outputBitDepthY, 0, "bit depth of YUV output luma component (default: use 0 for native depth)")
@@ -118 +112 @@
   m_pchReconFile = cfg_ReconFile.empty() ? NULL : strdup(cfg_ReconFile.c_str());
 
-#if H_3D
-  m_pchScaleOffsetFile = cfg_ScaleOffsetFile.empty() ? NULL : strdup(cfg_ScaleOffsetFile.c_str());
-#endif
   if (!m_pchBitstreamFile)
   {

branches/HTM-12.1-MV-draft-1/source/App/TAppDecoder/TAppDecCfg.h

@@ -63 +63 @@
 #endif
   Char*         m_pchReconFile;                       ///< output reconstruction file name
-#if H_3D
-  Char*         m_pchScaleOffsetFile;                 ///< output coded scale and offset parameters
-#endif
   Int           m_iSkipFrame;                         ///< counter for frames prior to the random access point to skip
   Int           m_outputBitDepthY;                    ///< bit depth used for writing output (luma)

branches/HTM-12.1-MV-draft-1/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);
 
@@ -269 +252 @@
 #endif
         }
-#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 )        
@@ -350 +327 @@
 #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 )
@@ -473 +439 @@
   }
 #if H_MV
-#if H_3D
-  if( m_cCamParsCollector.isInitialized() )
-  {
-    m_cCamParsCollector.setSlice( 0 );
-  }
-#endif
   for(UInt decIdx = 0; decIdx < m_numDecoders; decIdx++)
   {
@@ -502 +462 @@
   // initialize global variables
   initROM();  
-#if H_3D_DIM_DMM
-  initWedgeLists();
-#endif
 #else
   // create decoder class
@@ -542 +499 @@
   // destroy decoder class
   m_cTDecTop.destroy();
-#endif
-#if H_3D
-  m_cCamParsCollector.uninit();
-  if( m_pScaleOffsetFile ) 
-  { 
-    ::fclose( m_pScaleOffsetFile ); 
-  }
 #endif
 }
@@ -1060 +1010 @@
     m_tDecTop[ decIdx ]->setTargetOptLayerSetIdx( m_targetOptLayerSetIdx );    
 
-#if H_3D
-   m_tDecTop[ decIdx ]->setCamParsCollector( &m_cCamParsCollector );
-#endif
 
     // append pic list of new decoder to PicLists 

branches/HTM-12.1-MV-draft-1/source/App/TAppDecoder/TAppDecTop.h

@@ -82 +82 @@
 #endif
 
-#if H_3D
-  FILE*                           m_pScaleOffsetFile;
-  CamParsCollector                m_cCamParsCollector;
-#endif
 public:
   TAppDecTop();