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

Merge pull request #334 from mstorsjo/cleanup-vp-interface

Browse Source 
Don't use a custom calling convention for the VP library entry points
This commit is contained in:
volvet 2014-02-21 17:31:34 +08:00
commit 75f8b41bcd
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
codec/encoder/core/src/wels_preprocess.cpp
View File

@ -45,19 +45,14 @@
#include "encoder_context.h"
#include "utils.h"
#ifdef NO_DYNAMIC_VP
EResult WELSAPI CreateVpInterface (void** ppCtx, int iVersion);
EResult WELSAPI DestroyVpInterface (void** ppCtx, int iVersion);
#endif
namespace WelsSVCEnc {
#define WelsSafeDelete(p) if(p){ delete (p); (p) = NULL; }
//***** entry API declaration ************************************************************************//
typedef EResult (WELSAPI* pfnCreateVpInterface) (void**, int);
typedef EResult (WELSAPI* pfnDestroyVpInterface) (void*, int);
typedef EResult (* pfnCreateVpInterface) (void**, int);
typedef EResult (* pfnDestroyVpInterface) (void*, int);
int32_t WelsInitScaledPic (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPic, CMemoryAlign* pMemoryAlign);
bool JudgeNeedOfScaling (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPic);

10
codec/processing/interface/IWelsVP.h
View File

@ -47,12 +47,6 @@
#ifndef IWELSVP_H_
#define IWELSVP_H_
#ifdef _WIN32
#define WELSAPI __stdcall
#else
#define WELSAPI
#endif
#define WELSVP_MAJOR_VERSION 1
#define WELSVP_MINOR_VERSION 1
#define WELSVP_VERSION ((WELSVP_MAJOR_VERSION << 8) + WELSVP_MINOR_VERSION)
@ -276,8 +270,8 @@ class IWelsVP {
#endif
WELSVP_EXTERNC_BEGIN
EResult WELSAPI CreateVpInterface (void** ppCtx, int iVersion /*= WELSVP_INTERFACE_VERION*/);
EResult WELSAPI DestroyVpInterface (void* pCtx , int iVersion /*= WELSVP_INTERFACE_VERION*/);
EResult CreateVpInterface (void** ppCtx, int iVersion /*= WELSVP_INTERFACE_VERION*/);
EResult DestroyVpInterface (void* pCtx , int iVersion /*= WELSVP_INTERFACE_VERION*/);
WELSVP_EXTERNC_END
//////////////////////////////////////////////////////////////////////////////////////////////

4
codec/processing/src/common/WelsFrameWork.cpp
View File

@ -43,7 +43,7 @@
/* interface API implement */
EResult WELSAPI CreateVpInterface (void** ppCtx, int iVersion) {
EResult CreateVpInterface (void** ppCtx, int iVersion) {
if (iVersion & 0x8000)
return nsWelsVP::CreateSpecificVpInterface ((IWelsVP**)ppCtx);
else if (iVersion & 0x7fff)
@ -52,7 +52,7 @@ EResult WELSAPI CreateVpInterface (void** ppCtx, int iVersion) {
return RET_INVALIDPARAM;
}
EResult WELSAPI DestroyVpInterface (void* pCtx, int iVersion) {
EResult DestroyVpInterface (void* pCtx, int iVersion) {
if (iVersion & 0x8000)
return nsWelsVP::DestroySpecificVpInterface ((IWelsVP*)pCtx);
else if (iVersion & 0x7fff)