Ignore:
Timestamp:
31 Dec 2012, 18:33:14 (12 years ago)
Author:
mitsubishi-htm
Message:

A final release, as planned

  • Migrate to HTM 5.1
  • For VC project files, only VC9 file is updated
  • To be used as an additional anchor for CE1.h for 3rd JCTVC meeting at Geneva
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibEncoder/TEncGOP.cpp

    r193 r213  
    246246
    247247      std::vector<TComAPS>& vAPS = m_pcEncTop->getAPS();
    248 #if VIDYO_VPS_INTEGRATION
     248#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    249249    m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, uiPOCCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getEncTop()->getVPS(), m_pcEncTop->getSPS(), m_pcEncTop->getPPS() );
    250250#else
    … …  
    298298      if( pcSlice->getSliceType() == B_SLICE )
    299299      {
    300         if( m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_sliceType == 'P' ) { pcSlice->setSliceType( P_SLICE ); }
    301       }
     300#if QC_REM_IDV_B0046
     301      if( m_pcCfg->getGOPEntry(pcSlice->getSPS()->getViewId() && ((getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDR) || (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_CRA))? MAX_GOP : iGOPid ).m_sliceType == 'P' ) { pcSlice->setSliceType( P_SLICE ); }
     302#else
     303      if( m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_sliceType == 'P' ) { pcSlice->setSliceType( P_SLICE ); }
     304#endif
     305    }
    302306
    303307      // Set the nal unit type
    … …  
    333337
    334338#if VSP_SLICE_HEADER && VSP_CFG
     339#if QC_REM_IDV_B0046
     340      pcSlice->setNumVspRefPics( m_pcCfg->getGOPEntry( pcSlice->getSPS()->getViewId() && ((getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDR) || (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_CRA))? MAX_GOP : iGOPid ).m_numVSPRefPics );
     341#else
    335342      pcSlice->setNumVspRefPics( m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_numVSPRefPics );
     343#endif
    336344      pcSlice->setVspFlag( m_pcEncTop->getUseVSP() && pcSlice->getNumVspRefPics() > 0 );
    337345      for( UInt i = 0; i < pcSlice->getNumVspRefPics(); i++ )
    338346      {
     347#if QC_REM_IDV_B0046
     348        pcSlice->setVspRefPos( REF_PIC_LIST_0, i, m_pcCfg->getGOPEntry( pcSlice->getSPS()->getViewId() && ((getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDR) || (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_CRA))? MAX_GOP : iGOPid ).m_VSPRefPosL0[i] );
     349#else
    339350        pcSlice->setVspRefPos( REF_PIC_LIST_0, i, m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_VSPRefPosL0[i] );
     351#endif
    340352        if( pcSlice->getSliceType() == B_SLICE )
    341353        {
     354#if QC_REM_IDV_B0046
     355          pcSlice->setVspRefPos( REF_PIC_LIST_1, i, m_pcCfg->getGOPEntry( pcSlice->getSPS()->getViewId() && ((getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDR) || (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_CRA))? MAX_GOP : iGOPid ).m_VSPRefPosL1[i] );
     356#else
    342357          pcSlice->setVspRefPos( REF_PIC_LIST_1, i, m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_VSPRefPosL1[i] );
     358#endif
    343359        }
    344360      }
    … …  
    361377                                || pcSlice->getVspRefPos( REF_PIC_LIST_1, 0 ) == 0
    362378                              ) ? 0 : 1 );
     379#if !QC_REM_IDV_B0046
    363380      pcSlice->setNumRefIdx( REF_PIC_LIST_0, min( m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_numRefPicsActive + NumberOfVspRefsL0, (pcSlice->getRPS()->getNumberOfPictures() + pcSlice->getSPS()->getNumberOfUsableInterViewRefs() + NumberOfVspRefsL0) ) );
    364381      pcSlice->setNumRefIdx( REF_PIC_LIST_1, min( m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_numRefPicsActive + NumberOfVspRefsL1, (pcSlice->getRPS()->getNumberOfPictures() + pcSlice->getSPS()->getNumberOfUsableInterViewRefs() + NumberOfVspRefsL1) ) );
     382#else
     383      Bool bNalRAP = ((getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_CRA) || (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDR)) && (pcSlice->getSPS()->getViewId())  ? 1: 0;
     384      pcSlice->setNumRefIdx( REF_PIC_LIST_0, min( m_pcCfg->getGOPEntry( bNalRAP ? MAX_GOP : iGOPid ).m_numRefPicsActive + NumberOfVspRefsL0, (pcSlice->getRPS()->getNumberOfPictures() + pcSlice->getSPS()->getNumberOfUsableInterViewRefs() + NumberOfVspRefsL0) ) );
     385      pcSlice->setNumRefIdx( REF_PIC_LIST_1, min( m_pcCfg->getGOPEntry( bNalRAP ? MAX_GOP : iGOPid ).m_numRefPicsActive + NumberOfVspRefsL1, (pcSlice->getRPS()->getNumberOfPictures() + pcSlice->getSPS()->getNumberOfUsableInterViewRefs() + NumberOfVspRefsL1) ) );
     386#endif
    365387#else
    366388      Int NumberOfVspRefs = ( ( pcPic->getViewId()==0
    367389                                || (m_pcEncTop->getVSPDepthDisable() && m_pcEncTop->getIsDepth())
    368390#if VSP_SLICE_HEADER
    369                                 || !pcSlice->getVspFlag()
     391                                || !m_pcEncTop->getUseVSP()
    370392#endif
    371393                              ) ? 0 : 1 );
     394#if !QC_REM_IDV_B0046
    372395      pcSlice->setNumRefIdx( REF_PIC_LIST_0, min( m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_numRefPicsActive + NumberOfVspRefs, (pcSlice->getRPS()->getNumberOfPictures() + pcSlice->getSPS()->getNumberOfUsableInterViewRefs() + NumberOfVspRefs) ) );
    373396      pcSlice->setNumRefIdx( REF_PIC_LIST_1, min( m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_numRefPicsActive + NumberOfVspRefs, (pcSlice->getRPS()->getNumberOfPictures() + pcSlice->getSPS()->getNumberOfUsableInterViewRefs() + NumberOfVspRefs) ) );
    374 #endif
    375 #else
     397#else
     398      Bool bNalRAP = ((getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_CRA) || (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDR)) && (pcSlice->getSPS()->getViewId())  ? 1: 0;
     399      pcSlice->setNumRefIdx( REF_PIC_LIST_0, min( m_pcCfg->getGOPEntry( bNalRAP ? MAX_GOP : iGOPid ).m_numRefPicsActive + NumberOfVspRefsL0, (pcSlice->getRPS()->getNumberOfPictures() + pcSlice->getSPS()->getNumberOfUsableInterViewRefs() + NumberOfVspRefsL0) ) );
     400      pcSlice->setNumRefIdx( REF_PIC_LIST_1, min( m_pcCfg->getGOPEntry( bNalRAP ? MAX_GOP : iGOPid ).m_numRefPicsActive + NumberOfVspRefsL1, (pcSlice->getRPS()->getNumberOfPictures() + pcSlice->getSPS()->getNumberOfUsableInterViewRefs() + NumberOfVspRefsL1) ) );
     401#endif
     402#endif
     403#else
     404#if !QC_REM_IDV_B0046
    376405      pcSlice->setNumRefIdx( REF_PIC_LIST_0, min( m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_numRefPicsActive, (pcSlice->getRPS()->getNumberOfPictures() + pcSlice->getSPS()->getNumberOfUsableInterViewRefs()) ) );
    377406      pcSlice->setNumRefIdx( REF_PIC_LIST_1, min( m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_numRefPicsActive, (pcSlice->getRPS()->getNumberOfPictures() + pcSlice->getSPS()->getNumberOfUsableInterViewRefs()) ) );
    378 #endif
    379 
     407#else
     408
     409    Bool bNalRAP = ((getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_CRA) || (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDR)) && (pcSlice->getSPS()->getViewId())  ? 1: 0;
     410    pcSlice->setNumRefIdx( REF_PIC_LIST_0, min( m_pcCfg->getGOPEntry( bNalRAP ? MAX_GOP : iGOPid ).m_numRefPicsActive, (pcSlice->getRPS()->getNumberOfPictures() + pcSlice->getSPS()->getNumberOfUsableInterViewRefs()) ) );
     411    pcSlice->setNumRefIdx( REF_PIC_LIST_1, min( m_pcCfg->getGOPEntry( bNalRAP ? MAX_GOP : iGOPid ).m_numRefPicsActive, (pcSlice->getRPS()->getNumberOfPictures() + pcSlice->getSPS()->getNumberOfUsableInterViewRefs()) ) );
     412#endif
     413#endif
    380414      TComRefPicListModification* refPicListModification = pcSlice->getRefPicListModification();
    381415      refPicListModification->setRefPicListModificationFlagL0( false );
    … …  
    396430      assert( tAppEncTop != NULL );
    397431
     432
     433#if FLEX_CODING_ORDER_M23723
     434      TComPic * pcTexturePic;
     435      if(m_pcEncTop->getIsDepth() == 1)
     436      {
     437        TComPicYuv * recText;
     438        recText = tAppEncTop->getPicYuvFromView(m_pcEncTop->getViewId(), pcSlice->getPOC(), false ,true);
     439        if(recText == NULL)
     440        {
     441           pcSlice->setTexturePic(NULL);
     442        }
     443        else
     444        {
     445           pcTexturePic = m_pcEncTop->getIsDepth() ? tAppEncTop->getPicFromView( m_pcEncTop->getViewId(), pcSlice->getPOC(), false ) : NULL;
     446           pcSlice->setTexturePic( pcTexturePic );
     447        }
     448      }
     449      else
     450    {
     451        pcTexturePic = m_pcEncTop->getIsDepth() ? tAppEncTop->getPicFromView( m_pcEncTop->getViewId(), pcSlice->getPOC(), false ) : NULL;
     452        assert( !m_pcEncTop->getIsDepth() || pcTexturePic != NULL );
     453          pcSlice->setTexturePic( pcTexturePic );
     454      }
     455
     456#else
    398457      TComPic * const pcTexturePic = m_pcEncTop->getIsDepth() ? tAppEncTop->getPicFromView( m_pcEncTop->getViewId(), pcSlice->getPOC(), false ) : NULL;
    399458      assert( !m_pcEncTop->getIsDepth() || pcTexturePic != NULL );
    400459      pcSlice->setTexturePic( pcTexturePic );
    401460
     461#endif
    402462      std::vector<TComPic*> apcInterViewRefPics = tAppEncTop->getInterViewRefPics( m_pcEncTop->getViewId(), pcSlice->getPOC(), m_pcEncTop->getIsDepth(), pcSlice->getSPS() );
    403463#if VSP_N
    … …  
    418478        m_pcEncTop->getVSPBuf()->getCurrSlice()->setPOC( pcPic->getPOC() );
    419479        m_pcEncTop->getVSPBuf()->getCurrSlice()->setViewId( pcPic->getViewId() );
     480        m_pcEncTop->getVSPBuf()->getCurrSlice()->setViewOrderIdx( m_pcEncTop->getViewOrderIdx() );
    420481      }
    421482
    … …  
    435496      if( pcSlice->getSliceType() == B_SLICE )
    436497      {
     498#if !QC_REM_IDV_B0046
    437499        if( m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_sliceType == 'P' ) { pcSlice->setSliceType( P_SLICE ); }
     500#else
     501      Bool bRAP = ((getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_CRA) || (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDR)) && (pcSlice->getSPS()->getViewId())  ? 1: 0;
     502      if( m_pcCfg->getGOPEntry( bRAP ? MAX_GOP : iGOPid ).m_sliceType == 'P' ) { pcSlice->setSliceType( P_SLICE ); }
     503#endif
    438504      }
    439505     
    … …  
    521587#endif
    522588
    523 #if HHI_VSO_SPEEDUP_A0033
    524 #else
    525     if ( iVSOMode == 4 )
    526     {
    527       m_pcEncTop->getEncTop()->setupRenModel( pcSlice->getPOC(), pcSlice->getViewId(), m_pcEncTop->isDepthCoder() ? 1 : 0 );
    528     }
    529     else
    530     {
    531       AOT(true);
    532     }
    533 #endif
    534589
    535590#if SAIT_VSO_EST_A0033
    536     m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, true ) );
    537     m_pcRdCost->setDepthPicYuv   ( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), true, false ) );
     591#ifdef FLEX_CODING_ORDER_M23723   
     592{
     593  Bool flagRec;
     594  flagRec =  ((m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, true) == NULL) ? false: true);
     595  m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, flagRec ) );
     596  m_pcRdCost->setDepthPicYuv   ( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), true, false ) );
     597}
     598#else
     599  m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, true ) );
     600  m_pcRdCost->setDepthPicYuv   ( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), true, false ) );
     601#endif
    538602#endif
    539603#if LGE_WVSO_A0119
    … …  
    780844      // init view component and predict virtual depth map
    781845      m_pcDepthMapGenerator->initViewComponent( pcPic );
    782 #if !QC_MULTI_DIS_CAN
     846#if !QC_MULTI_DIS_CAN_A0097
    783847      m_pcDepthMapGenerator->predictDepthMap  ( pcPic );
    784848#endif
    … …  
    791855#endif
    792856
     857#if QC_SIMPLE_NBDV_B0047
     858      if(pcSlice->getViewId() && pcSlice->getSPS()->getMultiviewMvPredMode())
     859      {
     860        Int iColPoc = pcSlice->getRefPOC(RefPicList(pcSlice->getColDir()), pcSlice->getColRefIdx());
     861        pcPic->setRapbCheck(pcPic->getDisCandRefPictures(iColPoc));
     862      }
     863#endif
    793864      while(uiNextCUAddr<uiRealEndAddress) // determine slice boundaries
    794865      {
    … …  
    849920#endif
    850921#if DEPTH_MAP_GENERATION
    851 #if !QC_MULTI_DIS_CAN
     922#if !QC_MULTI_DIS_CAN_A0097
    852923      // update virtual depth map
    853924      m_pcDepthMapGenerator->updateDepthMap( pcPic );
    … …  
    906977      if ( m_bSeqFirst )
    907978      {
    908 #if VIDYO_VPS_INTEGRATION
     979#if QC_MVHEVC_B0046
     980      if(!m_pcEncTop->getLayerId())
     981      {
     982#endif
     983#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    909984        {
    910985          OutputNALUnit nalu(NAL_UNIT_VPS, true, m_pcEncTop->getLayerId());
    … …  
    916991#endif
    917992#if NAL_REF_FLAG
    918 #if VIDYO_VPS_INTEGRATION
     993#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    919994        OutputNALUnit nalu(NAL_UNIT_SPS, true, m_pcEncTop->getLayerId());
    920995#else
    … …  
    9371012
    9381013#if NAL_REF_FLAG
    939 #if VIDYO_VPS_INTEGRATION
     1014#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
     1015#if QC_MVHEVC_B0046
    9401016        nalu = NALUnit(NAL_UNIT_PPS, true, m_pcEncTop->getLayerId());
     1017#else
     1018        nalu = NALUnit(NAL_UNIT_PPS, true, m_pcEncTop->getLayerId());
     1019#endif
    9411020#else
    9421021        nalu = NALUnit(NAL_UNIT_PPS, true, m_pcEncTop->getViewId(), m_pcEncTop->getIsDepth());
    … …  
    9491028        writeRBSPTrailingBits(nalu.m_Bitstream);
    9501029        accessUnit.push_back(new NALUnitEBSP(nalu));
    951 
    952         m_bSeqFirst = false;
    953       }
     1030#if QC_MVHEVC_B0046
     1031      }
     1032#endif
     1033      m_bSeqFirst = false;
     1034    }
    9541035
    9551036      /* use the main bitstream buffer for storing the marshalled picture */
    … …  
    10691150#if NAL_REF_FLAG
    10701151        OutputNALUnit nalu( pcSlice->getNalUnitType(), pcSlice->isReferenced(),
    1071 #if !VIDYO_VPS_INTEGRATION
     1152#if !VIDYO_VPS_INTEGRATION &!QC_MVHEVC_B0046
    10721153                           m_pcEncTop->getViewId(), m_pcEncTop->getIsDepth(), pcSlice->getTLayer() );
    10731154#else
    … …  
    12061287          m_pcSbacCoder->load( &pcSbacCoders[0] );
    12071288
     1289
    12081290        pcSlice->setTileOffstForMultES( uiOneBitstreamPerSliceLength );
    12091291        if (!bEntropySlice)
    12101292        {
    1211 #if OL_DEPTHLIMIT_A0044 //start dumping partition information
    1212           m_pcSliceEncoder->setPartDumpFlag(1);
    1213 #endif
    12141293          pcSlice->setTileLocationCount ( 0 );
    12151294          m_pcSliceEncoder->encodeSlice(pcPic, pcBitstreamRedirect, pcSubstreamsOut); // redirect is only used for CAVLC tile position info.
    1216 #if OL_DEPTHLIMIT_A0044 //stop dumping partition information
    1217           m_pcSliceEncoder->setPartDumpFlag(0);
    1218 #endif
    12191295        }
    12201296        else
    12211297        {
    1222 #if OL_DEPTHLIMIT_A0044 //start dumping partition information
    1223           m_pcSliceEncoder->setPartDumpFlag(1);
    1224 #endif
    12251298          m_pcSliceEncoder->encodeSlice(pcPic, &nalu.m_Bitstream, pcSubstreamsOut); // nalu.m_Bitstream is only used for CAVLC tile position info.
    1226 #if OL_DEPTHLIMIT_A0044 //stop dumping partition information
    1227           m_pcSliceEncoder->setPartDumpFlag(0);
    1228 #endif
    1229         }
     1299        }
     1300
    12301301
    12311302        {
    … …  
    15571628          {
    15581629#if NAL_REF_FLAG
    1559 #if VIDYO_VPS_INTEGRATION
     1630#if VIDYO_VPS_INTEGRATION | QC_MVHEVC_B0046
    15601631            OutputNALUnit nalu(NAL_UNIT_APS, true, m_pcEncTop->getLayerId());
    15611632#else
    … …  
    16231694
    16241695#if NAL_REF_FLAG
    1625 #if VIDYO_VPS_INTEGRATION
     1696#if VIDYO_VPS_INTEGRATION | QC_MVHEVC_B0046
    16261697        OutputNALUnit nalu(NAL_UNIT_SEI, false, m_pcEncTop->getLayerId());
    16271698#else
    … …  
    20612132  case NAL_UNIT_CODED_SLICE: return "SLICE";
    20622133#if H0566_TLA
     2134#if !QC_REM_IDV_B0046
    20632135  case NAL_UNIT_CODED_SLICE_IDV: return "IDV";
     2136#endif
    20642137  case NAL_UNIT_CODED_SLICE_CRA: return "CRA";
    20652138  case NAL_UNIT_CODED_SLICE_TLA: return "TLA";
    … …  
    22902363    if( bInterViewOnlySlice )
    22912364    {
     2365#if !QC_REM_IDV_B0046
    22922366      return NAL_UNIT_CODED_SLICE_IDV;
     2367#else
     2368      return NAL_UNIT_CODED_SLICE_IDR;
     2369#endif
    22932370    }
    22942371    else
    … …  
    23032380      if( bInterViewOnlySlice )
    23042381      {
     2382#if !QC_REM_IDV_B0046
    23052383        return NAL_UNIT_CODED_SLICE_IDV;
     2384#else
     2385        return NAL_UNIT_CODED_SLICE_CRA;
     2386#endif
    23062387      }
    23072388      else
    … …  
    23182399      if( bInterViewOnlySlice )
    23192400      {
     2401#if !QC_REM_IDV_B0046
    23202402        return NAL_UNIT_CODED_SLICE_IDV;
     2403#else
     2404        return NAL_UNIT_CODED_SLICE_IDR;
     2405#endif
    23212406      }
    23222407      else
    … …  
    25562641
    25572642  // analyze inter-view modifications
     2643#if !QC_REM_IDV_B0046
    25582644  GOPEntryMvc gem = m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid );
     2645#else
     2646  Bool bRAP = ((getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDR) || (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_CRA)) && (pcSlice->getSPS()->getViewId()) ? 1:0;
     2647  GOPEntryMvc gem = m_pcCfg->getGOPEntry( bRAP ? MAX_GOP : iGOPid );
     2648#endif
    25592649  Int numL0Modifications = 0;
    25602650  Int numL1Modifications = 0;
Note: See TracChangeset for help on using the changeset viewer.