Changeset 1235 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp
- Timestamp:
- 13 Jul 2015, 20:38:11 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp
r1230 r1235 109 109 SliceType eSliceType = m_pcSlice->getSliceType(); 110 110 111 Int encCABACTableIdx = m_pcSlice->getPPS()->getEncCABACTableIdx();111 SliceType encCABACTableIdx = m_pcSlice->getEncCABACTableIdx();; 112 112 if (!m_pcSlice->isIntra() && (encCABACTableIdx==B_SLICE || encCABACTableIdx==P_SLICE) && m_pcSlice->getPPS()->getCabacInitPresentFlag()) 113 113 { 114 eSliceType = (SliceType)encCABACTableIdx;114 eSliceType = encCABACTableIdx; 115 115 } 116 116 … … 161 161 * stores the index of the closest table. This index is used for the next P/B slice when cabac_init_present_flag is true. 162 162 */ 163 VoidTEncSbac::determineCabacInitIdx()163 SliceType TEncSbac::determineCabacInitIdx() 164 164 { 165 165 Int qp = m_pcSlice->getSliceQp(); … … 214 214 } 215 215 } 216 m_pcSlice->getPPS()->setEncCABACTableIdx( bestSliceType );216 return bestSliceType; 217 217 } 218 218 else 219 219 { 220 m_pcSlice->getPPS()->setEncCABACTableIdx( I_SLICE );221 } 222 } 223 224 Void TEncSbac::codeVPS( TComVPS* pcVPS )220 return I_SLICE; 221 } 222 } 223 224 Void TEncSbac::codeVPS( const TComVPS* pcVPS ) 225 225 { 226 226 assert (0); … … 228 228 } 229 229 230 Void TEncSbac::codeSPS( TComSPS* pcSPS )230 Void TEncSbac::codeSPS( const TComSPS* pcSPS ) 231 231 { 232 232 assert (0); … … 234 234 } 235 235 236 Void TEncSbac::codePPS( TComPPS* pcPPS237 236 #if CGS_3D_ASYMLUT 238 , TEnc3DAsymLUT * pc3DAsymLUT 237 Void TEncSbac::codePPS( const TComPPS* pcPPS, TEnc3DAsymLUT * pc3DAsymLUT ) 238 #else 239 Void TEncSbac::codePPS( const TComPPS* pcPPS ) 239 240 #endif 240 )241 241 { 242 242 assert (0); … … 459 459 m_pcBinIf->encodeBin( 0, m_cCUPartSizeSCModel.get( 0, 0, 0) ); 460 460 m_pcBinIf->encodeBin( 1, m_cCUPartSizeSCModel.get( 0, 0, 1) ); 461 if ( pcCU->getSlice()->getSPS()->get AMPAcc( uiDepth ))461 if ( pcCU->getSlice()->getSPS()->getUseAMP() && uiDepth < g_uiMaxCUDepth-g_uiAddCUDepth ) 462 462 { 463 463 if (eSize == SIZE_2NxN) … … 485 485 } 486 486 487 if ( pcCU->getSlice()->getSPS()->get AMPAcc( uiDepth ))487 if ( pcCU->getSlice()->getSPS()->getUseAMP() && uiDepth < g_uiMaxCUDepth-g_uiAddCUDepth ) 488 488 { 489 489 if (eSize == SIZE_Nx2N)
Note: See TracChangeset for help on using the changeset viewer.