fix the GetOption: bit rate part

sijchen committed 12 years ago

Commit 736a6751 parent 3f2ea771 file · +2 −2Browse files

Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 1 file). Show all

Unified · Split

codec/encoder/plus/src/welsEncoderExt.cpp+2−2

@@ -935,7 +935,7 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 934 unmodified lines
935	935	m_uiCountFrameNum, m_iCspInternal);
936	936	#endif//REC_FRAME_COUNT
937	937	SBitrateInfopInfo = (static_cast<SBitrateInfo >(pOption));
938		− if((pInfo->iLayer!=SPATIAL_LAYER_ALL)\|\|(pInfo->iLayer!=SPATIAL_LAYER_0)\|\|(pInfo->iLayer!=SPATIAL_LAYER_1)\|\|(pInfo->iLayer!=SPATIAL_LAYER_2)\|\|(pInfo->iLayer!=SPATIAL_LAYER_3))
	938	+ if((pInfo->iLayer!=SPATIAL_LAYER_ALL)&&(pInfo->iLayer!=SPATIAL_LAYER_0)&&(pInfo->iLayer!=SPATIAL_LAYER_1)&&(pInfo->iLayer!=SPATIAL_LAYER_2)&&(pInfo->iLayer!=SPATIAL_LAYER_3))
939	939	return cmInitParaError;
940	940	if(pInfo->iLayer == SPATIAL_LAYER_ALL){
941	941	pInfo->iBitrate = m_pEncContext->pSvcParam->iTargetBitrate;
@@ -950,7 +950,7 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 8 unmodified lines
950	950	m_uiCountFrameNum, m_iCspInternal);
951	951	#endif//REC_FRAME_COUNT
952	952	SBitrateInfopInfo = (static_cast<SBitrateInfo >(pOption));
953		− if((pInfo->iLayer!=SPATIAL_LAYER_ALL)\|\|(pInfo->iLayer!=SPATIAL_LAYER_0)\|\|(pInfo->iLayer!=SPATIAL_LAYER_1)\|\|(pInfo->iLayer!=SPATIAL_LAYER_2)\|\|(pInfo->iLayer!=SPATIAL_LAYER_3))
	953	+ if((pInfo->iLayer!=SPATIAL_LAYER_ALL)&&(pInfo->iLayer!=SPATIAL_LAYER_0)&&(pInfo->iLayer!=SPATIAL_LAYER_1)&&(pInfo->iLayer!=SPATIAL_LAYER_2)&&(pInfo->iLayer!=SPATIAL_LAYER_3))
954	954	return cmInitParaError;
955	955	if(pInfo->iLayer == SPATIAL_LAYER_ALL){
956	956	pInfo->iBitrate = m_pEncContext->pSvcParam->iMaxBitrate;