Changeset 162 in SHVCSoftware for branches


Ignore:
Timestamp:
8 May 2013, 18:40:29 (12 years ago)
Author:
interdigital
Message:

remove createWithOutYuv(),
remove macros RAP_MFM_INIT and REF_LIST_BUGFIX (always enabled)
converge setRefPicListSvc() into setRefPicList().

Location:
branches/SHM-2.0-dev/source/Lib/TLibCommon
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-2.0-dev/source/Lib/TLibCommon/TComPic.cpp

    r150 r162  
    116116  return;
    117117}
    118 #if REF_IDX_FRAMEWORK && 0
    119 Void TComPic::createWithOutYuv( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, TComSPS* pcSps,  Bool bIsVirtual)
    120 {
    121   m_apcPicSym     = new TComPicSym;  m_apcPicSym   ->create( iWidth, iHeight, uiMaxWidth, uiMaxHeight, uiMaxDepth );
    122   if (!bIsVirtual)
    123   {
    124     m_apcPicYuv[0]  = new TComPicYuv;  m_apcPicYuv[0]->create( iWidth, iHeight, uiMaxWidth, uiMaxHeight, uiMaxDepth, pcSps );
    125   }
    126   m_apcPicYuv[1]  = NULL;
    127  
    128 #if SVC_UPSAMPLING
    129   if (m_bSpatialEnhLayer)
    130   {
    131     m_pcFullPelBaseRec = new TComPicYuv;  m_pcFullPelBaseRec->create( iWidth, iHeight, uiMaxWidth, uiMaxHeight, uiMaxDepth, pcSps );
    132   }
    133 #endif
    134 
    135   /* there are no SEI messages associated with this picture initially */
    136   m_SEIs.clear();
    137   m_bUsedByCurr = false;
    138   return;
    139 }
    140 #endif
    141118#else
    142119Void TComPic::create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, Window &conformanceWindow, Window &defaultDisplayWindow,
    … …  
    654631  }
    655632}
    656 #endif
    657 
    658 #if RAP_MFM_INIT
     633
    659634Void TComPic::initUpsampledMvField()
    660635{

  • branches/SHM-2.0-dev/source/Lib/TLibCommon/TComPic.h

    r150 r162  
    103103  Void          create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, Window &conformanceWindow, Window &defaultDisplayWindow,
    104104                        Int *numReorderPics, TComSPS* pcSps = NULL, Bool bIsVirtual = false );
    105 #if REF_IDX_FRAMEWORK && 0
    106   Void          createWithOutYuv( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, TComSPS* pcSps = NULL, Bool bIsVirtual = false ); 
    107   Void          setPicYuvRec(TComPicYuv *pPicYuv) { m_apcPicYuv[1]=pPicYuv; }
    108 #endif
    109105#else
    110106  Void          create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, Window &conformanceWindow, Window &defaultDisplayWindow,
    … …  
    129125#if REF_IDX_MFM
    130126  Void          copyUpsampledMvField  (  TComPic* pcPicBase );
    131 #if RAP_MFM_INIT
    132127  Void          initUpsampledMvField  ();
    133 #endif
    134128#endif
    135129

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

    r160 r162  
    123123#endif
    124124 
    125 #if REF_LIST_BUGFIX
     125#if REF_IDX_FRAMEWORK
    126126  m_aiNumILRRefIdx = 0;
    127127#endif
    … …  
    174174  m_aiNumRefIdx[0]      = 0;
    175175  m_aiNumRefIdx[1]      = 0;
    176 #if REF_LIST_BUGFIX
     176#if REF_IDX_FRAMEWORK
    177177  if(layerId)
    178178  {
    … …  
    425425
    426426#if FIX1071
    427 Void TComSlice::setRefPicList( TComList<TComPic*>& rcListPic, Bool checkNumPocTotalCurr )
     427Void TComSlice::setRefPicList( TComList<TComPic*>& rcListPic, Bool checkNumPocTotalCurr, TComPic** ilpPic)
    428428#else
    429429Void TComSlice::setRefPicList( TComList<TComPic*>& rcListPic )
    … …  
    434434#endif
    435435  {
    436 #if REF_IDX_FRAMEWORK
    437   if( m_eSliceType == I_SLICE || ( getSPS()->getLayerId() &&
    438       (getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) &&
    439       (getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA) ) )
    440 #else
    441   if (m_eSliceType == I_SLICE)
    442 #endif
    443   {
    444     ::memset( m_apcRefPicList, 0, sizeof (m_apcRefPicList));
    445     ::memset( m_aiNumRefIdx,   0, sizeof ( m_aiNumRefIdx ));
    446    
    447     return;
    448   }
     436    if( m_eSliceType == I_SLICE )
     437    {
     438      ::memset( m_apcRefPicList, 0, sizeof (m_apcRefPicList));
     439      ::memset( m_aiNumRefIdx,   0, sizeof ( m_aiNumRefIdx ));
     440      return;
     441    }
    449442 
    450   m_aiNumRefIdx[0] = getNumRefIdx(REF_PIC_LIST_0);
    451   m_aiNumRefIdx[1] = getNumRefIdx(REF_PIC_LIST_1);
     443    m_aiNumRefIdx[0] = getNumRefIdx(REF_PIC_LIST_0);
     444    m_aiNumRefIdx[1] = getNumRefIdx(REF_PIC_LIST_1);
    452445  }
    453446
    … …  
    461454  Int i;
    462455
     456#if REF_IDX_FRAMEWORK
     457  if ((getLayerId() == 0) ||
     458      ((getSPS()->getLayerId()) &&  !((getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) &&
     459       (getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA)) )
     460     )
     461  {
     462#endif
    463463  for(i=0; i < m_pcRPS->getNumberOfNegativePictures(); i++)
    464464  {
    … …  
    503503    pcRefPic->setCheckLTMSBPresent(m_pcRPS->getCheckLTMSBPresent(i)); 
    504504  }
    505 
     505#if REF_IDX_FRAMEWORK
     506  }
     507#endif
     508
     509#if REF_IDX_FRAMEWORK
     510  //inter-layer reference picture
     511#if REF_IDX_MFM
     512  if (getLayerId())
     513  {
     514    if(!(getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA) && getSPS()->getMFMEnabledFlag())
     515    {
     516      ilpPic[0]->copyUpsampledMvField(getBaseColPic());
     517    }
     518    else
     519    {
     520      ilpPic[0]->initUpsampledMvField();
     521    }
     522  #endif
     523    ilpPic[0]->setIsLongTerm(1);
     524  }
     525#endif
    506526  // ref_pic_list_init
    507527  TComPic*  rpsCurrList0[MAX_NUM_REF+1];
    508528  TComPic*  rpsCurrList1[MAX_NUM_REF+1];
     529#if REF_IDX_FRAMEWORK
     530  Int numPocTotalCurr = NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr + m_aiNumILRRefIdx;
     531#else
    509532  Int numPocTotalCurr = NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr;
     533#endif
    510534#if FIX1071
    511535  if (checkNumPocTotalCurr)
    … …  
    547571      rpsCurrList0[cIdx] = RefPicSetLtCurr[i];
    548572    }
    549 
     573#if REF_IDX_FRAMEWORK
     574    if(getLayerId())
     575    {
     576      for( i = 0; i < m_aiNumILRRefIdx && cIdx < numPocTotalCurr; cIdx ++, i ++)
     577      {
     578        rpsCurrList0[cIdx] = ilpPic[i];
     579      }
     580    }
     581#endif
    550582  if (m_eSliceType==B_SLICE)
    551583  {
    … …  
    563595      rpsCurrList1[cIdx] = RefPicSetLtCurr[i];
    564596    }
     597#if REF_IDX_FRAMEWORK
     598    if(getLayerId())
     599    {
     600      for( i = 0; i < m_aiNumILRRefIdx && cIdx < numPocTotalCurr; cIdx ++, i ++)
     601      {
     602        rpsCurrList1[cIdx] = ilpPic[i];
     603      }
     604    }
     605#endif
    565606  }
    566607
    … …  
    589630}
    590631
    591 #if REF_LIST_BUGFIX
     632#if REF_IDX_FRAMEWORK
    592633Void TComSlice::setRefPicListModificationSvc()
    593634{
    … …  
    659700    }
    660701  }
    661   return;
    662 }
    663 
    664 Void TComSlice::setRefPicListSvc( TComList<TComPic*>& rcListPic, TComPic** ilpPic )
    665 {
    666   assert(getLayerId() > 0);
    667 
    668   m_aiNumRefIdx[0] = getNumRefIdx(REF_PIC_LIST_0);
    669   m_aiNumRefIdx[1] = getNumRefIdx(REF_PIC_LIST_1);
    670 
    671   TComPic*  pcRefPic= NULL;
    672   TComPic*  RefPicSetStCurr0[16];
    673   TComPic*  RefPicSetStCurr1[16];
    674   TComPic*  RefPicSetLtCurr[16];
    675   UInt NumPocStCurr0 = 0;
    676   UInt NumPocStCurr1 = 0;
    677   UInt NumPocLtCurr = 0;
    678   Int i;
    679 
    680   //temporal reference pictures
    681   if( !(getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA) )
    682   {
    683     for(i=0; i < m_pcRPS->getNumberOfNegativePictures(); i++)
    684     {
    685       if(m_pcRPS->getUsed(i))
    686       {
    687         pcRefPic = xGetRefPic(rcListPic, getPOC()+m_pcRPS->getDeltaPOC(i));
    688         pcRefPic->setIsLongTerm(0);
    689         pcRefPic->getPicYuvRec()->extendPicBorder();
    690         RefPicSetStCurr0[NumPocStCurr0] = pcRefPic;
    691         NumPocStCurr0++;
    692         pcRefPic->setCheckLTMSBPresent(false); 
    693       }
    694     }
    695     for(; i < m_pcRPS->getNumberOfNegativePictures()+m_pcRPS->getNumberOfPositivePictures(); i++)
    696     {
    697       if(m_pcRPS->getUsed(i))
    698       {
    699         pcRefPic = xGetRefPic(rcListPic, getPOC()+m_pcRPS->getDeltaPOC(i));
    700         pcRefPic->setIsLongTerm(0);
    701         pcRefPic->getPicYuvRec()->extendPicBorder();
    702         RefPicSetStCurr1[NumPocStCurr1] = pcRefPic;
    703         NumPocStCurr1++;
    704         pcRefPic->setCheckLTMSBPresent(false); 
    705       }
    706     }
    707     for(i = m_pcRPS->getNumberOfNegativePictures()+m_pcRPS->getNumberOfPositivePictures()+m_pcRPS->getNumberOfLongtermPictures()-1; i > m_pcRPS->getNumberOfNegativePictures()+m_pcRPS->getNumberOfPositivePictures()-1 ; i--)
    708     {
    709       if(m_pcRPS->getUsed(i))
    710       {
    711         pcRefPic = xGetLongTermRefPic(rcListPic, m_pcRPS->getPOC(i), m_pcRPS->getCheckLTMSBPresent(i));
    712         pcRefPic->setIsLongTerm(1);
    713         pcRefPic->getPicYuvRec()->extendPicBorder();
    714         RefPicSetLtCurr[NumPocLtCurr] = pcRefPic;
    715         NumPocLtCurr++;
    716       }
    717       if(pcRefPic==NULL)
    718       {
    719         pcRefPic = xGetLongTermRefPic(rcListPic, m_pcRPS->getPOC(i), m_pcRPS->getCheckLTMSBPresent(i));
    720       }
    721       pcRefPic->setCheckLTMSBPresent(m_pcRPS->getCheckLTMSBPresent(i)); 
    722     }
    723   }
    724 
    725   //inter-layer reference picture
    726 #if REF_IDX_MFM
    727   assert(m_aiNumILRRefIdx == 1);
    728   if(!(getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA) && getSPS()->getMFMEnabledFlag())
    729   {
    730     ilpPic[0]->copyUpsampledMvField(getBaseColPic());
    731   }
    732   else
    733   {
    734     ilpPic[0]->initUpsampledMvField();
    735   }
    736 #endif
    737   ilpPic[0]->setIsLongTerm(1);
    738 
    739   // ref_pic_list_init
    740   UInt cIdx = 0;
    741   UInt num_ref_idx_l0_active_minus1 = m_aiNumRefIdx[0] - 1;
    742   UInt num_ref_idx_l1_active_minus1 = m_aiNumRefIdx[1] - 1;
    743   TComPic*  refPicListTemp0[MAX_NUM_REF+1];
    744   TComPic*  refPicListTemp1[MAX_NUM_REF+1];
    745   Int  numRpsCurrTempList0, numRpsCurrTempList1;
    746 
    747   numRpsCurrTempList0 = numRpsCurrTempList1 = NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr + m_aiNumILRRefIdx;
    748   if (numRpsCurrTempList0 <= num_ref_idx_l0_active_minus1)
    749   {
    750     numRpsCurrTempList0 = num_ref_idx_l0_active_minus1 + 1;
    751   }
    752   if (numRpsCurrTempList1 <= num_ref_idx_l1_active_minus1)
    753   {
    754     numRpsCurrTempList1 = num_ref_idx_l1_active_minus1 + 1;
    755   }
    756 
    757   assert(numRpsCurrTempList0 <= MAX_NUM_REF);
    758   assert(numRpsCurrTempList1 <= MAX_NUM_REF);
    759 
    760   cIdx = 0;
    761   while (cIdx < numRpsCurrTempList0)
    762   {
    763     for ( i=0; i<NumPocStCurr0 && cIdx<numRpsCurrTempList0; cIdx++,i++)
    764     {
    765       refPicListTemp0[cIdx] = RefPicSetStCurr0[ i ];
    766     }
    767     for ( i=0; i<NumPocStCurr1 && cIdx<numRpsCurrTempList0; cIdx++,i++)
    768     {
    769       refPicListTemp0[cIdx] = RefPicSetStCurr1[ i ];
    770     }
    771     for ( i=0; i<NumPocLtCurr && cIdx<numRpsCurrTempList0; cIdx++,i++)
    772     {
    773       refPicListTemp0[cIdx] = RefPicSetLtCurr[ i ];
    774     }
    775     for ( i=0; i<m_aiNumILRRefIdx && cIdx<numRpsCurrTempList0; cIdx++,i++)
    776     {
    777       refPicListTemp0[cIdx] = ilpPic[ i ];
    778     }
    779   }
    780   cIdx = 0;
    781   while (cIdx<numRpsCurrTempList1 && m_eSliceType==B_SLICE)
    782   {
    783     for ( i=0; i<NumPocStCurr1 && cIdx<numRpsCurrTempList1; cIdx++,i++)
    784     {
    785       refPicListTemp1[cIdx] = RefPicSetStCurr1[ i ];
    786     }
    787     for ( i=0; i<NumPocStCurr0 && cIdx<numRpsCurrTempList1; cIdx++,i++)
    788     {
    789       refPicListTemp1[cIdx] = RefPicSetStCurr0[ i ];
    790     }
    791     for ( i=0; i<NumPocLtCurr && cIdx<numRpsCurrTempList1; cIdx++,i++)
    792     {
    793       refPicListTemp1[cIdx] = RefPicSetLtCurr[ i ];
    794     }
    795     for ( i=0; i<m_aiNumILRRefIdx && cIdx<numRpsCurrTempList1; cIdx++,i++)
    796     {
    797       refPicListTemp1[cIdx] = ilpPic[ i ];
    798     }
    799   }
    800   ::memset(m_bIsUsedAsLongTerm, 0, sizeof(m_bIsUsedAsLongTerm));
    801   for (Int rIdx = 0; rIdx <= (m_aiNumRefIdx[0]-1); rIdx ++)
    802   {
    803     m_apcRefPicList[0][rIdx] = m_RefPicListModification.getRefPicListModificationFlagL0() ? refPicListTemp0[ m_RefPicListModification.getRefPicSetIdxL0(rIdx) ] : refPicListTemp0[rIdx % numRpsCurrTempList0];
    804     m_bIsUsedAsLongTerm[0][rIdx] = m_RefPicListModification.getRefPicListModificationFlagL0() ? (m_RefPicListModification.getRefPicSetIdxL0(rIdx) >= (NumPocStCurr0 + NumPocStCurr1))
    805       : ((rIdx % numRpsCurrTempList0) >= (NumPocStCurr0 + NumPocStCurr1));
    806   }
    807   if ( m_eSliceType == P_SLICE )
    808   {
    809     m_aiNumRefIdx[1] = 0;
    810     ::memset( m_apcRefPicList[1], 0, sizeof(m_apcRefPicList[1]));
    811   }
    812   else
    813   {
    814     for (Int rIdx = 0; rIdx <= (m_aiNumRefIdx[1]-1); rIdx ++)
    815     {
    816       m_apcRefPicList[1][rIdx] = m_RefPicListModification.getRefPicListModificationFlagL1() ? refPicListTemp1[ m_RefPicListModification.getRefPicSetIdxL1(rIdx) ] : refPicListTemp1[rIdx % numRpsCurrTempList1];
    817       m_bIsUsedAsLongTerm[1][rIdx] = m_RefPicListModification.getRefPicListModificationFlagL1() ?
    818         (m_RefPicListModification.getRefPicSetIdxL1(rIdx) >= (NumPocStCurr0 + NumPocStCurr1)): ((rIdx % numRpsCurrTempList1) >= (NumPocStCurr0 + NumPocStCurr1));
    819     }
    820   }
    821 
    822702  return;
    823703}
    … …  
    836716#endif
    837717  {
    838 #if REF_LIST_BUGFIX
     718#if REF_IDX_FRAMEWORK
    839719    return m_aiNumILRRefIdx;
    840720#else
    … …  
    849729    }
    850730  }
    851 #if REF_LIST_BUGFIX
     731#if REF_IDX_FRAMEWORK
    852732  if(getLayerId())
    853733  {
    … …  
    25752455#endif
    25762456
    2577 #if REF_IDX_FRAMEWORK
    2578 Void TComSlice::addRefPicList( TComPic **pIlpPicList, Int iRefPicNum, Int iInsertOffset )
    2579 {
    2580   if(getSPS()->getLayerId() && m_eSliceType != I_SLICE)
    2581   {
    2582 #if REF_IDX_MFM
    2583     assert(iRefPicNum == 1);
    2584 #if RAP_MFM_INIT
    2585     if(!(getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA) && getSPS()->getMFMEnabledFlag())
    2586 #else
    2587     if( getPOC() != 0 )
    2588 #endif
    2589     {
    2590       pIlpPicList[0]->copyUpsampledMvField(getBaseColPic());
    2591     }
    2592 #if RAP_MFM_INIT
    2593     else
    2594     {
    2595       pIlpPicList[0]->initUpsampledMvField();
    2596     }
    2597 #endif
    2598 #endif
    2599     //add to list 0;
    2600     Int iOffset;
    2601     m_aiNumRefIdx[REF_PIC_LIST_0] += iInsertOffset;
    2602     iOffset = m_aiNumRefIdx[REF_PIC_LIST_0];
    2603     for (Int i=0; i<iRefPicNum; i++)
    2604     {
    2605       pIlpPicList[i]->setIsLongTerm(1);  //mark ilp as long-term reference
    2606       m_bIsUsedAsLongTerm[REF_PIC_LIST_0][iOffset + i] = 1; //mark ilp as long-term reference
    2607       m_apcRefPicList[REF_PIC_LIST_0][iOffset + i] = pIlpPicList[i];
    2608       m_aiNumRefIdx[REF_PIC_LIST_0]++;
    2609       //m_aiNumRefIdx[REF_PIC_LIST_C]++;
    2610     }
    2611     if(m_eSliceType == B_SLICE)
    2612     {
    2613       m_aiNumRefIdx[REF_PIC_LIST_1] += iInsertOffset;
    2614       iOffset = m_aiNumRefIdx[REF_PIC_LIST_1];
    2615       for (Int i=0; i<iRefPicNum; i++)
    2616       {
    2617         pIlpPicList[i]->setIsLongTerm(1);  //mark ilp as long-term reference
    2618         m_bIsUsedAsLongTerm[REF_PIC_LIST_1][iOffset + i] = 1; //mark ilp as long-term reference
    2619         m_apcRefPicList[REF_PIC_LIST_1][iOffset + i] = pIlpPicList[i];
    2620         m_aiNumRefIdx[REF_PIC_LIST_1]++;
    2621         //m_aiNumRefIdx[REF_PIC_LIST_C]++;
    2622       }
    2623     }
    2624   }
    2625 }
    2626 
    26272457#if REF_IDX_MFM
    26282458Void TComSlice::setRefPOCListILP( TComPic** ilpPic, TComPic *pcRefPicBL )
    … …  
    26642494#endif
    26652495
    2666 
    2667 #endif
    26682496//! \}

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

    r160 r162  
    13881388  Int         m_deblockingFilterBetaOffsetDiv2;    //< beta offset for deblocking filter
    13891389  Int         m_deblockingFilterTcOffsetDiv2;      //< tc offset for deblocking filter
    1390 #if REF_LIST_BUGFIX
     1390#if REF_IDX_FRAMEWORK
    13911391  Int         m_aiNumILRRefIdx;       //< for inter-layer reference picture ser
    13921392#endif
    … …  
    15381538  Int       getDeblockingFilterBetaOffsetDiv2()         { return  m_deblockingFilterBetaOffsetDiv2; }
    15391539  Int       getDeblockingFilterTcOffsetDiv2()           { return  m_deblockingFilterTcOffsetDiv2; }
    1540 #if REF_LIST_BUGFIX
     1540#if REF_IDX_FRAMEWORK
    15411541  Int       getNumILRRefIdx     ( )                     { return  m_aiNumILRRefIdx; }
    15421542  Void      setNumILRRefIdx     ( Int i )                     { m_aiNumILRRefIdx = i; }
    … …  
    16171617
    16181618#if FIX1071
    1619   Void      setRefPicList       ( TComList<TComPic*>& rcListPic, Bool checkNumPocTotalCurr = false );
     1619  Void      setRefPicList       ( TComList<TComPic*>& rcListPic, Bool checkNumPocTotalCurr = false, TComPic** ilpPic = NULL );
    16201620#else
    16211621  Void      setRefPicList       ( TComList<TComPic*>& rcListPic );
    … …  
    16271627  Void      setMvdL1ZeroFlag     ( Bool b)                       { m_bLMvdL1Zero = b; }
    16281628
    1629 #if REF_LIST_BUGFIX
     1629#if REF_IDX_FRAMEWORK
    16301630  Void      setRefPicListModificationSvc();
    1631   Void      setRefPicListSvc    ( TComList<TComPic*>& rcListPic, TComPic** ilpPic );
    16321631#endif
    16331632
    … …  
    17461745  Void      setEnableTMVPFlag     ( Bool   b )    { m_enableTMVPFlag = b; }
    17471746  Bool      getEnableTMVPFlag     ()              { return m_enableTMVPFlag;}
    1748 #if REF_IDX_FRAMEWORK
    1749   Void      addRefPicList( TComPic **pIlpPicList, Int iRefPicNum, Int iInsertOffset=0 );
    1750 #endif
    17511747protected:
    17521748  TComPic*  xGetRefPic  (TComList<TComPic*>& rcListPic,

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

    r160 r162  
    8787#define ENCODER_FAST_MODE                1      ///< L0174: enable encoder fast mode. TestMethod 1 is enabled by setting to 1 and TestMethod 2 is enable by setting to 2. By default it is set to 1.
    8888#define REF_IDX_MFM                      1      ///< L0336: motion vector mapping of inter-layer reference picture
    89 
    90 #if REF_IDX_MFM
    91 #define RAP_MFM_INIT                     1      ///< initilizing MFM when base layer is RAP picture
    92 #endif
    93 #define REF_LIST_BUGFIX                  1
    94 
    9589#else
    9690#define INTRA_BL                         1      ///< inter-layer texture prediction
Note: See TracChangeset for help on using the changeset viewer.