Changeset 310 in 3DVCSoftware for branches/HTM-6.0-dev0


Ignore:
Timestamp:
15 Mar 2013, 13:54:23 (11 years ago)
Author:
tech
Message:

Incorporated MERL_VSP_C0152_BugFix_ForNoDepthCase

Location:
branches/HTM-6.0-dev0/source
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-6.0-dev0/source/App/TAppEncoder/TAppEncTop.cpp

    r303 r310  
    10711071
    10721072#if MERL_VSP_C0152
     1073#if MERL_VSP_C0152_BugFix_ForNoDepthCase
     1074        if(m_bUsingDepthMaps) //VSP can be used only when depth is available as input
     1075        {
     1076#endif
    10731077        Int iCurPoc = m_acTEncDepthTopList[iViewIdx]->getFrameId(gopId);
    10741078        if( iCurPoc < m_acTEncDepthTopList[iViewIdx]->getFrameToBeEncoded() && iViewIdx!=0 )
     
    10811085        }
    10821086        setBWVSPLUT( iViewIdx, gopId, false);
     1087#if MERL_VSP_C0152_BugFix_ForNoDepthCase
     1088        }
     1089        else
     1090        {
     1091          Int iCurPoc = m_acTEncTopList[iViewIdx]->getFrameId(gopId);
     1092          if( iCurPoc < m_acTEncTopList[iViewIdx]->getFrameToBeEncoded() && iViewIdx!=0 )
     1093          {
     1094            TEncSlice* pEncSlice = m_acTEncTopList[iViewIdx]->getSliceEncoder();
     1095            pEncSlice->setRefPicBaseTxt(NULL);//Initialize the base view reconstructed texture buffer
     1096            pEncSlice->setRefPicBaseDepth(NULL);//Initialize the base view reconstructed depth buffer
     1097          }
     1098        }
     1099#endif
     1100
    10831101#endif
    10841102        // call encoding function for one frame
  • branches/HTM-6.0-dev0/source/Lib/TLibCommon/TComDataCU.cpp

    r303 r310  
    8181                                          UChar* puhInterDirNeighbours, TComMvField* pcMvFieldNeighbours, Int* iVSPIndexTrue, Int mrgCandIdx, DisInfo* pDInfo )
    8282{
     83#if MERL_VSP_C0152_BugFix_ForNoDepthCase
     84  TComPic* pRefPicBaseDepth = NULL;
     85  pRefPicBaseDepth = getSlice()->getRefPicBaseDepth();
     86  if(ucVspMergePos == VSP_MERGE_POS && pRefPicBaseDepth) //VSP can be used only when depth is used as input
     87#else
     88  if( ucVspMergePos == VSP_MERGE_POS )
     89#endif
    8390  if( ucVspMergePos == VSP_MERGE_POS )
    8491  {
  • branches/HTM-6.0-dev0/source/Lib/TLibCommon/TypeDef.h

    r305 r310  
    186186#define MERL_VSP_C0152                    1 // JCT3V-C0152: 1: enable VSP-related tools; 0: disable VSP-related tools
    187187#if MERL_VSP_C0152
    188 
     188#define MERL_VSP_C0152_BugFix_ForNoDepthCase     1// MERL bugfix for test condition of no depth
    189189/*
    190190 * Two macros are used to configure combinations of JCT3V-C0152 and JCT3V-C0131
Note: See TracChangeset for help on using the changeset viewer.