shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1333 from huili2/print_ver_master

modify version info in enc/dec

--- a/codec/decoder/plus/src/welsDecoderExt.cpp

+++ b/codec/decoder/plus/src/welsDecoderExt.cpp

@@ -227,7 +227,8 @@

 // the return value of this function is not suitable, it need report failure info to upper layer.

 void CWelsDecoder::InitDecoder (void) {

-  WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsDecoder::init_decoder()..");

+  WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsDecoder::init_decoder(), openh264 codec version = %s",

+           VERSION_NUMBER);

   m_pDecContext	= (PWelsDecoderContext)WelsMalloc (sizeof (SWelsDecoderContext), "m_pDecContext");

@@ -278,6 +279,8 @@

     if (m_pWelsTrace) {

       WelsTraceCallback callback = * ((WelsTraceCallback*)pOption);

       m_pWelsTrace->SetTraceCallback (callback);

+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsDecoder::SetOption(), openh264 codec version = %s.",

+               VERSION_NUMBER);

     }

     return cmResultSuccess;

   } else if (eOptID == DECODER_OPTION_TRACE_CALLBACK_CONTEXT) {

@@ -480,7 +483,7 @@

 *       WelsGetDecoderCapability

 *       @return: DecCapability information

 */

-int WelsGetDecoderCapability(SDecoderCapability* pDecCapability) {

+int WelsGetDecoderCapability (SDecoderCapability* pDecCapability) {

   memset (pDecCapability, 0, sizeof (SDecoderCapability));

   pDecCapability->iProfileIdc = 66; //Baseline

   pDecCapability->iProfileIop = 0xE0; //11100000b

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

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

@@ -363,7 +363,8 @@

     return 0;

   }

-  WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::Uninitialize()..");

+  WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::Uninitialize(), openh264 codec version = %s.",

+           VERSION_NUMBER);

 #ifdef REC_FRAME_COUNT

   WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,

@@ -861,6 +862,8 @@

     if (m_pWelsTrace) {

       WelsTraceCallback callback = * ((WelsTraceCallback*)pOption);

       m_pWelsTrace->SetTraceCallback (callback);

+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::SetOption(), openh264 codec version = %s.",

+               VERSION_NUMBER);

     }

   }

   break;