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

add usagetype parameter in encoder unit test to test screen content

Browse Source
This commit is contained in:
ruil2 2014-04-18 11:17:25 +08:00
parent 9b0322330c
commit a15e640137
5 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
codec/encoder/core/src/encoder_ext.cpp
View File

@ -2447,6 +2447,7 @@ void PreprocessSliceCoding (sWelsEncCtx* pCtx) {
} }
} }
return;
//to init at each frame will be needed when dealing with hybrid content (camera+screen) //to init at each frame will be needed when dealing with hybrid content (camera+screen)
if (pCtx->pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME) { if (pCtx->pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME) {
SFeatureSearchPreparation* pFeatureSearchPreparation = pCurLayer->pFeatureSearchPreparation; SFeatureSearchPreparation* pFeatureSearchPreparation = pCurLayer->pFeatureSearchPreparation;

4
test/BaseEncoderTest.h
View File

@ -14,8 +14,8 @@ class BaseEncoderTest {
BaseEncoderTest(); BaseEncoderTest();
void SetUp(); void SetUp();
void TearDown(); void TearDown();
void EncodeFile(const char* fileName, int width, int height, float frameRate, SliceModeEnum slices, bool denoise, int layers, Callback* cbk); void EncodeFile(const char* fileName, EUsageType usageType, int width, int height, float frameRate, SliceModeEnum slices, bool denoise, int layers, Callback* cbk);
void EncodeStream(InputStream* in, int width, int height, float frameRate, SliceModeEnum slices, bool denoise, int layers, Callback* cbk); void EncodeStream(InputStream* in, EUsageType usageType, int width, int height, float frameRate, SliceModeEnum slices, bool denoise, int layers, Callback* cbk);
private: private:
ISVCEncoder* encoder_; ISVCEncoder* encoder_;

12
test/api/BaseEncoderTest.cpp
View File

@ -5,12 +5,13 @@
#include "utils/FileInputStream.h" #include "utils/FileInputStream.h"
#include "BaseEncoderTest.h" #include "BaseEncoderTest.h"
static int InitWithParam(ISVCEncoder* encoder, int width, static int InitWithParam(ISVCEncoder* encoder, EUsageType usageType,int width,
int height, float frameRate, SliceModeEnum sliceMode, bool denoise, int layers) { int height, float frameRate, SliceModeEnum sliceMode, bool denoise, int layers) {
if (SM_SINGLE_SLICE == sliceMode && !denoise && layers == 1) { if (SM_SINGLE_SLICE == sliceMode && !denoise && layers == 1) {
SEncParamBase param; SEncParamBase param;
memset (&param, 0, sizeof(SEncParamBase)); memset (&param, 0, sizeof(SEncParamBase));
param.iUsageType = usageType;
param.fMaxFrameRate = frameRate; param.fMaxFrameRate = frameRate;
param.iPicWidth = width; param.iPicWidth = width;
param.iPicHeight = height; param.iPicHeight = height;
@ -22,6 +23,7 @@ static int InitWithParam(ISVCEncoder* encoder, int width,
SEncParamExt param; SEncParamExt param;
encoder->GetDefaultParams(&param); encoder->GetDefaultParams(&param);
param.iUsageType = usageType;
param.fMaxFrameRate = frameRate; param.fMaxFrameRate = frameRate;
param.iPicWidth = width; param.iPicWidth = width;
param.iPicHeight = height; param.iPicHeight = height;
@ -61,9 +63,9 @@ void BaseEncoderTest::TearDown() {
} }
} }
void BaseEncoderTest::EncodeStream(InputStream* in, int width, int height, void BaseEncoderTest::EncodeStream(InputStream* in, EUsageType usageType, int width, int height,
float frameRate, SliceModeEnum slices, bool denoise, int layers, Callback* cbk) { float frameRate, SliceModeEnum slices, bool denoise, int layers, Callback* cbk) {
int rv = InitWithParam(encoder_, width, height, frameRate, slices, denoise, layers); int rv = InitWithParam(encoder_, usageType, width, height, frameRate, slices, denoise, layers);
ASSERT_TRUE(rv == cmResultSuccess); ASSERT_TRUE(rv == cmResultSuccess);
// I420: 1(Y) + 1/4(U) + 1/4(V) // I420: 1(Y) + 1/4(U) + 1/4(V)
@ -95,9 +97,9 @@ void BaseEncoderTest::EncodeStream(InputStream* in, int width, int height,
} }
} }
void BaseEncoderTest::EncodeFile(const char* fileName, int width, int height, void BaseEncoderTest::EncodeFile(const char* fileName, EUsageType usageType, int width, int height,
float frameRate, SliceModeEnum slices, bool denoise, int layers, Callback* cbk) { float frameRate, SliceModeEnum slices, bool denoise, int layers, Callback* cbk) {
FileInputStream fileStream; FileInputStream fileStream;
ASSERT_TRUE(fileStream.Open(fileName)); ASSERT_TRUE(fileStream.Open(fileName));
EncodeStream(&fileStream, width, height, frameRate, slices, denoise, layers, cbk); EncodeStream(&fileStream, usageType, width, height, frameRate, slices, denoise, layers, cbk);
} }

2
test/api/decode_encode_test.cpp
View File

@ -95,7 +95,7 @@ TEST_P(DecodeEncodeTest, CompareOutput) {
DecodeEncodeFileParam p = GetParam(); DecodeEncodeFileParam p = GetParam();
ASSERT_TRUE(Open(p.fileName)); ASSERT_TRUE(Open(p.fileName));
EncodeStream(this, p.width, p.height, p.frameRate, SM_SINGLE_SLICE, false, 1, this); EncodeStream(this, CAMERA_VIDEO_REAL_TIME,p.width, p.height, p.frameRate, SM_SINGLE_SLICE, false, 1, this);
unsigned char digest[SHA_DIGEST_LENGTH]; unsigned char digest[SHA_DIGEST_LENGTH];
SHA1Result(&ctx_, digest); SHA1Result(&ctx_, digest);
if (!HasFatalFailure()) { if (!HasFatalFailure()) {

31
test/api/encoder_test.cpp
View File

@ -28,6 +28,7 @@ TEST_F(EncoderInitTest, JustInit) {}
struct EncodeFileParam { struct EncodeFileParam {
const char* fileName; const char* fileName;
const char* hashStr; const char* hashStr;
EUsageType usageType;
int width; int width;
int height; int height;
float frameRate; float frameRate;
@ -56,8 +57,12 @@ class EncoderOutputTest : public ::testing::WithParamInterface<EncodeFileParam>,
TEST_P(EncoderOutputTest, CompareOutput) { TEST_P(EncoderOutputTest, CompareOutput) {
EncodeFileParam p = GetParam(); EncodeFileParam p = GetParam();
EncodeFile(p.fileName, p.width, p.height, p.frameRate, p.slices, p.denoise, p.layers, this); EncodeFile(p.fileName, p.usageType ,p.width, p.height, p.frameRate, p.slices, p.denoise, p.layers, this);
//will remove this after screen content algorithms are ready,
//because the bitstream output will vary when the different algorithms are added.
if(p.usageType == SCREEN_CONTENT_REAL_TIME)
return;
unsigned char digest[SHA_DIGEST_LENGTH]; unsigned char digest[SHA_DIGEST_LENGTH];
SHA1Result(&ctx_, digest); SHA1Result(&ctx_, digest);
if (!HasFatalFailure()) { if (!HasFatalFailure()) {
@ -68,28 +73,40 @@ TEST_P(EncoderOutputTest, CompareOutput) {
static const EncodeFileParam kFileParamArray[] = { static const EncodeFileParam kFileParamArray[] = {
{ {
"res/CiscoVT2people_320x192_12fps.yuv", "res/CiscoVT2people_320x192_12fps.yuv",
"8d4c87f48e8a679c1ccbf5fe1ee040fed4776b30", 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1 "8d4c87f48e8a679c1ccbf5fe1ee040fed4776b30", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1
}, },
{ {
"res/CiscoVT2people_160x96_6fps.yuv", "res/CiscoVT2people_160x96_6fps.yuv",
"75334dc69d95b8ac2e0a52977bba0179df4f151f", 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1 "75334dc69d95b8ac2e0a52977bba0179df4f151f", CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1
}, },
{ {
"res/Static_152_100.yuv", "res/Static_152_100.yuv",
"3467201e18a934e7f8c50f3c8f3e05f4334ad12c", 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1 "3467201e18a934e7f8c50f3c8f3e05f4334ad12c", CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1
}, },
{ {
"res/CiscoVT2people_320x192_12fps.yuv", "res/CiscoVT2people_320x192_12fps.yuv",
"a57c7cc8a00ffe8d8ca5527a13af1683a41b5150", 320, 192, 12.0f, SM_ROWMB_SLICE, false, 1 // One slice per MB row "a57c7cc8a00ffe8d8ca5527a13af1683a41b5150", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_ROWMB_SLICE, false, 1 // One slice per MB row
}, },
{ {
"res/CiscoVT2people_320x192_12fps.yuv", "res/CiscoVT2people_320x192_12fps.yuv",
"bc9b203c1b031299df7981201c2af393994d876f", 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1 "bc9b203c1b031299df7981201c2af393994d876f", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1
}, },
{ {
"res/CiscoVT2people_320x192_12fps.yuv", "res/CiscoVT2people_320x192_12fps.yuv",
"ba81a0f1a14214e6d3c7f1608991b3ac97789370", 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2 "ba81a0f1a14214e6d3c7f1608991b3ac97789370", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2
}, },
{
"res/CiscoVT2people_320x192_12fps.yuv",
"", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1
},
{
"res/CiscoVT2people_160x96_6fps.yuv",
"", SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1
},
{
"res/Static_152_100.yuv",
"", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1
}
}; };
INSTANTIATE_TEST_CASE_P(EncodeFile, EncoderOutputTest, INSTANTIATE_TEST_CASE_P(EncodeFile, EncoderOutputTest,