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

Merge pull request #958 from ruil2/trace_update

Browse Source 
move trace related info to interface header
This commit is contained in:
dongzha 2014-06-12 09:15:29 +08:00
commit c38126b094
7 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
codec/api/svc/codec_api.h
View File

@ -191,6 +191,7 @@ long (*GetOption) (ISVCDecoder*, DECODER_OPTION eOptionId, void* pOption);
}; };
#endif #endif
typedef void (*WelsTraceCallback) (void* ctx, int level, const char* string);
int WelsCreateSVCEncoder (ISVCEncoder** ppEncoder); int WelsCreateSVCEncoder (ISVCEncoder** ppEncoder);
void WelsDestroySVCEncoder (ISVCEncoder* pEncoder); void WelsDestroySVCEncoder (ISVCEncoder* pEncoder);

12
codec/api/svc/codec_app_def.h
View File

@ -231,6 +231,18 @@ typedef enum {
LEVEL_5_2 LEVEL_5_2
} ELevelIdc; } ELevelIdc;
enum {
WELS_LOG_QUIET = 0x00, // Quiet mode
WELS_LOG_ERROR = 1 << 0, // Error log iLevel
WELS_LOG_WARNING = 1 << 1, // Warning log iLevel
WELS_LOG_INFO = 1 << 2, // Information log iLevel
WELS_LOG_DEBUG = 1 << 3, // Debug log iLevel
WELS_LOG_RESV = 1 << 4, // Resversed log iLevel
WELS_LOG_LEVEL_COUNT = 5,
WELS_LOG_DEFAULT = WELS_LOG_DEBUG // Default log iLevel in Wels codec
};
typedef struct { typedef struct {
SliceModeEnum uiSliceMode; //by default, uiSliceMode will be SM_SINGLE_SLICE SliceModeEnum uiSliceMode; //by default, uiSliceMode will be SM_SINGLE_SLICE
SSliceArgument sSliceArgument; SSliceArgument sSliceArgument;

15
codec/common/inc/utils.h
View File

@ -43,21 +43,6 @@
#include "typedefs.h" #include "typedefs.h"
/*
* Log output routines
*/
enum {
WELS_LOG_QUIET = 0x00, // Quiet mode
WELS_LOG_ERROR = 1 << 0, // Error log iLevel
WELS_LOG_WARNING = 1 << 1, // Warning log iLevel
WELS_LOG_INFO = 1 << 2, // Information log iLevel
WELS_LOG_DEBUG = 1 << 3, // Debug log iLevel
WELS_LOG_RESV = 1 << 4, // Resversed log iLevel
WELS_LOG_LEVEL_COUNT = 5,
WELS_LOG_DEFAULT = WELS_LOG_DEBUG // Default log iLevel in Wels codec
};
/* /*
* Function pointer declaration for various tool sets * Function pointer declaration for various tool sets
*/ */

8
codec/common/inc/welsCodecTrace.h
View File

@ -36,8 +36,8 @@
#include <stdarg.h> #include <stdarg.h>
#include "typedefs.h" #include "typedefs.h"
#include "utils.h" #include "utils.h"
#include "codec_app_def.h"
typedef void (*CM_WELS_TRACE) (void* ctx, int level, const char* string); #include "codec_api.h"
class welsCodecTrace { class welsCodecTrace {
public: public:
@ -45,7 +45,7 @@ class welsCodecTrace {
~welsCodecTrace(); ~welsCodecTrace();
void SetTraceLevel (const int32_t kiLevel); void SetTraceLevel (const int32_t kiLevel);
void SetTraceCallback (CM_WELS_TRACE func); void SetTraceCallback (WelsTraceCallback func);
void SetTraceCallbackContext (void* pCtx); void SetTraceCallbackContext (void* pCtx);
private: private:
@ -53,7 +53,7 @@ class welsCodecTrace {
void CodecTrace (const int32_t kiLevel, const char* kpStrFormat, va_list vl); void CodecTrace (const int32_t kiLevel, const char* kpStrFormat, va_list vl);
int32_t m_iTraceLevel; int32_t m_iTraceLevel;
CM_WELS_TRACE m_fpTrace; WelsTraceCallback m_fpTrace;
void* m_pTraceCtx; void* m_pTraceCtx;
public: public:

2
codec/common/src/welsCodecTrace.cpp
View File

@ -87,7 +87,7 @@ void welsCodecTrace::SetTraceLevel (const int32_t iLevel) {
m_iTraceLevel = iLevel; m_iTraceLevel = iLevel;
} }
void welsCodecTrace::SetTraceCallback (CM_WELS_TRACE func) { void welsCodecTrace::SetTraceCallback (WelsTraceCallback func) {
m_fpTrace = func; m_fpTrace = func;
} }

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

@ -277,7 +277,7 @@ long CWelsDecoder::SetOption (DECODER_OPTION eOptID, void* pOption) {
return cmResultSuccess; return cmResultSuccess;
} else if (eOptID == DECODER_OPTION_TRACE_CALLBACK) { } else if (eOptID == DECODER_OPTION_TRACE_CALLBACK) {
if (m_pWelsTrace) { if (m_pWelsTrace) {
CM_WELS_TRACE callback = * ((CM_WELS_TRACE*)pOption); WelsTraceCallback callback = * ((WelsTraceCallback*)pOption);
m_pWelsTrace->SetTraceCallback (callback); m_pWelsTrace->SetTraceCallback (callback);
} }
return cmResultSuccess; return cmResultSuccess;

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

@ -874,7 +874,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) {
break; break;
case ENCODER_OPTION_TRACE_CALLBACK: { case ENCODER_OPTION_TRACE_CALLBACK: {
if (m_pWelsTrace) { if (m_pWelsTrace) {
CM_WELS_TRACE callback = * ((CM_WELS_TRACE*)pOption); WelsTraceCallback callback = * ((WelsTraceCallback*)pOption);
m_pWelsTrace->SetTraceCallback (callback); m_pWelsTrace->SetTraceCallback (callback);
} }
} }