History

Merge pull request #654 from volvet/refine_enc_frame

refine method EncodeFrame

Licai Guo committed 12 years ago

Commit 4b5a4552 parents 4ba216b 52af29e1 file · +1 −5Browse 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+1−5
@@ -474,7 +474,7 @@ int32_t CWelsH264SVCEncoder::Uninitialize() { · 473 unmodified lines
474474 * SVC core encoding
475475 */
476476 int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo) {
477− if (! (kpSrcPic && m_pEncContext && m_bInitialFlag)) {
477+ if (! (kpSrcPic && m_bInitialFlag && pBsInfo)) {
478478 return cmInitParaError;
479479 }
480480
@@ -497,10 +497,6 @@ int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture* kpSrcPic, SFrameBSIn · 16 unmodified lines
497497
498498
499499 int CWelsH264SVCEncoder::EncodeFrameInternal(const SSourcePicture* pSrcPic, SFrameBSInfo* pBsInfo) {
500− if (!(pSrcPic && m_pEncContext && m_bInitialFlag) ){
501− return cmInitParaError;
502− }
503−
504500 const int32_t kiEncoderReturn = WelsEncoderEncodeExt (m_pEncContext, pBsInfo, pSrcPic);
505501
506502 if(kiEncoderReturn == ENC_RETURN_MEMALLOCERR) {

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