shithub: openh264

Info  •  Files  •  Log  •  Branches

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.

--- a/codec/api/svc/codec_api.h

+++ b/codec/api/svc/codec_api.h

@@ -57,7 +57,6 @@

    * 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 @@

 struct ISVCEncoderVtbl {

   int (*Initialize) (ISVCEncoder*, SEncParamBase* pParam, const INIT_TYPE kiInitType);

-  int (*Initialize2) (ISVCEncoder*, void* pParam, const INIT_TYPE kiInitType);

   int (*Uninitialize) (ISVCEncoder*);

--- a/test/c_interface_test.c

+++ b/test/c_interface_test.c

@@ -11,7 +11,6 @@

 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);

--- a/test/cpp_interface_test.cpp

+++ b/test/cpp_interface_test.cpp

@@ -27,10 +27,6 @@

     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;