Changeset 204 in 3DVCSoftware


Ignore:
Timestamp:
7 Dec 2012, 18:57:31 (11 years ago)
Author:
qualcomm
Message:

BUG fixed for both HTM5.0 and HTM5.1;
One compile error still exists when 'FLEX_CODING_ORDER_M23723' is enabled.

Location:
branches/HTM-5.0-Qualcomm-Fix/source/Lib/TLibCommon
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.0-Qualcomm-Fix/source/Lib/TLibCommon/TComDataCU.cpp

    r195 r204  
    38313831        bRemoveSpa                      = true;
    38323832        abCandIsInter        [ iCount ] = false;
     3833#if FIX_MISUSE_REFINDEX
     3834        //reset to the default value for IC, MC
     3835        puhInterDirNeighbours[iCount]   = 0;
     3836        TComMv  cZeroMv;
     3837        pcMvFieldNeighbours[iCount<<1].setMvField( cZeroMv, NOT_VALID );
     3838        pcMvFieldNeighbours[(iCount<<1)+1].setMvField( cZeroMv, NOT_VALID );
     3839        break;
     3840#endif
    38333841      }
    38343842    }
     
    39503958        bRemoveSpa                      = true;
    39513959        abCandIsInter        [ iCount ] = false;
     3960#if FIX_MISUSE_REFINDEX
     3961        //reset to the default value for IC, MC
     3962        puhInterDirNeighbours[iCount]   = 0;
     3963        TComMv  cZeroMv;
     3964        pcMvFieldNeighbours[iCount<<1].setMvField( cZeroMv, NOT_VALID );
     3965        pcMvFieldNeighbours[(iCount<<1)+1].setMvField( cZeroMv, NOT_VALID );
     3966        break;
     3967#endif
    39523968      }
    39533969    }
     
    41324148          bRemoveSpa                      = true;
    41334149          abCandIsInter        [ iCount ] = false;
     4150#if FIX_MISUSE_REFINDEX
     4151          //reset to the default value for IC, MC
     4152          puhInterDirNeighbours[iCount]   = 0;
     4153          TComMv  cZeroMv;
     4154          pcMvFieldNeighbours[iCount<<1].setMvField( cZeroMv, NOT_VALID );
     4155          pcMvFieldNeighbours[(iCount<<1)+1].setMvField( cZeroMv, NOT_VALID );
     4156          break;
     4157#endif
    41344158        }
    41354159      }
     
    60926116    {
    60936117      pInfo->iN = 1;
     6118#if FIX_MISUSE_REFINDEX
     6119      pInfo->m_acMvCand[ 1 ].set(0, 0);
     6120#endif
    60946121    }
    60956122  }
     
    68636890      }
    68646891    }else
     6892#if QC_MVHEVC_B0046
    68656893      rcMv = cColMv; //inter-view
     6894#else
     6895    {
     6896#if SONY_COLPIC_AVAILABILITY
     6897      Int iColRefViewOrderIdx = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewOrderIdx();
     6898      iScale = xGetDistScaleFactor(iCurrViewOrderIdx, iCurrRefViewOrderIdx, iColViewOrderIdx, iColRefViewOrderIdx);
     6899      if ( iScale == 4096 )
     6900      {
     6901        rcMv = cColMv;
     6902      }
     6903      else
     6904      {
     6905        rcMv = cColMv.scaleMv( iScale );
     6906      }
     6907#else
     6908      return false;
     6909#endif
     6910    }
     6911#endif
    68666912  }
    68676913#else
  • branches/HTM-5.0-Qualcomm-Fix/source/Lib/TLibCommon/TypeDef.h

    r201 r204  
    4242//! \{
    4343#define QC_MVHEVC_B0046                   0   //JCT3V-B0046: disable 3DHEVC tools
    44 #define QC_IV_AS_LT_B0046                 0   //JCT3V-B0046: inter-view reference pictures are treated as long-term pictures, scaling of motion vectors for DCP based on ViewId/ViewOrderIdx is disabled 
    45 #define QC_TMVP_IDX_MOD_B0046             0   //JCT3V-B0046: the reference index for temporal merging candidate is set to 0, as defined in HEVC
    46 #define QC_REM_IDV_B0046                  0   //JCT3V-B0046: removal of IDV NAL unit type
    47 #define FIX_DEL_NULLPTR                   0
    48 
     44#define QC_IV_AS_LT_B0046                 1   //JCT3V-B0046: inter-view reference pictures are treated as long-term pictures, scaling of motion vectors for DCP based on ViewId/ViewOrderIdx is disabled 
     45#define QC_TMVP_IDX_MOD_B0046             1   //JCT3V-B0046: the reference index for temporal merging candidate is set to 0, as defined in HEVC
     46#define QC_REM_IDV_B0046                  1   //JCT3V-B0046: removal of IDV NAL unit type
     47#define FIX_DEL_NULLPTR                   1
     48#define FIX_MISUSE_REFINDEX               1
    4949#define DV_V_RESTRICTION_B0037            1   // JCT3V-B0037 disparity vector vertical range restriction
    5050
     
    6363
    6464// FCO
    65 #define FLEX_CODING_ORDER_M23723          1
     65#define FLEX_CODING_ORDER_M23723          0
    6666#if FLEX_CODING_ORDER_M23723
    6767  #define DISABLE_FCO_FOR_VSO             0 // Optional compile settings to disable VSO with FCO.
Note: See TracChangeset for help on using the changeset viewer.