Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 1 file). Show all
Unified · Split
| @@ -474,7 +474,7 @@ int32_t CWelsH264SVCEncoder::Uninitialize() { · 473 unmodified lines | |||
| 474 | * SVC core encoding | 474 | * SVC core encoding |
| 475 | */ | 475 | */ |
| 476 | int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo) { | 476 | int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo) { |
| 477 | if (! (kpSrcPic && m_pEncContext && m_bInitialFlag)) { | 477 | if (! (kpSrcPic && m_bInitialFlag && pBsInfo)) { |
| 478 | return cmInitParaError; | 478 | return cmInitParaError; |
| 479 | } | 479 | } |
| 480 | 480 | ||
| @@ -497,10 +497,6 @@ int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture* kpSrcPic, SFrameBSIn · 16 unmodified lines | |||
| 497 | 497 | ||
| 498 | 498 | ||
| 499 | int CWelsH264SVCEncoder::EncodeFrameInternal(const SSourcePicture* pSrcPic, SFrameBSInfo* pBsInfo) { | 499 | int CWelsH264SVCEncoder::EncodeFrameInternal(const SSourcePicture* pSrcPic, SFrameBSInfo* pBsInfo) { |
| 500 | if (!(pSrcPic && m_pEncContext && m_bInitialFlag) ){ | ||
| 501 | return cmInitParaError; | ||
| 502 | } | ||
| 503 | |||
| 504 | const int32_t kiEncoderReturn = WelsEncoderEncodeExt (m_pEncContext, pBsInfo, pSrcPic); | 500 | const int32_t kiEncoderReturn = WelsEncoderEncodeExt (m_pEncContext, pBsInfo, pSrcPic); |
| 505 | 501 | ||
| 506 | if(kiEncoderReturn == ENC_RETURN_MEMALLOCERR) { | 502 | if(kiEncoderReturn == ENC_RETURN_MEMALLOCERR) { |