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

Add a new public method for initializing SEncParamExt to default values

Browse Source 
This simplifies forward source compatibility when new fields are
added to SEncParamExt - when new fields are added to SEncParamExt,
this method makes sure those fields are initialized to the
default value - otherwise all API users would have to manually check
SEncParamExt every time it is updated to make sure there's no new fields
that should be set to a nonzero value by default (e.g. like
bEnableFrameSkip).
This commit is contained in:
Martin Storsjö 2014-02-26 22:08:41 +02:00
parent 6021ff3908
commit c7ff8876bb
5 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,8 @@ class ISVCEncoder {
virtual int EXTAPI Initialize (const SEncParamBase* pParam) = 0;
virtual int EXTAPI InitializeExt (const SEncParamExt* pParam) = 0;
virtual int EXTAPI GetDefaultParams (SEncParamExt* pParam) = 0;
virtual int EXTAPI Uninitialize() = 0;
/*
@ -142,6 +144,8 @@ struct ISVCEncoderVtbl {
int (*Initialize) (ISVCEncoder*, const SEncParamBase* pParam);
int (*InitializeExt) (ISVCEncoder*, const SEncParamExt* pParam);
int (*GetDefaultParams) (ISVCEncoder*, SEncParamExt* pParam);
int (*Uninitialize) (ISVCEncoder*);
int (*EncodeFrame) (ISVCEncoder*, const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo);

2
codec/encoder/plus/inc/welsEncoderExt.h
View File

@ -69,6 +69,8 @@ class CWelsH264SVCEncoder : public ISVCEncoder {
virtual int EXTAPI Initialize (const SEncParamBase* argv);
virtual int EXTAPI InitializeExt (const SEncParamExt* argv);
virtual int EXTAPI GetDefaultParams (SEncParamExt* argv);
virtual int EXTAPI Uninitialize();
/*

5
codec/encoder/plus/src/welsEncoderExt.cpp
View File

@ -197,6 +197,11 @@ void CWelsH264SVCEncoder::InitEncoder (void) {
/* Interfaces override from ISVCEncoder */
int CWelsH264SVCEncoder::GetDefaultParams (SEncParamExt* argv) {
SWelsSvcCodingParam::FillDefault(*argv, true);
return cmResultSuccess;
}
/*
* SVC Encoder Initialization
*/

1
test/c_interface_test.c
View File

@ -12,6 +12,7 @@ typedef void(*CheckFunc)(int, int, const char*);
void CheckEncoderInterface(ISVCEncoder* p, CheckFunc check) {
CHECK(1, p, Initialize);
CHECK(2, p, InitializeExt);
CHECK(10, p, GetDefaultParams);
CHECK(3, p, Uninitialize);
CHECK(4, p, EncodeFrame);
CHECK(5, p, EncodeParameterSets);

4
test/cpp_interface_test.cpp
View File

@ -30,6 +30,10 @@ struct SVCEncoderImpl : public ISVCEncoder {
EXPECT_TRUE(gThis == this);
return 2;
}
virtual int EXTAPI GetDefaultParams(SEncParamExt* pParam) {
EXPECT_TRUE(gThis == this);
return 10;
}
virtual int EXTAPI Uninitialize() {
EXPECT_TRUE(gThis == this);
return 3;