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

fix typo

Browse Source
This commit is contained in:
Varun B Patil 2014-01-17 00:49:16 +05:30
parent e68f435a84
commit 98ff18d15d
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec/WelsThreadLib/api/WelsThreadLib.h
View File

@ -98,10 +98,10 @@ typedef struct _WelsLogicalProcessorInfo {
} WelsLogicalProcessInfo; } WelsLogicalProcessInfo;
#define WELS_THREAD_ERROR_OK 0 #define WELS_THREAD_ERROR_OK 0
#define WELS_THREAD_ERROR_GENERIAL ((uint32_t)(-1)) #define WELS_THREAD_ERROR_GENERAL ((uint32_t)(-1))
#define WELS_THREAD_ERROR_WAIT_OBJECT_0 0 #define WELS_THREAD_ERROR_WAIT_OBJECT_0 0
#define WELS_THREAD_ERROR_WAIT_TIMEOUT ((uint32_t)0x00000102L) #define WELS_THREAD_ERROR_WAIT_TIMEOUT ((uint32_t)0x00000102L)
#define WELS_THREAD_ERROR_WAIT_FAILED WELS_THREAD_ERROR_GENERIAL #define WELS_THREAD_ERROR_WAIT_FAILED WELS_THREAD_ERROR_GENERAL
void WelsSleep (uint32_t dwMilliseconds); void WelsSleep (uint32_t dwMilliseconds);
WELS_THREAD_ERROR_CODE WelsMutexInit (WELS_MUTEX* mutex); WELS_THREAD_ERROR_CODE WelsMutexInit (WELS_MUTEX* mutex);

12
codec/WelsThreadLib/src/WelsThreadLib.cpp
View File

