shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #714 from ruil2/enc_setting

  add usagetype parameter in encoder unit test to test screen content

--- a/codec/encoder/core/src/encoder_ext.cpp

+++ b/codec/encoder/core/src/encoder_ext.cpp

@@ -2446,7 +2446,8 @@

       pFuncList->pfInterFineMd = WelsMdInterFinePartition;

     }

   }

-

+  

+  return;

   //to init at each frame will be needed when dealing with hybrid content (camera+screen)

   if (pCtx->pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME) {

     SFeatureSearchPreparation* pFeatureSearchPreparation = pCurLayer->pFeatureSearchPreparation;

--- a/test/BaseEncoderTest.h

+++ b/test/BaseEncoderTest.h

@@ -14,8 +14,8 @@

   BaseEncoderTest();

   void SetUp();

   void TearDown();

-  void EncodeFile(const char* fileName, 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 EncodeFile(const char* fileName, EUsageType usageType, 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:

   ISVCEncoder* encoder_;

--- a/test/api/BaseEncoderTest.cpp

+++ b/test/api/BaseEncoderTest.cpp

@@ -5,12 +5,13 @@

 #include "utils/FileInputStream.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) {

   if (SM_SINGLE_SLICE == sliceMode && !denoise && layers == 1) {

     SEncParamBase param;

     memset (&param, 0, sizeof(SEncParamBase));

-

+    

+    param.iUsageType = usageType;

     param.fMaxFrameRate = frameRate;

     param.iPicWidth = width;

     param.iPicHeight = height;

@@ -22,6 +23,7 @@

     SEncParamExt param;

     encoder->GetDefaultParams(&param);

+    param.iUsageType = usageType;

     param.fMaxFrameRate = frameRate;

     param.iPicWidth = width;

     param.iPicHeight = height;

@@ -61,9 +63,9 @@

   }

 }

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

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

   // I420: 1(Y) + 1/4(U) + 1/4(V)

@@ -95,9 +97,9 @@

   }

 }

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

   FileInputStream fileStream;

   ASSERT_TRUE(fileStream.Open(fileName));

-  EncodeStream(&fileStream, width, height, frameRate, slices, denoise, layers, cbk);

+  EncodeStream(&fileStream, usageType, width, height, frameRate, slices, denoise, layers, cbk);

 }

--- a/test/api/decode_encode_test.cpp

+++ b/test/api/decode_encode_test.cpp

@@ -95,7 +95,7 @@

   DecodeEncodeFileParam p = GetParam();

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

   SHA1Result(&ctx_, digest);

   if (!HasFatalFailure()) {

--- a/test/api/encoder_test.cpp

+++ b/test/api/encoder_test.cpp

@@ -28,6 +28,7 @@

 struct EncodeFileParam {

   const char* fileName;

   const char* hashStr;

+  EUsageType usageType;

   int width;

   int height;

   float frameRate;

@@ -56,8 +57,12 @@

 TEST_P(EncoderOutputTest, CompareOutput) {

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

   SHA1Result(&ctx_, digest);

   if (!HasFatalFailure()) {

@@ -68,28 +73,40 @@

 static const EncodeFileParam kFileParamArray[] = {

   {

       "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",

-      "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",

-      "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",

-      "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",

-      "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",

-      "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,