Changeset 559 in SHVCSoftware for branches


Ignore:
Timestamp:
27 Jan 2014, 17:15:16 (11 years ago)
Author:
seregin
Message:

delete M0457_IL_SAMPLE_PRED_ONLY_FLAG macro and related code

Location:
branches/SHM-5.0-dev/source
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncCfg.cpp

    r550 r559  
    8080  {
    8181    m_acLayerCfg[layer].setAppEncCfg(this);
    82 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    83     m_ilSampleOnlyPred[layer] = 0;
    84 #endif
    8582  }
    8683  memset( m_scalabilityMask, 0, sizeof(m_scalabilityMask) );
    … …  
    629626#endif
    630627  ("EnableElRapB,-use-rap-b",  m_elRapSliceBEnabled, 0, "Set ILP over base-layer I picture to B picture (default is P picture)")
    631 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    632   ("IlSampleOnlyPred%d",       m_ilSampleOnlyPred, 0, MAX_LAYERS, "Set inter_layer_sample_pred_only_flag for all slices")
    633 #endif
    634628#else //SVC_EXTENSION
    635629  ("InputFile,i",           cfg_InputFile,     string(""), "Original YUV input file name")

  • branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncCfg.h

    r540 r559  
    7272#if AVC_SYNTAX
    7373  Char*     m_BLSyntaxFile;                                   ///< input syntax file
    74 #endif
    75 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    76   Int       m_ilSampleOnlyPred[ MAX_LAYERS ];
    7774#endif
    7875#if N0120_MAX_TID_REF_CFG

  • branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r556 r559  
    220220    m_acTEncTop[layer].setMFMEnabledFlag(layer == 0 ? false : true);
    221221#endif
    222 #endif
    223 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    224     m_acTEncTop[layer].setIlSampleOnlyPred( layer == 0 ? 0 : m_ilSampleOnlyPred[layer] );
    225222#endif
    226223#endif

  • branches/SHM-5.0-dev/source/Lib/TLibCommon/TComSlice.cpp

    r557 r559  
    128128  m_colRefLayerIdx       = 0;
    129129#endif
    130 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    131   m_numSamplePredRefLayers       = 0;
    132   m_interLayerSamplePredOnlyFlag = false;
    133 #endif
    134130#endif //SVC_EXTENSION
    135131
    … …  
    180176#else
    181177  m_numILRRefIdx              = 0;
    182 #endif
    183 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    184   m_numSamplePredRefLayers       = 0;
    185   m_interLayerSamplePredOnlyFlag = false;
    186178#endif
    187179#endif
    … …  
    410402      pcRefPic->getPicYuvRec()->extendPicBorder();
    411403      RefPicSetStCurr0[NumPocStCurr0] = pcRefPic;
    412 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    413       if( !m_interLayerSamplePredOnlyFlag || pcRefPic->getLayerId() < getLayerId())
    414 #endif
    415404      NumPocStCurr0++;
    416405      pcRefPic->setCheckLTMSBPresent(false); 
    … …  
    426415      pcRefPic->getPicYuvRec()->extendPicBorder();
    427416      RefPicSetStCurr1[NumPocStCurr1] = pcRefPic;
    428 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    429       if( !m_interLayerSamplePredOnlyFlag || pcRefPic->getLayerId() < getLayerId())
    430 #endif
    431417      NumPocStCurr1++;
    432418      pcRefPic->setCheckLTMSBPresent(false); 
    … …  
    442428      pcRefPic->getPicYuvRec()->extendPicBorder();
    443429      RefPicSetLtCurr[NumPocLtCurr] = pcRefPic;
    444 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    445       if( !m_interLayerSamplePredOnlyFlag || pcRefPic->getLayerId() < getLayerId())
    446 #endif
    447430      NumPocLtCurr++;
    448431    }
    … …  
    623606
    624607    if (m_eSliceType == I_SLICE)
    625   {
     608    {
    626609      ::memset( m_apcRefPicList, 0, sizeof (m_apcRefPicList));
    627610      ::memset( m_aiNumRefIdx,   0, sizeof ( m_aiNumRefIdx ));
    628      
     611
    629612      return;
    630613    }
    631    
     614
    632615    assert(numPocTotalCurr > 0);
    633    
     616
    634617    m_aiNumRefIdx[0] = getNumRefIdx(REF_PIC_LIST_0);
    635618    m_aiNumRefIdx[1] = getNumRefIdx(REF_PIC_LIST_1);
    636619  }
    637620
    638 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    639     if( m_interLayerSamplePredOnlyFlag && getLayerId() )
    640     {
    641       m_aiNumRefIdx[0] = m_aiNumRefIdx[0] > m_activeNumILRRefIdx ? m_activeNumILRRefIdx : m_aiNumRefIdx[0];
    642       m_aiNumRefIdx[1] = m_aiNumRefIdx[1] > m_activeNumILRRefIdx ? m_activeNumILRRefIdx : m_aiNumRefIdx[1];
    643     }
    644 #endif
    645  
    646621    Int cIdx = 0;
    647622    for ( i=0; i<NumPocStCurr0; i++, cIdx++)

  • branches/SHM-5.0-dev/source/Lib/TLibCommon/TComSlice.h

    r558 r559  
    19231923#endif
    19241924#endif
    1925 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    1926   Int         m_numSamplePredRefLayers;
    1927   Bool        m_interLayerSamplePredOnlyFlag;
    1928 #endif
    19291925#if POC_RESET_FLAG
    19301926  Bool        m_bPocResetFlag;
    … …  
    22022198#endif
    22032199
    2204 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    2205   Int       getNumSamplePredRefLayers      ( )          { return  m_numSamplePredRefLayers;       }
    2206   Void      setNumSamplePredRefLayers      ( Int i )    { m_numSamplePredRefLayers = i;           }
    2207   Bool      getInterLayerSamplePredOnlyFlag( )          { return  m_interLayerSamplePredOnlyFlag; }
    2208   Void      setInterLayerSamplePredOnlyFlag( Bool val ) { m_interLayerSamplePredOnlyFlag = val;   }
    2209 #endif
    2210 
    22112200#if M0457_COL_PICTURE_SIGNALING
    22122201  Void      setNumMotionPredRefLayers(int i)            { m_numMotionPredRefLayers = i; }

  • branches/SHM-5.0-dev/source/Lib/TLibCommon/TypeDef.h

    r558 r559  
    171171#define M0457_COL_PICTURE_SIGNALING      1
    172172#define N0139_POSITION_ROUNDING_OFFSET   1      ///< JCTVC-N0139: offset for collocated block in motion mapping
    173 #endif
    174 
    175 #if !VPS_EXTN_DIRECT_REF_LAYERS || !M0457_PREDICTION_INDICATIONS || !JCTVC_M0458_INTERLAYER_RPS_SIG
    176 #define M0457_IL_SAMPLE_PRED_ONLY_FLAG   0      ///< shall be 0, JCTVC-N0107
    177 #else
    178 #define M0457_IL_SAMPLE_PRED_ONLY_FLAG   0      ///< shall be 0, JCTVC-N0107
    179173#endif
    180174

  • branches/SHM-5.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r556 r559  
    21852185    }
    21862186#endif
    2187 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    2188     rpcSlice->setInterLayerSamplePredOnlyFlag( false );
    2189     if( rpcSlice->getNumSamplePredRefLayers() > 0 && rpcSlice->getActiveNumILRRefIdx() > 0 )
    2190     {
    2191       READ_FLAG( uiCode, "inter_layer_sample_pred_only_flag" );
    2192       rpcSlice->setInterLayerSamplePredOnlyFlag( uiCode > 0 );
    2193     }
    2194 #endif
    21952187#else
    21962188    if( rpcSlice->getLayerId() > 0 )

  • branches/SHM-5.0-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r554 r559  
    851851  m_apcSlicePilot->setNumMotionPredRefLayers(m_numMotionPredRefLayers);
    852852#endif
    853 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    854   m_apcSlicePilot->setNumSamplePredRefLayers( getNumSamplePredRefLayers() );
    855 #endif
    856853#endif
    857854  m_cEntropyDecoder.decodeSliceHeader (m_apcSlicePilot, &m_parameterSetManagerDecoder);

  • branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r556 r559  
    16711671      }
    16721672    }     
    1673 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    1674     if( pcSlice->getNumSamplePredRefLayers() > 0 && pcSlice->getActiveNumILRRefIdx() > 0 )
    1675     {
    1676       WRITE_FLAG( pcSlice->getInterLayerSamplePredOnlyFlag(), "inter_layer_sample_pred_only_flag" );
    1677     }
    1678 #endif
    16791673#endif
    16801674

  • branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncCu.cpp

    r540 r559  
    462462        testInter = false;
    463463      }
    464 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    465       if( pcSlice->getInterLayerSamplePredOnlyFlag() )
    466       {
    467         testInter = false;
    468       }
    469 #endif
    470464    }
    471465#endif

  • branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r558 r559  
    696696#endif
    697697#endif
    698     }
    699 #endif
    700 
    701 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    702     pcSlice->setNumSamplePredRefLayers( m_pcEncTop->getNumSamplePredRefLayers() );
    703     pcSlice->setInterLayerSamplePredOnlyFlag( 0 );
    704     if( pcSlice->getNumSamplePredRefLayers() > 0 && pcSlice->getActiveNumILRRefIdx() > 0 )
    705     {
    706       if( m_pcEncTop->getIlSampleOnlyPred() > 0 )
    707       {
    708         pcSlice->setInterLayerSamplePredOnlyFlag( true );
    709       }
    710698    }
    711699#endif
    … …  
    13061294    }
    13071295
    1308 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    1309     if (pcSlice->getSliceType() == B_SLICE && m_pcEncTop->getIlSampleOnlyPred() == 0)
    1310 #else
    13111296    if (pcSlice->getSliceType() == B_SLICE)
    1312 #endif
    13131297    {
    13141298#if !SVC_EXTENSION

  • branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncTop.h

    r540 r559  
    137137  Bool                    m_bMFMEnabledFlag;
    138138#endif
    139 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    140   Int                     m_ilSampleOnlyPred;
    141 #endif
    142139  UInt                    m_numScaledRefLayerOffsets;
    143140#if O0098_SCALED_REF_LAYER_ID
    … …  
    237234  Bool      getMFMEnabledFlag()                   {return m_bMFMEnabledFlag;}   
    238235#endif
    239 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    240   Void      setIlSampleOnlyPred( Int i )          { m_ilSampleOnlyPred = i;    }
    241   Int       getIlSampleOnlyPred()                 { return m_ilSampleOnlyPred; }
    242 #endif
    243236#if AVC_SYNTAX
    244237  Void      setBLSyntaxFile( fstream* pFile ) { m_pBLSyntaxFile = pFile; }
Note: See TracChangeset for help on using the changeset viewer.