Ticket #73: O0092_0094_DEPENDENCY_CONSTRAINT.patch
File O0092_0094_DEPENDENCY_CONSTRAINT.patch, 2.5 KB (added by eeehey, 9 years ago) |
---|
-
TEncGOP.cpp
959 959 } 960 960 961 961 #if M0040_ADAPTIVE_RESOLUTION_CHANGE 962 if (m_pcEncTop->getAdaptiveResolutionChange() > 0 && ((m_layerId == 1&& pocCurr < m_pcEncTop->getAdaptiveResolutionChange()) ||962 if (m_pcEncTop->getAdaptiveResolutionChange() > 0 && ((m_layerId > 0 && pocCurr < m_pcEncTop->getAdaptiveResolutionChange()) || 963 963 (m_layerId == 0 && pocCurr > m_pcEncTop->getAdaptiveResolutionChange())) ) 964 964 { 965 965 continue; … … 1181 1181 xSetLayerInitializedFlag(pcSlice); 1182 1182 #endif 1183 1183 #if M0040_ADAPTIVE_RESOLUTION_CHANGE 1184 if (m_pcEncTop->getAdaptiveResolutionChange() > 0 && m_layerId == 1&& pocCurr > m_pcEncTop->getAdaptiveResolutionChange())1184 if (m_pcEncTop->getAdaptiveResolutionChange() > 0 && m_layerId > 0 && pocCurr > m_pcEncTop->getAdaptiveResolutionChange()) 1185 1185 { 1186 1186 pcSlice->setActiveNumILRRefIdx(0); 1187 1187 pcSlice->setInterLayerPredEnabledFlag(false); … … 2370 2370 OutputNALUnit nalu( NAL_UNIT_VPS, 0, 0 ); // The value of nuh_layer_id of VPS NAL unit shall be equal to 0. 2371 2371 #if AVC_BASE 2372 2372 #if VPS_AVC_BL_FLAG_REMOVAL 2373 if( ( m_layerId == 1&& m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() ) || ( m_layerId == 0 && !m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() ) )2373 if( ( m_layerId > 0 && m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() ) || ( m_layerId == 0 && !m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() ) ) 2374 2374 #else 2375 if( ( m_layerId == 1&& m_pcEncTop->getVPS()->getAvcBaseLayerFlag() ) || ( m_layerId == 0 && !m_pcEncTop->getVPS()->getAvcBaseLayerFlag() ) )2375 if( ( m_layerId > 0 && m_pcEncTop->getVPS()->getAvcBaseLayerFlag() ) || ( m_layerId == 0 && !m_pcEncTop->getVPS()->getAvcBaseLayerFlag() ) ) 2376 2376 #endif 2377 2377 #else 2378 2378 if( m_layerId == 0 ) … … 2458 2458 #endif 2459 2459 m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream); 2460 2460 #if O0092_0094_DEPENDENCY_CONSTRAINT 2461 assert( pcSlice->getPPS()->get PPSId() == 0 || pcSlice->getPPS()->getPPSId() == m_layerId || m_pcEncTop->getVPS()->getRecursiveRefLayerFlag(m_layerId, pcSlice->getPPS()->getPPSId()) );2461 assert( pcSlice->getPPS()->getLayerId() == 0 || pcSlice->getPPS()->getLayerId() == m_layerId || m_pcEncTop->getVPS()->getRecursiveRefLayerFlag(m_layerId, pcSlice->getPPS()->getLayerId()) ); 2462 2462 #endif 2463 2463 #if Q0048_CGS_3D_ASYMLUT 2464 2464 m_pcEntropyCoder->encodePPS(pcSlice->getPPS(), &m_Enc3DAsymLUTPPS);