Changeset 1390 in 3DVCSoftware for branches/HTM-16.0-MV-draft-5/source/App/TAppDecoder

Timestamp:

13 Nov 2015, 17:00:20 (9 years ago)

Author:

tech

Message:

Removed 3D.

Location:

branches/HTM-16.0-MV-draft-5/source/App/TAppDecoder

Files:

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

branches/HTM-16.0-MV-draft-5/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -66 +66 @@
   Bool do_help = false;
   string cfg_TargetDecLayerIdSetFile;
-#if NH_3D
-  string cfg_ScaleOffsetFile;
-#endif
   string outputColourSpaceConvert;
   Int warnUnknowParameter = 0;
@@ -80 +77 @@
   ("ReconFile,o",               m_reconFileName,                       string(""), "reconstructed YUV output file name\n"
                                                                                    "YUV writing is skipped if omitted")
-#if NH_3D
-  ("ScaleOffsetFile,p",         cfg_ScaleOffsetFile,                   string(""), "file with coded scales and offsets")
-  ("Depth420OutputFlag",        m_depth420OutputFlag,                  true      , "Output depth layers in 4:2:0 ") 
-#endif
   ("WarnUnknowParameter,w",     warnUnknowParameter,                                  0, "warn for unknown configuration parameters instead of failing")
   ("SkipFrames,s",              m_iSkipFrame,                          0,          "number of frames to skip before random access")
@@ -148 +141 @@
   }
 
-#if NH_3D
-  m_pchScaleOffsetFile = cfg_ScaleOffsetFile.empty() ? NULL : strdup(cfg_ScaleOffsetFile.c_str());
-#endif
 
   if (m_bitstreamFileName.empty())

branches/HTM-16.0-MV-draft-5/source/App/TAppDecoder/TAppDecCfg.h

@@ -96 +96 @@
   Bool          m_printPicOutput;                     ///< Print information on picture output
   Bool          m_printReceivedNalus;                 ///< Print information on received NAL units
-#if NH_3D
-  TChar*        m_pchScaleOffsetFile;                   ///< output coded scale and offset parameters
-  Bool          m_depth420OutputFlag;                   ///< output depth layers in 4:2:0
-#endif
 
   Void xAppendToFileNameEnd( const TChar* pchInputFileName, const TChar* pchStringToAppend, TChar*& rpchOutputFileName); ///< create filenames
@@ -132 +128 @@
       m_outputBitDepth[channelTypeIndex] = 0;
     }
-#if NH_3D
-    m_pchScaleOffsetFile = NULL;
-#endif
   }
 

branches/HTM-16.0-MV-draft-5/source/App/TAppDecoder/TAppDecTop.cpp

@@ -94 +94 @@
   m_cvsStartFound                   = false;
 #endif
-#if NH_3D
-    m_pScaleOffsetFile              = 0;
-#endif
 }
 
@@ -131 +128 @@
 #endif
   m_reconFileName.clear();
-#if NH_3D
-  if (m_pchScaleOffsetFile)
-  {
-    free (m_pchScaleOffsetFile);
-    m_pchScaleOffsetFile = NULL;
-  }
-#endif
 }
 
@@ -405 +395 @@
   // initialize global variables
   initROM();
-#if NH_3D_DMM
-  initWedgeLists();
-#endif
 #else
   // create decoder class
@@ -453 +440 @@
     m_pcSeiColourRemappingInfoPrevious = NULL;
   }
-#if NH_3D
-  m_cCamParsCollector.uninit();
-  if( m_pScaleOffsetFile )
-  {
-    ::fclose( m_pScaleOffsetFile );
-  }
-#endif
 }
 
@@ -465 +445 @@
 {
 
-#if NH_3D
-  m_cCamParsCollector.setCodeScaleOffsetFile( m_pScaleOffsetFile );
-#endif
 #if NH_MV
   m_dpb.setPrintPicOutput(m_printPicOutput);
@@ -1059 +1036 @@
     xFinalizeAU ( );
 
-#if NH_3D
-  if( m_cCamParsCollector.isInitialized() )
-  {
-    m_cCamParsCollector.setSlice( 0 );
-  }
-#endif
    xFlushOutput(); 
    m_dpb.emptyAllSubDpbs();
@@ -1092 +1063 @@
     m_newVpsActivatedbyCurAu  = true; //TBD
     m_newVpsActivatedbyCurPic = true;
-#if NH_3D_VSO
-    m_dpb.setVPS( m_vps ); 
-#endif
   }
 
@@ -1216 +1184 @@
 Void TAppDecTop::xFinalizeAU()
 {
-#if NH_3D
-  if ( !m_curAu.empty())
-  {
-    for (TComList<TComPic*>::iterator it = m_curAu.begin(); it != m_curAu.end(); it++)
-    {
-      TComPic* pic = (*it);
-      if ( !pic->getHasGeneratedRefPics() )
-      {
-        pic->compressMotion(1);
-      }
-    }
-  }
-#endif
 }
 
@@ -2688 +2643 @@
       m_tDecTop[ decIdx ]->setDecodedSEIMessageOutputStream(&os);
     }
-#if NH_3D
-   m_tDecTop[ decIdx ]->setCamParsCollector( &m_cCamParsCollector );
-#endif
 
     // append pic list of new decoder to PicLists
@@ -2912 +2864 @@
   }
 
-#if NH_3D
-  if( m_pchScaleOffsetFile )
-  {
-    m_pScaleOffsetFile = ::fopen( m_pchScaleOffsetFile, "wt" );
-    if (!m_pScaleOffsetFile)
-    {
-      fprintf(stderr, "\nUnable to open file `%s' for writing decoded Camera Parameters messages\n", m_pchScaleOffsetFile);
-      exit(EXIT_FAILURE);
-    }
-  }
-#endif
 }
 
@@ -3011 +2952 @@
       conf.getWindowTopOffset()    + defDisp.getWindowTopOffset(),
       conf.getWindowBottomOffset() + defDisp.getWindowBottomOffset(),
-#if NH_3D
-      m_depth420OutputFlag && curPic->getIsDepth() ? CHROMA_420 : NUM_CHROMA_FORMAT
-#else
       NUM_CHROMA_FORMAT
-#endif
       , m_bClipOutputVideoToRec709Range);
   }

branches/HTM-16.0-MV-draft-5/source/App/TAppDecoder/TAppDecTop.h

@@ -117 +117 @@
 
   Bool                            m_reconOpen           [ MAX_NUM_LAYERS ]; ///< reconstruction file opened
-#if NH_3D
-  FILE*                           m_pScaleOffsetFile;
-  CamParsCollector                m_cCamParsCollector;
-#endif
 #else
   TDecTop                         m_cTDecTop;                     ///< decoder class