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

Merge pull request #1172 from ruil2/pause_remove

Browse Source 
remove pause frame interface which will be done in application level
This commit is contained in:
huili2 2014-07-16 13:57:46 +08:00
commit e63dad0b6c
5 changed files with 6 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,12 +71,6 @@ class ISVCEncoder {
* 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;
*/
@ -151,8 +145,6 @@ int (*Uninitialize) (ISVCEncoder*);
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);
int (*SetOption) (ISVCEncoder*, ENCODER_OPTION eOptionId, void* pOption);

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

@ -82,12 +82,6 @@ class CWelsH264SVCEncoder : public ISVCEncoder {
* 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;
*/

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

@ -507,23 +507,6 @@ int CWelsH264SVCEncoder::EncodeParameterSets (SFrameBSInfo* pBsInfo) {
return WelsEncoderEncodeParameterSets (m_pEncContext, pBsInfo);
}
/*
* 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
*/

7
test/api/c_interface_test.c
View File

@ -16,10 +16,9 @@ void CheckEncoderInterface(ISVCEncoder* p, CheckFunc check) {
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) {

11
test/api/cpp_interface_test.cpp
View File

@ -47,22 +47,17 @@ struct SVCEncoderImpl : public ISVCEncoder {
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;
}
};