Changeset 204 in 3DVCSoftware for branches/HTM-5.0-Qualcomm-Fix/source/Lib
- Timestamp:
- 7 Dec 2012, 18:57:31 (12 years ago)
- 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 3831 3831 bRemoveSpa = true; 3832 3832 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 3833 3841 } 3834 3842 } … … 3950 3958 bRemoveSpa = true; 3951 3959 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 3952 3968 } 3953 3969 } … … 4132 4148 bRemoveSpa = true; 4133 4149 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 4134 4158 } 4135 4159 } … … 6092 6116 { 6093 6117 pInfo->iN = 1; 6118 #if FIX_MISUSE_REFINDEX 6119 pInfo->m_acMvCand[ 1 ].set(0, 0); 6120 #endif 6094 6121 } 6095 6122 } … … 6863 6890 } 6864 6891 }else 6892 #if QC_MVHEVC_B0046 6865 6893 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 6866 6912 } 6867 6913 #else -
branches/HTM-5.0-Qualcomm-Fix/source/Lib/TLibCommon/TypeDef.h
r201 r204 42 42 //! \{ 43 43 #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 disabled45 #define QC_TMVP_IDX_MOD_B0046 0//JCT3V-B0046: the reference index for temporal merging candidate is set to 0, as defined in HEVC46 #define QC_REM_IDV_B0046 0//JCT3V-B0046: removal of IDV NAL unit type47 #define FIX_DEL_NULLPTR 048 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 49 49 #define DV_V_RESTRICTION_B0037 1 // JCT3V-B0037 disparity vector vertical range restriction 50 50 … … 63 63 64 64 // FCO 65 #define FLEX_CODING_ORDER_M23723 165 #define FLEX_CODING_ORDER_M23723 0 66 66 #if FLEX_CODING_ORDER_M23723 67 67 #define DISABLE_FCO_FOR_VSO 0 // Optional compile settings to disable VSO with FCO.
Note: See TracChangeset for help on using the changeset viewer.