shithub: openh264

Info  •  Files  •  Log  •  Branches

correct a typo along with the in-plan v1.5 release

--- a/codec/api/svc/codec_def.h

+++ b/codec/api/svc/codec_def.h

@@ -80,7 +80,7 @@

 typedef enum {

   cmResultSuccess,          ///< successful

   cmInitParaError,          ///< parameters are invalid

-  cmUnkonwReason,

+  cmUnknownReason,

   cmMallocMemeError,        ///< malloc a memory error

   cmInitExpected,           ///< initial action is expected

   cmUnsupportedData

--- a/codec/encoder/plus/src/welsEncoderExt.cpp

+++ b/codec/encoder/plus/src/welsEncoderExt.cpp

@@ -408,7 +408,7 @@

   } else if ((kiEncoderReturn != ENC_RETURN_SUCCESS) && (kiEncoderReturn == ENC_RETURN_CORRECTED)) {

     WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "unexpected return(%d) from EncodeFrameInternal()!",

              kiEncoderReturn);

-    return cmUnkonwReason;

+    return cmUnknownReason;

   }

   UpdateStatistics (pSrcPic->uiTimeStamp, pBsInfo->eFrameType, pBsInfo->iFrameSizeInBytes, kiCurrentFrameMs);

--- a/test/api/encode_decode_api_test.cpp

+++ b/test/api/encode_decode_api_test.cpp

@@ -204,7 +204,7 @@

     if (0 == iCheckTypeIndex)

       ASSERT_TRUE (rv == cmResultSuccess);

     else if (1 == iCheckTypeIndex)

-      ASSERT_TRUE (rv == cmResultSuccess || rv == cmUnkonwReason);

+      ASSERT_TRUE (rv == cmResultSuccess || rv == cmUnknownReason);

   }

   void EncDecOneFrame (const int iWidth, const int iHeight, const int iFrame, FILE* pfEnc) {

@@ -990,7 +990,7 @@

     if (m_LTR_Recover_Request.uiFeedbackType == IDR_RECOVERY_REQUEST) {

       ASSERT_TRUE (info.eFrameType == videoFrameTypeIDR);

     }

-    ASSERT_TRUE (rv == cmResultSuccess || rv == cmUnkonwReason);

+    ASSERT_TRUE (rv == cmResultSuccess || rv == cmUnknownReason);

     m_LTR_Recover_Request.uiFeedbackType = LTR_RECOVERY_REQUEST;

     m_LTR_Recover_Request.iCurrentFrameNum = rand() % 2 == 1 ? -rand() % 10000 : rand() % 10000;

     m_LTR_Recover_Request.uiIDRPicId = rand() % 2 == 1 ? -rand() % 10000 : rand() % 10000;

@@ -2277,7 +2277,7 @@

     memset (buf_.data(), iRandValue, (frameSize >> 2));

     memset (buf_.data() + (frameSize >> 2), rand() % 256, (frameSize - (frameSize >> 2)));

     int rv = encoder_->EncodeFrame (&EncPic, &info);

-    ASSERT_TRUE (rv == cmResultSuccess || rv == cmUnkonwReason);

+    ASSERT_TRUE (rv == cmResultSuccess || rv == cmUnknownReason);

   }

  protected:

   unsigned char* ucBuf_;

@@ -2562,7 +2562,7 @@

       ASSERT_TRUE (iSize == iFrameSize);

     }

     int rv = encoder_->EncodeFrame (&EncPic, &info);

-    ASSERT_TRUE (rv == cmResultSuccess || rv == cmUnkonwReason);

+    ASSERT_TRUE (rv == cmResultSuccess || rv == cmUnknownReason);

   }

   void prepareParam (int iLayerNum, int iSliceNum, int width, int height, float framerate, SEncParamExt* pParam) {

@@ -3505,7 +3505,7 @@

     if (0 == iCheckTypeIndex)

       ASSERT_TRUE (rv == cmResultSuccess) << "rv=" << rv;

     else if (1 == iCheckTypeIndex)

-      ASSERT_TRUE (rv == cmResultSuccess || rv == cmUnkonwReason) << "rv=" << rv;

+      ASSERT_TRUE (rv == cmResultSuccess || rv == cmUnknownReason) << "rv=" << rv;

   }

 };