From 1b1ea2b9ef6876b5c7bda36b1010e6914a999774 Mon Sep 17 00:00:00 2001 From: huili2 Date: Thu, 4 Sep 2014 20:19:52 -0700 Subject: [PATCH] modify version info in enc/dec --- codec/decoder/plus/src/welsDecoderExt.cpp | 7 +++++-- codec/encoder/plus/src/welsEncoderExt.cpp | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/codec/decoder/plus/src/welsDecoderExt.cpp b/codec/decoder/plus/src/welsDecoderExt.cpp index 0b08bf4c..d5c0ca1d 100644 --- a/codec/decoder/plus/src/welsDecoderExt.cpp +++ b/codec/decoder/plus/src/welsDecoderExt.cpp @@ -227,7 +227,8 @@ void CWelsDecoder::UninitDecoder (void) { // 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 @@ long CWelsDecoder::SetOption (DECODER_OPTION eOptID, void* pOption) { 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 @@ using namespace WelsDec; * 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 diff --git a/codec/encoder/plus/src/welsEncoderExt.cpp b/codec/encoder/plus/src/welsEncoderExt.cpp index 75eabb5d..d2fccdcd 100644 --- a/codec/encoder/plus/src/welsEncoderExt.cpp +++ b/codec/encoder/plus/src/welsEncoderExt.cpp @@ -363,7 +363,8 @@ int32_t CWelsH264SVCEncoder::Uninitialize() { 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 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { 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;