@ -76,7 +76,7 @@ WELS_THREAD_ERROR_CODE WelsEventInit (WELS_EVENT* event) {
WELS_EVENT h = CreateEvent (NULL, FALSE, FALSE, NULL); WELS_EVENT h = CreateEvent (NULL, FALSE, FALSE, NULL);
if (h == NULL) { if (h == NULL) {
return WELS_THREAD_ERROR_GENERIAL; return WELS_THREAD_ERROR_GENERAL;
} }
*event = h; *event = h;
return WELS_THREAD_ERROR_OK; return WELS_THREAD_ERROR_OK;
@ -86,13 +86,13 @@ WELS_THREAD_ERROR_CODE WelsEventSignal (WELS_EVENT* event) {
if (SetEvent (*event)) { if (SetEvent (*event)) {
return WELS_THREAD_ERROR_OK; return WELS_THREAD_ERROR_OK;
} }
return WELS_THREAD_ERROR_GENERIAL; return WELS_THREAD_ERROR_GENERAL;
} }
WELS_THREAD_ERROR_CODE WelsEventReset (WELS_EVENT* event) { WELS_THREAD_ERROR_CODE WelsEventReset (WELS_EVENT* event) {
if (ResetEvent (*event)) if (ResetEvent (*event))
return WELS_THREAD_ERROR_OK; return WELS_THREAD_ERROR_OK;
return WELS_THREAD_ERROR_GENERIAL; return WELS_THREAD_ERROR_GENERAL;
} }
WELS_THREAD_ERROR_CODE WelsEventWait (WELS_EVENT* event) { WELS_THREAD_ERROR_CODE WelsEventWait (WELS_EVENT* event) {
@ -126,7 +126,7 @@ WELS_THREAD_ERROR_CODE WelsThreadCreate (WELS_THREAD_HANDLE* thread, LPWELS_
WELS_THREAD_HANDLE h = CreateThread (NULL, 0, routine, arg, 0, NULL); WELS_THREAD_HANDLE h = CreateThread (NULL, 0, routine, arg, 0, NULL);
if (h == NULL) { if (h == NULL) {
return WELS_THREAD_ERROR_GENERIAL; return WELS_THREAD_ERROR_GENERAL;
} }
* thread = h; * thread = h;
@ -297,12 +297,12 @@ WELS_THREAD_ERROR_CODE WelsEventDestroy (WELS_EVENT* event) {
WELS_THREAD_ERROR_CODE WelsEventOpen (WELS_EVENT** p_event, str_t* event_name) { WELS_THREAD_ERROR_CODE WelsEventOpen (WELS_EVENT** p_event, str_t* event_name) {
if (p_event == NULL || event_name == NULL) if (p_event == NULL || event_name == NULL)
return WELS_THREAD_ERROR_GENERIAL; return WELS_THREAD_ERROR_GENERAL;
*p_event = sem_open (event_name, O_CREAT, (S_IRUSR | S_IWUSR)/*0600*/, 0); *p_event = sem_open (event_name, O_CREAT, (S_IRUSR | S_IWUSR)/*0600*/, 0);
if (*p_event == (sem_t*)SEM_FAILED) { if (*p_event == (sem_t*)SEM_FAILED) {
sem_unlink (event_name); sem_unlink (event_name);
*p_event = NULL; *p_event = NULL;
return WELS_THREAD_ERROR_GENERIAL; return WELS_THREAD_ERROR_GENERAL;
} else { } else {
return WELS_THREAD_ERROR_OK; return WELS_THREAD_ERROR_OK;
} }

4
codec/encoder/core/src/slice_multi_threading.cpp
View File

@ -859,7 +859,7 @@ WELS_THREAD_ROUTINE_TYPE UpdateMbListThreadProc (void* arg) {
SDqLayer* pCurDq = NULL; SDqLayer* pCurDq = NULL;
int32_t iSliceIdx = -1; int32_t iSliceIdx = -1;
int32_t iEventIdx = -1; int32_t iEventIdx = -1;
WELS_THREAD_ERROR_CODE iWaitRet = WELS_THREAD_ERROR_GENERIAL; WELS_THREAD_ERROR_CODE iWaitRet = WELS_THREAD_ERROR_GENERAL;
uint32_t uiThrdRet = 0; uint32_t uiThrdRet = 0;
if (NULL == pPrivateData) if (NULL == pPrivateData)
@ -905,7 +905,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) {
WELS_EVENT pEventsList[3]; WELS_EVENT pEventsList[3];
int32_t iEventCount = 0; int32_t iEventCount = 0;
#endif #endif
WELS_THREAD_ERROR_CODE iWaitRet = WELS_THREAD_ERROR_GENERIAL; WELS_THREAD_ERROR_CODE iWaitRet = WELS_THREAD_ERROR_GENERAL;
uint32_t uiThrdRet = 0; uint32_t uiThrdRet = 0;
int32_t iSliceSize = 0; int32_t iSliceSize = 0;
int32_t iSliceIdx = -1; int32_t iSliceIdx = -1;

4
codec/processing/src/common/thread.h
View File

@ -74,10 +74,10 @@ typedef pthread_mutex_t WELS_MUTEX;
typedef long_t WELS_THREAD_ERROR_CODE; typedef long_t WELS_THREAD_ERROR_CODE;
#define WELS_THREAD_ERROR_OK 0 #define WELS_THREAD_ERROR_OK 0
#define WELS_THREAD_ERROR_GENERIAL ((unsigned long)(-1)) #define WELS_THREAD_ERROR_GENERAL ((unsigned long)(-1))
#define WELS_THREAD_ERROR_WAIT_OBJECT_0 0 #define WELS_THREAD_ERROR_WAIT_OBJECT_0 0
#define WELS_THREAD_ERROR_WAIT_TIMEOUT ((unsigned long)0x00000102L) #define WELS_THREAD_ERROR_WAIT_TIMEOUT ((unsigned long)0x00000102L)
#define WELS_THREAD_ERROR_WAIT_FAILED WELS_THREAD_ERROR_GENERIAL #define WELS_THREAD_ERROR_WAIT_FAILED WELS_THREAD_ERROR_GENERAL
WELS_THREAD_ERROR_CODE WelsMutexInit (WELS_MUTEX* mutex); WELS_THREAD_ERROR_CODE WelsMutexInit (WELS_MUTEX* mutex);
WELS_THREAD_ERROR_CODE WelsMutexLock (WELS_MUTEX* mutex); WELS_THREAD_ERROR_CODE WelsMutexLock (WELS_MUTEX* mutex);