shithub: openh264

Download patch

ref: e63dad0b6c94e5afdf533a494acf3f95be1d7fae
parent: 29bb1df6455efc55b55b467446ebb0b06d24723a
parent: 3632a0331c63fc9c58fa1e0d4b264d5d0afe9871
author: huili2 <huili2@cisco.com>
date: Wed Jul 16 09:57:46 EDT 2014 

Merge pull request #1172 from ruil2/pause_remove

    remove pause frame interface which will be done in application level


--- a/codec/api/svc/codec_api.h
+++ b/codec/api/svc/codec_api.h
@@ -71,15 +71,9 @@
    * return: 0 - success; otherwise - failed;
    */
   virtual int EXTAPI EncodeParameterSets (SFrameBSInfo* pBsInfo) = 0;
-
   /*
    * return: 0 - success; otherwise - failed;
    */
-  virtual int EXTAPI PauseFrame (const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo) = 0;
-
-  /*
-   * return: 0 - success; otherwise - failed;
-   */
   virtual int EXTAPI ForceIntraFrame (bool bIDR) = 0;
 
   /************************************************************************
@@ -150,8 +144,6 @@
 
 int (*EncodeFrame) (ISVCEncoder*, const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo);
 int (*EncodeParameterSets) (ISVCEncoder*, SFrameBSInfo* pBsInfo);
-
-int (*PauseFrame) (ISVCEncoder*, const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo);
 
 int (*ForceIntraFrame) (ISVCEncoder*, bool bIDR);
 
--- a/codec/encoder/plus/inc/welsEncoderExt.h
+++ b/codec/encoder/plus/inc/welsEncoderExt.h
@@ -82,12 +82,6 @@
    * return: 0 - success; otherwise - failed;
    */
   virtual int EXTAPI EncodeParameterSets (SFrameBSInfo* pBsInfo);
-
-  /*
-   * return: 0 - success; otherwise - failed;
-   */
-  virtual int EXTAPI PauseFrame (const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo);
-
   /*
    * return: 0 - success; otherwise - failed;
    */
--- a/codec/encoder/plus/src/welsEncoderExt.cpp
+++ b/codec/encoder/plus/src/welsEncoderExt.cpp
@@ -508,23 +508,6 @@
 }
 
 /*
- * return: 0 - success; otherwise - failed;
- */
-int CWelsH264SVCEncoder::PauseFrame (const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo) {
-  int32_t  iReturn = cmResultSuccess;
-
-  ForceIntraFrame (true);
-
-  iReturn = EncodeFrameInternal (kpSrcPic, pBsInfo);
-  // to avoid pause frame bitstream and
-  // normal bitstream use different video channel.
-  ForceIntraFrame (true);
-
-  return (int)iReturn;
-}
-
-
-/*
  *	Force key frame
  */
 int CWelsH264SVCEncoder::ForceIntraFrame (bool bIDR) {
--- a/test/api/c_interface_test.c
+++ b/test/api/c_interface_test.c
@@ -16,10 +16,9 @@
   CHECK(4, p, Uninitialize);
   CHECK(5, p, EncodeFrame);
   CHECK(6, p, EncodeParameterSets);
-  CHECK(7, p, PauseFrame);
-  CHECK(8, p, ForceIntraFrame);
-  CHECK(9, p, SetOption);
-  CHECK(10, p, GetOption);
+  CHECK(7, p, ForceIntraFrame);
+  CHECK(8, p, SetOption);
+  CHECK(9, p, GetOption);
 }
 
 void CheckDecoderInterface(ISVCDecoder* p, CheckFunc check) {
--- a/test/api/cpp_interface_test.cpp
+++ b/test/api/cpp_interface_test.cpp
@@ -47,22 +47,17 @@
     EXPECT_TRUE (gThis == this);
     return 6;
   }
-  virtual int EXTAPI PauseFrame (const SSourcePicture* kpSrcPic,
-                                 SFrameBSInfo* pBsInfo) {
+  virtual int EXTAPI ForceIntraFrame (bool bIDR) {
     EXPECT_TRUE (gThis == this);
     return 7;
   }
-  virtual int EXTAPI ForceIntraFrame (bool bIDR) {
+  virtual int EXTAPI SetOption (ENCODER_OPTION eOptionId, void* pOption) {
     EXPECT_TRUE (gThis == this);
     return 8;
   }
-  virtual int EXTAPI SetOption (ENCODER_OPTION eOptionId, void* pOption) {
-    EXPECT_TRUE (gThis == this);
-    return 9;
-  }
   virtual int EXTAPI GetOption (ENCODER_OPTION eOptionId, void* pOption) {
     EXPECT_TRUE (gThis == this);
-    return 10;
+    return 9;
   }
 };