Changeset 187 in SHVCSoftware for branches/SHM-2.0-dev/source

Timestamp:

12 May 2013, 18:11:47 (12 years ago)

Author:

seregin

Message:

enable zero number of direct references, fix for AVC base YUV input

Location:

branches/SHM-2.0-dev/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• App/TAppEncoder/TAppEncCfg.cpp (modified) (6 diffs)
• App/TAppEncoder/TAppEncLayerCfg.cpp (modified) (1 diff)
• App/TAppEncoder/TAppEncLayerCfg.h (modified) (1 diff)
• Lib/TLibCommon/TComSlice.cpp (modified) (2 diffs)
• Lib/TLibCommon/TComUpsampleFilter.cpp (modified) (2 diffs)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCu.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncGOP.cpp (modified) (5 diffs)
• Lib/TLibEncoder/TEncTop.cpp (modified) (1 diff)

branches/SHM-2.0-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -560 +560 @@
       if ( m_pchReconFile )
       {
+#if SYNTAX_OUTPUT && ILP_DECODED_PICTURE
+        m_cTVideoIOYuvReconFile.write( pcPic->getPicYuvRec() );
+#else
         const Window &conf = pcPic->getConformanceWindow();
         const Window &defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();
-#if SYNTAX_OUTPUT && ILP_DECODED_PICTURE
-      m_cTVideoIOYuvReconFile.write( pcPic->getPicYuvRec() );
-#else
         m_cTVideoIOYuvReconFile.write( pcPic->getPicYuvRec(),
                                        conf.getWindowLeftOffset() + defDisp.getWindowLeftOffset(),

branches/SHM-2.0-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -66 +66 @@
 TAppEncCfg::TAppEncCfg()
 : m_pBitstreamFile()
+#if AVC_BASE
+, m_avcBaseLayerFlag(0)
+#endif
 , m_pColumnWidth()
 , m_pRowHeight()
@@ -423 +426 @@
 #endif
 #if AVC_BASE
-  ("AvcBase",                 m_avcBaseLayerFlag,     0, "AVC_BASElayer_flag")
+  ("AvcBase,-avc",            m_avcBaseLayerFlag,     0, "avc_base_layer_flag")
   ("InputBLFile,-ibl",        cfg_BLInputFile,     string(""), "Base layer rec YUV input file name")
 #if AVC_SYNTAX
@@ -430 +433 @@
 #endif
 #if REF_IDX_FRAMEWORK
-  ("EnableElRapB,-use-rap-b",  m_elRapSliceBEnabled, 0, "Set ILP over base-layer I picture to B picture (default is P picture_")
+  ("EnableElRapB,-use-rap-b",  m_elRapSliceBEnabled, 0, "Set ILP over base-layer I picture to B picture (default is P picture)")
 #endif  
 #else  
@@ -741 +744 @@
   ;
   
-#if AVC_BASE
-  if( m_avcBaseLayerFlag )
-  {
-    *cfg_InputFile[0] = cfg_BLInputFile;
-  }
-#endif
-
   for(Int i=1; i<MAX_GOP+1; i++) {
     std::ostringstream cOSS;
@@ -773 +769 @@
   /* convert std::string to c string for compatability */
 #if SVC_EXTENSION
+#if AVC_BASE
+  if( m_avcBaseLayerFlag )
+  {
+    *cfg_InputFile[0] = cfg_BLInputFile;
+  }
+#endif
   m_pBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str());
 #if AVC_SYNTAX
@@ -1827 +1829 @@
   {
     printf("=== Layer %d settings === \n", layer);
+#if AVC_SYNTAX
+    m_acLayerCfg[layer].xPrintParameter( layer );
+#else
     m_acLayerCfg[layer].xPrintParameter();
+#endif
     printf("\n");
   }

branches/SHM-2.0-dev/source/App/TAppEncoder/TAppEncLayerCfg.cpp

@@ -116 +116 @@
 }
 
+#if AVC_SYNTAX
+Void TAppEncLayerCfg::xPrintParameter( UInt layerId )
+#else
 Void TAppEncLayerCfg::xPrintParameter()
+#endif
 {
   printf("Input File                    : %s\n", m_cInputFile.c_str()  );
   printf("Reconstruction File           : %s\n", m_cReconFile.c_str()  );
 #if AVC_SYNTAX
-  printf("Base layer input file         : %s\n", m_cAppEncCfg->getBLSyntaxFile() );
+  if( layerId == 0 )
+  {
+    printf("Base layer syntax file        : %s\n", m_cAppEncCfg->getBLSyntaxFile() );
+  }
 #endif
   printf("Real     Format               : %dx%d %dHz\n", m_iSourceWidth - m_confLeft - m_confRight, m_iSourceHeight - m_confTop - m_confBottom, m_iFrameRate );

branches/SHM-2.0-dev/source/App/TAppEncoder/TAppEncLayerCfg.h

@@ -69 +69 @@
   bool  parseCfg  ( const string& cfgFileName );              ///< parse layer configuration file to fill member variables
 
+#if AVC_SYNTAX
+  Void  xPrintParameter( UInt layerId );
+#else
   Void  xPrintParameter();
+#endif
   Bool  xCheckParameter();
 

branches/SHM-2.0-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -461 +461 @@
 
 #if REF_IDX_FRAMEWORK
+#if ZERO_NUM_DIRECT_LAYERS
+  if( m_layerId == 0 || ( m_layerId > 0 && ( m_activeNumILRRefIdx == 0 || !((getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) && (getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA)) ) ) )
+#else
   if ((getLayerId() == 0) || 
       ((getSPS()->getLayerId()) &&  !((getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) &&
        (getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA)) )
      )
+#endif
   {
 #endif
@@ -516 +520 @@
   //inter-layer reference picture
 #if REF_IDX_MFM
+#if ZERO_NUM_DIRECT_LAYERS
+  if( m_layerId > 0 && m_activeNumILRRefIdx > 0 )
+#else
   if (getLayerId())
+#endif
   {
     if(!(getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA) && getSPS()->getMFMEnabledFlag())

branches/SHM-2.0-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp

@@ -437 +437 @@
 #if SCALED_REF_LAYER_OFFSETS
       // Only increase the x position of reference upsample picture when within the window
-      // "-2" to ensure that pointer doesn't go beyond the boundeary rightEndL-1
+      // "-2" to ensure that pointer doesn't go beyond the boundary rightEndL-1
       if( (i >= leftStartL) && (i <= rightEndL-2) )
       {
@@ -605 +605 @@
 #if SCALED_REF_LAYER_OFFSETS
       // Only increase the x position of reference upsample picture when within the window
-      // "-2" to ensure that pointer doesn't go beyond the boundeary rightEndC-1
+      // "-2" to ensure that pointer doesn't go beyond the boundary rightEndC-1
       if( (i >= leftStartC) && (i <= rightEndC-2) )
       {

branches/SHM-2.0-dev/source/Lib/TLibCommon/TypeDef.h

@@ -90 +90 @@
 #define REF_IDX_MFM                      1      ///< L0336: motion vector mapping of inter-layer reference picture
 #define JCTVC_M0458_INTERLAYER_RPS_SIG   1      ///< implementation of JCTVC-L0178 (currently only one reference layer is supported )
+#if JCTVC_M0458_INTERLAYER_RPS_SIG
+#define ZERO_NUM_DIRECT_LAYERS           1      ///< support of zero direct reference layers
+#endif
 #else
 #define INTRA_BL                         1      ///< inter-layer texture prediction

branches/SHM-2.0-dev/source/Lib/TLibDecoder/TDecCu.cpp

@@ -370 +370 @@
   m_pcEntropyDecoder->decodePredInfo( pcCU, uiAbsPartIdx, uiDepth, m_ppcCU[uiDepth]);
 #endif
-  
+
   // Coefficient decoding
   Bool bCodeDQP = getdQPFlag();

branches/SHM-2.0-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -1268 +1268 @@
   if( vps->getNumDirectRefLayers( m_layerId ) <= 0 )
   {
+#if ZERO_NUM_DIRECT_LAYERS
+    return (TDecTop *)getLayerDec( 0 );
+#else
     return NULL;
+#endif
   }
 
@@ -1276 +1280 @@
   assert( vps->getMaxOneActiveRefLayerFlag() == 1 );
 #endif 
-
-
+  
   return (TDecTop *)getLayerDec( vps->getRefLayerId( m_layerId, 0 ) );
 }

branches/SHM-2.0-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -556 +556 @@
       pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
     }
+#if ZERO_NUM_DIRECT_LAYERS
+    if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() == 0 && pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA )
+    {
+      pcSlice->setSliceType(I_SLICE);
+    }
+    else
+#endif
     if( m_layerId > 0 && !m_pcEncTop->getElRapSliceTypeB() )
     {
@@ -657 +664 @@
 
 #if REF_IDX_FRAMEWORK
+#if ZERO_NUM_DIRECT_LAYERS
+    if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() )
+#else
     if(m_layerId > 0)
+#endif
     {
 #if JCTVC_M0458_INTERLAYER_RPS_SIG
@@ -690 +701 @@
 
 #if SVC_EXTENSION      
+#if ZERO_NUM_DIRECT_LAYERS
+    if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() )
+#else
     if(m_layerId > 0)
+#endif
     {
 #if !IDR_ALIGNMENT
@@ -723 +738 @@
     //  Set reference list
 #if REF_IDX_FRAMEWORK
+#if ZERO_NUM_DIRECT_LAYERS
+    if(m_layerId ==  0 || ( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() == 0 ) )
+#else
     if(m_layerId ==  0)
+#endif
     {
       pcSlice->setRefPicList( rcListPic);
@@ -731 +750 @@
 #endif
 #if REF_IDX_FRAMEWORK
+#if ZERO_NUM_DIRECT_LAYERS
+    if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() )
+#else
     if(m_layerId > 0)
+#endif
     {
       m_pcEncTop->setILRPic(pcPic);

branches/SHM-2.0-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -1193 +1193 @@
   if( m_ppcTEncTop[m_layerId]->getNumDirectRefLayers() <= 0 )
   {
+#if ZERO_NUM_DIRECT_LAYERS
+    return (TEncTop *)getLayerEnc( 0 );
+#else
     return NULL;
+#endif
   }