shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1389 from zhilwang/issue-fix

Fix crash issue due to commit 8945348.

--- a/codec/common/x86/intra_pred_com.asm

+++ b/codec/common/x86/intra_pred_com.asm

@@ -42,10 +42,10 @@

 %include "asm_inc.asm"

 ;***********************************************************************

-; Local Data (Read Only)

+; Code

 ;***********************************************************************

-SECTION .rodata align=16

+SECTION .text

 ;***********************************************************************

 ; void WelsI16x16LumaPredH_sse2(uint8_t *pred, uint8_t *pRef, int32_t stride);

--- a/codec/encoder/core/src/ratectl.cpp

+++ b/codec/encoder/core/src/ratectl.cpp

@@ -1114,7 +1114,7 @@

   }

   if (pWelsSvcRc->bSkipFlag) {

     pWelsSvcRc->iSkipFrameNum++;

-    WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_INFO, "SCC iSkipFrameNum = %d,buffer = %d,threadhold = %d,bitrate = %d,timestamp=%d\n", pWelsSvcRc->iSkipFrameNum,pWelsSvcRc->iBufferFullnessSkip,iVbufferTh,pWelsSvcRc->iSkipFrameNum,iBitRate,uiTimeStamp);

+    WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_INFO, "SCC iSkipFrameNum = %d,buffer = %d,threadhold = %d,bitrate = %d,timestamp=%lld\n", pWelsSvcRc->iSkipFrameNum,pWelsSvcRc->iBufferFullnessSkip,iVbufferTh,iBitRate,uiTimeStamp);

   }

   pWelsSvcRc->uiLastTimeStamp = uiTimeStamp;

 }