generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1333 from huili2/print_ver_master

Browse Source 
modify version info in enc/dec
This commit is contained in:
ruil2 2014-09-05 13:23:49 +08:00
commit 4fc144b698
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
codec/decoder/plus/src/welsDecoderExt.cpp
View File

@ -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. // the return value of this function is not suitable, it need report failure info to upper layer.
void CWelsDecoder::InitDecoder (void) { 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"); m_pDecContext = (PWelsDecoderContext)WelsMalloc (sizeof (SWelsDecoderContext), "m_pDecContext");
@ -278,6 +279,8 @@ long CWelsDecoder::SetOption (DECODER_OPTION eOptID, void* pOption) {
if (m_pWelsTrace) { if (m_pWelsTrace) {
WelsTraceCallback callback = * ((WelsTraceCallback*)pOption); WelsTraceCallback callback = * ((WelsTraceCallback*)pOption);
m_pWelsTrace->SetTraceCallback (callback); m_pWelsTrace->SetTraceCallback (callback);
WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsDecoder::SetOption(), openh264 codec version = %s.",
VERSION_NUMBER);
} }
return cmResultSuccess; return cmResultSuccess;
} else if (eOptID == DECODER_OPTION_TRACE_CALLBACK_CONTEXT) { } else if (eOptID == DECODER_OPTION_TRACE_CALLBACK_CONTEXT) {
@ -480,7 +483,7 @@ using namespace WelsDec;
* WelsGetDecoderCapability * WelsGetDecoderCapability
* @return: DecCapability information * @return: DecCapability information
*/ */
int WelsGetDecoderCapability(SDecoderCapability* pDecCapability) { int WelsGetDecoderCapability (SDecoderCapability* pDecCapability) {
memset (pDecCapability, 0, sizeof (SDecoderCapability)); memset (pDecCapability, 0, sizeof (SDecoderCapability));
pDecCapability->iProfileIdc = 66; //Baseline pDecCapability->iProfileIdc = 66; //Baseline
pDecCapability->iProfileIop = 0xE0; //11100000b pDecCapability->iProfileIop = 0xE0; //11100000b

5
codec/encoder/plus/src/welsEncoderExt.cpp
View File

@ -363,7 +363,8 @@ int32_t CWelsH264SVCEncoder::Uninitialize() {
return 0; 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 #ifdef REC_FRAME_COUNT
WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
@ -861,6 +862,8 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) {
if (m_pWelsTrace) { if (m_pWelsTrace) {
WelsTraceCallback callback = * ((WelsTraceCallback*)pOption); WelsTraceCallback callback = * ((WelsTraceCallback*)pOption);
m_pWelsTrace->SetTraceCallback (callback); m_pWelsTrace->SetTraceCallback (callback);
WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::SetOption(), openh264 codec version = %s.",
VERSION_NUMBER);
} }
} }
break; break;