Changeset 173 in 3DVCSoftware for branches/HTM-4.1-dev1-HHI/source/Lib
- Timestamp:
- 9 Nov 2012, 12:46:33 (12 years ago)
- Location:
- branches/HTM-4.1-dev1-HHI/source/Lib/TLibCommon
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-4.1-dev1-HHI/source/Lib/TLibCommon/TComDataCU.cpp
r169 r173 5711 5711 #if LGE_DVMCP 5712 5712 #if QC_SIMPLE_NBDV_B0047 5713 #if FIX_LGE_IVMP_PARALLEL_MERGE_B0136 5714 getDisMvpCand2(uiPartIdx, uiPartAddr, &cDisInfo, false); 5715 #else 5713 5716 getDisMvpCand2(uiPartIdx, uiPartAddr, &cDisInfo); 5717 #endif 5714 5718 #else 5715 5719 getDisMvpCand2(uiPartIdx, uiPartAddr, &cDisInfo, false, eRefPicList, iRefIdx ); … … 5767 5771 #if LGE_DVMCP 5768 5772 #if QC_SIMPLE_NBDV_B0047 5773 #if FIX_LGE_IVMP_PARALLEL_MERGE_B0136 5774 getDisMvpCand2(uiPartIdx, uiPartAddr, &cDisInfo, false); 5775 #else 5769 5776 getDisMvpCand2(uiPartIdx, uiPartAddr, &cDisInfo); 5777 #endif 5770 5778 #else 5771 5779 getDisMvpCand2(uiPartIdx, uiPartAddr, &cDisInfo, false, eRefPicList, iRefIdx ); … … 7653 7661 #if LGE_DVMCP 7654 7662 #if QC_SIMPLE_NBDV_B0047 7663 #if FIX_LGE_IVMP_PARALLEL_MERGE_B0136 7664 getDisMvpCand2( 0, 0, &cDisInfo, false); 7665 #else 7655 7666 getDisMvpCand2( 0, 0, &cDisInfo); 7667 #endif 7656 7668 #else 7657 7669 getDisMvpCand2( 0, 0, &cDisInfo, true ); -
branches/HTM-4.1-dev1-HHI/source/Lib/TLibCommon/TypeDef.h
r171 r173 42 42 //! \{ 43 43 44 // A 44 45 #define FIXES 1 45 46 #define POZNAN_CABAC_INIT_FLAG_FIX 1 … … 54 55 #define FIX_REMOVE_TILE_DEPENDENCE 1 55 56 #define FIX_DBL_CONTROL_DEFAULT 1 57 58 59 // B 60 #define FIX_LGE_IVMP_PARALLEL_MERGE_B0136 1 61 56 62 57 63 #define DV_DERIVATION_PARALLEL_B0096 1 //JCT3V-B0096, enable parallel derivation of disparity vector
Note: See TracChangeset for help on using the changeset viewer.