From 5cb85183067fd94b827f506b92a88915f3366567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 18 Feb 2014 11:01:33 +0200 Subject: [PATCH] Remove the Initialize2 function from the external API This function no longer needs to be public since one can pass SEncParamExt to the normal Initialize function. --- codec/api/svc/codec_api.h | 2 -- test/c_interface_test.c | 1 - test/cpp_interface_test.cpp | 4 ---- 3 files changed, 7 deletions(-) diff --git a/codec/api/svc/codec_api.h b/codec/api/svc/codec_api.h index bc57a355..76964025 100644 --- a/codec/api/svc/codec_api.h +++ b/codec/api/svc/codec_api.h @@ -57,7 +57,6 @@ class ISVCEncoder { * 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 Initialize2 (void* pParam, const INIT_TYPE kiInitType = INIT_TYPE_PARAMETER_BASED) = 0; virtual int EXTAPI Uninitialize() = 0; @@ -142,7 +141,6 @@ typedef const ISVCEncoderVtbl* ISVCEncoder; struct ISVCEncoderVtbl { int (*Initialize) (ISVCEncoder*, SEncParamBase* pParam, const INIT_TYPE kiInitType); - int (*Initialize2) (ISVCEncoder*, void* pParam, const INIT_TYPE kiInitType); int (*Uninitialize) (ISVCEncoder*); diff --git a/test/c_interface_test.c b/test/c_interface_test.c index 121410f6..8e42d7b1 100644 --- a/test/c_interface_test.c +++ b/test/c_interface_test.c @@ -11,7 +11,6 @@ typedef void(*CheckFunc)(int, int, const char*); void CheckEncoderInterface(ISVCEncoder* p, CheckFunc check) { CHECK(1, p, Initialize); - CHECK(2, p, Initialize2); CHECK(3, p, Uninitialize); CHECK(4, p, EncodeFrame); CHECK(5, p, EncodeFrame2); diff --git a/test/cpp_interface_test.cpp b/test/cpp_interface_test.cpp index c8f15225..3043aff0 100644 --- a/test/cpp_interface_test.cpp +++ b/test/cpp_interface_test.cpp @@ -27,10 +27,6 @@ struct SVCEncoderImpl : public ISVCEncoder { EXPECT_TRUE(gThis == this); return 1; } - virtual int EXTAPI Initialize2(void* pParam, const INIT_TYPE kiInitType) { - EXPECT_TRUE(gThis == this); - return 2; - } virtual int EXTAPI Uninitialize() { EXPECT_TRUE(gThis == this); return 3;