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

Remove the unused iInitType parameter to the decoder Initialize method

Browse Source
This commit is contained in:
Martin Storsjö 2014-02-18 12:32:57 +02:00
parent 8435dd33af
commit 658d1e3651
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,7 @@ class ISVCEncoder {
class ISVCDecoder {
public:
virtual long EXTAPI Initialize (void* pParam, const INIT_TYPE iInitType) = 0;
virtual long EXTAPI Initialize (void* pParam) = 0;
virtual long EXTAPI Uninitialize() = 0;
virtual DECODING_STATE EXTAPI DecodeFrame (const unsigned char* pSrc,
@ -162,7 +162,7 @@ struct ISVCEncoderVtbl {
typedef struct ISVCDecoderVtbl ISVCDecoderVtbl;
typedef const ISVCDecoderVtbl* ISVCDecoder;
struct ISVCDecoderVtbl {
long (*Initialize) (ISVCDecoder*, void* pParam, const INIT_TYPE iInitType);
long (*Initialize) (ISVCDecoder*, void* pParam);
long (*Uninitialize) (ISVCDecoder*);
DECODING_STATE (*DecodeFrame) (ISVCDecoder*, const unsigned char* pSrc,

2
codec/console/dec/src/h264dec.cpp
View File

@ -408,7 +408,7 @@ int32_t main (int32_t iArgC, char* pArgV[]) {
return 1;
}
if (pDecoder->Initialize (&sDecParam, INIT_TYPE_PARAMETER_BASED)) {
if (pDecoder->Initialize (&sDecParam)) {
printf ("Decoder initialization failed.\n");
return 1;
}

2
codec/decoder/plus/inc/welsDecoderExt.h
View File

@ -59,7 +59,7 @@ class CWelsDecoder : public ISVCDecoder {
CWelsDecoder (void);
virtual ~CWelsDecoder();
virtual long EXTAPI Initialize (void* pParam, const INIT_TYPE keInitType);
virtual long EXTAPI Initialize (void* pParam);
virtual long EXTAPI Uninitialize();
/***************************************************************************

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

@ -186,8 +186,8 @@ CWelsDecoder::~CWelsDecoder() {
}
}
long CWelsDecoder::Initialize (void* pParam, const INIT_TYPE keInitType) {
if (pParam == NULL || keInitType != INIT_TYPE_PARAMETER_BASED) {
long CWelsDecoder::Initialize (void* pParam) {
if (pParam == NULL) {
IWelsTrace::WelsVTrace (m_pTrace, IWelsTrace::WELS_LOG_INFO, "CWelsDecoder::Initialize(), invalid input argument.");
return cmInitParaError;
}

2
test/BaseDecoderTest.cpp
View File

@ -58,7 +58,7 @@ void BaseDecoderTest::SetUp() {
decParam.uiEcActiveFlag = 1;
decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
rv = decoder_->Initialize(&decParam, INIT_TYPE_PARAMETER_BASED);
rv = decoder_->Initialize(&decParam);
ASSERT_EQ(0, rv);
}

2
test/cpp_interface_test.cpp
View File

@ -70,7 +70,7 @@ struct SVCEncoderImpl : public ISVCEncoder {
struct SVCDecoderImpl : public ISVCDecoder {
virtual ~SVCDecoderImpl() {}
virtual long EXTAPI Initialize(void* pParam, const INIT_TYPE iInitType) {
virtual long EXTAPI Initialize(void* pParam) {
EXPECT_TRUE(gThis == this);
return 1;
}