History

fix when output enabled in encoder

huili2 committed 12 years ago

Commit 05cd0e81 parent 76bd6331 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
@@ -464,7 +464,7 @@ int CWelsH264SVCEncoder::EncodeFrameInternal (const SSourcePicture* pSrcPic, SF · 463 unmodified lines
464 }464 }
465 ///////////////////for test465 ///////////////////for test
466#ifdef OUTPUT_BIT_STREAM466#ifdef OUTPUT_BIT_STREAM
467 if (pBsInfo->eOutputFrameType != videoFrameTypeInvalid && pBsInfo->eOutputFrameType != videoFrameTypeSkip) {467 if (pBsInfo->eFrameType != videoFrameTypeInvalid && pBsInfo->eFrameType != videoFrameTypeSkip) {
468 SLayerBSInfo* pLayer = NULL;468 SLayerBSInfo* pLayer = NULL;
469 int32_t i = 0, j = 0, iCurLayerBits = 0, total_bits = 0;469 int32_t i = 0, j = 0, iCurLayerBits = 0, total_bits = 0;
470 470
@@ -692,7 +692,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 221 unmodified lines
692 }692 }
693#ifdef OUTPUT_BIT_STREAM693#ifdef OUTPUT_BIT_STREAM
694 if (sEncodingParam.sSpatialLayers[sEncodingParam.iSpatialLayerNum - 1].iVideoWidth !=694 if (sEncodingParam.sSpatialLayers[sEncodingParam.iSpatialLayerNum - 1].iVideoWidth !=
695 m_pEncContext->pSvcParam->sDependencyLayers[m_pEncContext->pSvcParam->iSpatialLayerNum - 1].iFrameWidth) {695 m_pEncContext->pSvcParam->sDependencyLayers[m_pEncContext->pSvcParam->iSpatialLayerNum - 1].iActualWidth) {
696 ++ m_iSwitchTimes;696 ++ m_iSwitchTimes;
697 m_bSwitch = true;697 m_bSwitch = true;
698 }698 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t