Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 10 files). Show all
Unified · Split
| @@ -498,16 +498,13 @@ int32_t CWelsH264SVCEncoder::RawData2SrcPic (const uint8_t* pSrc) { · 497 unmodified lines | |||
| 498 | /* | 498 | /* |
| 499 | * SVC core encoding | 499 | * SVC core encoding |
| 500 | */ | 500 | */ |
| 501 | int CWelsH264SVCEncoder::EncodeFrame (const unsigned char* pSrc, SFrameBSInfo* pBsInfo) { | 501 | int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo) { |
| 502 | if (! (pSrc && m_pEncContext && m_bInitialFlag)) { | 502 | if (! (kpSrcPic && m_pEncContext && m_bInitialFlag)) { |
| 503 | return videoFrameTypeInvalid; | 503 | return videoFrameTypeInvalid; |
| 504 | } | 504 | } |
| 505 | 505 | ||
| 506 | int32_t uiFrameType = videoFrameTypeInvalid; | 506 | int32_t uiFrameType = videoFrameTypeInvalid; |
| 507 | 507 | uiFrameType = EncodeFrame2 (&kpSrcPic, 1, pBsInfo); | |
| 508 | if (RawData2SrcPic ((uint8_t*)pSrc) == 0) { | ||
| 509 | uiFrameType = EncodeFrame2 (const_cast<const SSourcePicture**> (m_pSrcPicList), 1, pBsInfo); | ||
| 510 | } | ||
| 511 | 508 | ||
| 512 | #ifdef REC_FRAME_COUNT | 509 | #ifdef REC_FRAME_COUNT |
| 513 | ++ m_uiCountFrameNum; | 510 | ++ m_uiCountFrameNum; |
| @@ -621,14 +618,15 @@ int CWelsH264SVCEncoder::EncodeParameterSets (SFrameBSInfo* pBsInfo) { · 107 unmodified lines | |||
| 621 | /* | 618 | /* |
| 622 | * return: 0 - success; otherwise - failed; | 619 | * return: 0 - success; otherwise - failed; |
| 623 | */ | 620 | */ |
| 624 | int CWelsH264SVCEncoder::PauseFrame (const unsigned char* kpSrc, SFrameBSInfo* pBsInfo) { | 621 | int CWelsH264SVCEncoder::PauseFrame (const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo) { |
| 625 | int32_t iReturn = 1; | 622 | int32_t iReturn = 1; |
| 626 | 623 | ||
| 627 | ForceIntraFrame (true); | 624 | ForceIntraFrame (true); |
| 628 | 625 | ||
| 629 | if (EncodeFrame (kpSrc, pBsInfo) != videoFrameTypeInvalid) { | 626 | if (EncodeFrame2 (&kpSrcPic, 1,pBsInfo) != videoFrameTypeInvalid) { |
| 630 | iReturn = 0; | 627 | iReturn = 0; |
| 631 | } | 628 | } |
| 629 | |||
| 632 | 630 | ||
| 633 | // to avoid pause frame bitstream and | 631 | // to avoid pause frame bitstream and |
| 634 | // normal bitstream use different video channel. | 632 | // normal bitstream use different video channel. |