Changeset 689 in SHVCSoftware for branches/SHM-6-dev/source/Lib
- Timestamp:
- 17 Apr 2014, 05:10:35 (11 years ago)
- Location:
- branches/SHM-6-dev/source/Lib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.cpp
r676 r689 552 552 Int sameBitDepth = g_bitDepthYLayer[m_layerId] - g_bitDepthYLayer[refLayerId] + g_bitDepthCLayer[m_layerId] - g_bitDepthCLayer[refLayerId]; 553 553 554 if( !( g_posScalingFactor[refLayerIdc][0] == 65536 && g_posScalingFactor[refLayerIdc][1] == 65536 ) || !scalingOffset || !sameBitDepth ) // ratio 1x 554 if( !( g_posScalingFactor[refLayerIdc][0] == 65536 && g_posScalingFactor[refLayerIdc][1] == 65536 ) || !scalingOffset || !sameBitDepth 555 #if Q0048_CGS_3D_ASYMLUT 556 || getPPS()->getCGSFlag() 557 #endif 558 ) // ratio 1x 555 559 #else 556 560 if(!( g_posScalingFactor[refLayerIdc][0] == 65536 && g_posScalingFactor[refLayerIdc][1] == 65536 ) || (!scalingOffset)) // ratio 1x -
branches/SHM-6-dev/source/Lib/TLibEncoder/TEncTop.cpp
r677 r689 861 861 Bool sameBitDepths = ( g_bitDepthYLayer[m_layerId] == g_bitDepthYLayer[refLayerId] ) && ( g_bitDepthCLayer[m_layerId] == g_bitDepthCLayer[refLayerId] ); 862 862 863 if( m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight() || !zeroOffsets || !sameBitDepths ) 863 if( m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight() || !zeroOffsets || !sameBitDepths 864 #if Q0048_CGS_3D_ASYMLUT 865 || m_cPPS.getCGSFlag() > 0 866 #endif 867 ) 864 868 #else 865 869 if(m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight() || !zeroOffsets )
Note: See TracChangeset for help on using the changeset viewer.