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

Remove the Initialize2 function from the external API

Browse Source 
This function no longer needs to be public since one can pass
SEncParamExt to the normal Initialize function.
This commit is contained in:
Martin Storsjö 2014-02-18 11:01:33 +02:00
parent 413b301e9c
commit 5cb8518306
3 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,6 @@ class ISVCEncoder {
* return: CM_RETURN: 0 - success; otherwise - failed; * return: CM_RETURN: 0 - success; otherwise - failed;
*/ */
virtual int EXTAPI Initialize (SEncParamBase* pParam, const INIT_TYPE kiInitType = INIT_TYPE_PARAMETER_BASED) = 0; virtual int EXTAPI Initialize (SEncParamBase* pParam, const INIT_TYPE kiInitType = INIT_TYPE_PARAMETER_BASED) = 0;
virtual int EXTAPI Initialize2 (void* pParam, const INIT_TYPE kiInitType = INIT_TYPE_PARAMETER_BASED) = 0;
virtual int EXTAPI Uninitialize() = 0; virtual int EXTAPI Uninitialize() = 0;
@ -142,7 +141,6 @@ typedef const ISVCEncoderVtbl* ISVCEncoder;
struct ISVCEncoderVtbl { struct ISVCEncoderVtbl {
int (*Initialize) (ISVCEncoder*, SEncParamBase* pParam, const INIT_TYPE kiInitType); int (*Initialize) (ISVCEncoder*, SEncParamBase* pParam, const INIT_TYPE kiInitType);
int (*Initialize2) (ISVCEncoder*, void* pParam, const INIT_TYPE kiInitType);
int (*Uninitialize) (ISVCEncoder*); int (*Uninitialize) (ISVCEncoder*);

1
test/c_interface_test.c
View File

@ -11,7 +11,6 @@ typedef void(*CheckFunc)(int, int, const char*);
void CheckEncoderInterface(ISVCEncoder* p, CheckFunc check) { void CheckEncoderInterface(ISVCEncoder* p, CheckFunc check) {
CHECK(1, p, Initialize); CHECK(1, p, Initialize);
CHECK(2, p, Initialize2);
CHECK(3, p, Uninitialize); CHECK(3, p, Uninitialize);
CHECK(4, p, EncodeFrame); CHECK(4, p, EncodeFrame);
CHECK(5, p, EncodeFrame2); CHECK(5, p, EncodeFrame2);

4
test/cpp_interface_test.cpp
View File

@ -27,10 +27,6 @@ struct SVCEncoderImpl : public ISVCEncoder {
EXPECT_TRUE(gThis == this); EXPECT_TRUE(gThis == this);
return 1; return 1;
} }
virtual int EXTAPI Initialize2(void* pParam, const INIT_TYPE kiInitType) {
EXPECT_TRUE(gThis == this);
return 2;
}
virtual int EXTAPI Uninitialize() { virtual int EXTAPI Uninitialize() {
EXPECT_TRUE(gThis == this); EXPECT_TRUE(gThis == this);
return 3; return 3;