package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-05 17:16:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[mpp_thread]: fix compile error on windows and linux

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@774 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2016-05-19 06:35:22 +00:00
parent a3da4fd7ea
commit 50277780fc
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mpp/mpp.cpp
View File

@@ -84,10 +84,8 @@ MPP_RET Mpp::init(MppCtxType type, MppCodingType coding)
mDec->mpp = this;
mpp_dec_init(mDec, coding);
mThreadCodec = new MppThread(mpp_dec_parser_thread, this);
mpp_log("mThreadCodec = %p", mThreadCodec);
mThreadHal = new MppThread(mpp_dec_hal_thread, this);
mpp_log("mThreadHal = %p", mThreadHal);
mThreadCodec = new MppThread(mpp_dec_parser_thread, this, "mpp_dec_parser");
mThreadHal = new MppThread(mpp_dec_hal_thread, this, "mpp_dec_hal");
mpp_buffer_group_get_internal(&mInternalGroup, MPP_BUFFER_TYPE_ION);
mpp_buffer_group_get_internal(&mPacketGroup, MPP_BUFFER_TYPE_ION);
@@ -100,8 +98,8 @@ MPP_RET Mpp::init(MppCtxType type, MppCodingType coding)
mTasks = new mpp_list((node_destructor)NULL);
mpp_enc_init(&mEnc, coding);
mThreadCodec = new MppThread(mpp_enc_control_thread, this);
mThreadHal = new MppThread(mpp_enc_hal_thread, this);
mThreadCodec = new MppThread(mpp_enc_control_thread, this, "mpp_enc_ctrl");
mThreadHal = new MppThread(mpp_enc_hal_thread, this, "mpp_enc_hal");
mpp_buffer_group_get_internal(&mInternalGroup, MPP_BUFFER_TYPE_ION);
mpp_buffer_group_get_internal(&mPacketGroup, MPP_BUFFER_TYPE_NORMAL);

5
osal/inc/mpp_thread.h
View File

@@ -34,6 +34,11 @@
#include "pthread.h"
#pragma comment(lib, "pthreadVC2.lib")
/*
* add pthread_setname_np for windows
*/
int pthread_setname_np(pthread_t thread, const char *name);
#else
#include <unistd.h>

11
osal/mpp_thread.cpp
View File

@@ -19,6 +19,7 @@
#include <string.h>
#include "mpp_log.h"
#include "mpp_common.h"
#include "mpp_thread.h"
#define MPP_THREAD_DBG_FUNCTION (0x00000001)
@@ -86,3 +87,13 @@ void MppThread::stop()
}
}
#if defined(_WIN32) && !defined(__MINGW32CE__)
/*
* add pthread_setname_np for windows
*/
int pthread_setname_np(pthread_t thread, const char *name)
{
return 0;
}
#endif