Skip to content

Commit 52cb8c1

Browse files
sijchensijchen
committed
Merge pull request #1866 from ruil2/flag_change
Flag change
2 parents 3cbcc04 + 4406894 commit 52cb8c1

File tree

11 files changed

+7739
-7727
lines changed

11 files changed

+7739
-7727
lines changed

‎codec/encoder/core/inc/au_set.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ int32_t WelsWritePpsSyntax (SWelsPPS* pPps, SBitStringAux* pBitStringAux, SParaS
107107
int32_t WelsInitSps (SWelsSPS* pSps, SSpatialLayerConfig* pLayerParam, SSpatialLayerInternal* pLayerParamInternal,
108108
const uint32_t kuiIntraPeriod, const int32_t kiNumRefFrame,
109109
const uint32_t kiSpsId, const bool kbEnableFrameCropping, bool bEnableRc,
110-
const int32_t kiDlayerCount);
110+
const int32_t kiDlayerCount,bool bSVCBaselayer);
111111

112112
/*!
113113
* \brief initialize subset pSps based on configurable parameters in svc
@@ -121,7 +121,8 @@ int32_t WelsInitSps (SWelsSPS* pSps, SSpatialLayerConfig* pLayerParam, SSpatialL
121121
int32_t WelsInitSubsetSps (SSubsetSps* pSubsetSps, SSpatialLayerConfig* pLayerParam,
122122
SSpatialLayerInternal* pLayerParamInternal,
123123
const uint32_t kuiIntraPeriod, const int32_t kiNumRefFrame,
124-
const uint32_t kiSpsId, const bool kbEnableFrameCropping, bool bEnableRc);
124+
const uint32_t kiSpsId, const bool kbEnableFrameCropping, bool bEnableRc,
125+
const int32_t kiDlayerCount);
125126

126127
/*!
127128
* \brief initialize pPps based on configurable parameters and pSps(subset pSps) in svc
@@ -161,6 +162,7 @@ int32_t WelsAdjustLevel (SSpatialLayerConfig* pSpatialLayer);
161162
int32_t FindExistingSps (SWelsSvcCodingParam* pParam, const bool kbUseSubsetSps, const int32_t iDlayerIndex,
162163
const int32_t iDlayerCount, const int32_t iSpsNumInUse,
163164
SWelsSPS* pSpsArray,
164-
SSubsetSps* pSubsetArray);
165+
SSubsetSps* pSubsetArray,
166+
bool bSVCBaselayer);
165167
}
166168
#endif//WELS_ACCESS_UNIT_PARSER_H__

‎codec/encoder/core/inc/parameter_sets.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ uint8_t iLevelIdc;
6868
// uint8_t uiBitDepthChroma; //=8
6969
/* TO BE CONTINUE: POC type 1 */
7070
// bool bDeltaPicOrderAlwaysZeroFlag;
71-
// bool bGapsInFrameNumValueAllowedFlag; //=true
71+
bool bGapsInFrameNumValueAllowedFlag;
7272

7373
// bool bFrameMbsOnlyFlag;
7474
// bool bMbaffFlag; // MB Adapative Frame Field

‎codec/encoder/core/src/au_set.cpp‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ int32_t WelsWriteSpsSyntax (SWelsSPS* pSps, SBitStringAux* pBitStringAux, int32_
267267
BsWriteUE (pLocalBitStringAux, pSps->iLog2MaxPocLsb - 4); // log2_max_pic_order_cnt_lsb_minus4
268268

269269
BsWriteUE (pLocalBitStringAux, pSps->iNumRefFrames); // max_num_ref_frames
270-
BsWriteOneBit (pLocalBitStringAux, true/*pSps->bGapsInFrameNumValueAllowedFlag*/); // bGapsInFrameNumValueAllowedFlag
270+
BsWriteOneBit (pLocalBitStringAux, pSps->bGapsInFrameNumValueAllowedFlag); //gaps_in_frame_numvalue_allowed_flag
271271
BsWriteUE (pLocalBitStringAux, pSps->iMbWidth - 1); // pic_width_in_mbs_minus1
272272
BsWriteUE (pLocalBitStringAux, pSps->iMbHeight - 1); // pic_height_in_map_units_minus1
273273
BsWriteOneBit (pLocalBitStringAux, true/*pSps->bFrameMbsOnlyFlag*/); // bFrameMbsOnlyFlag
@@ -464,7 +464,7 @@ static inline bool WelsGetPaddingOffset (int32_t iActualWidth, int32_t iActualHe
464464
int32_t WelsInitSps (SWelsSPS* pSps, SSpatialLayerConfig* pLayerParam, SSpatialLayerInternal* pLayerParamInternal,
465465
const uint32_t kuiIntraPeriod, const int32_t kiNumRefFrame,
466466
const uint32_t kuiSpsId, const bool kbEnableFrameCropping, bool bEnableRc,
467-
const int32_t kiDlayerCount) {
467+
const int32_t kiDlayerCount, bool bSVCBaselayer) {
468468
memset (pSps, 0, sizeof (SWelsSPS));
469469
pSps->uiSpsId = kuiSpsId;
470470
pSps->iMbWidth = (pLayerParam->iVideoWidth + 15) >> 4;
@@ -483,15 +483,14 @@ int32_t WelsInitSps (SWelsSPS* pSps, SSpatialLayerConfig* pLayerParam, SSpatialL
483483
} else {
484484
pSps->bFrameCroppingFlag = false;
485485
}
486-
487486
pSps->uiProfileIdc = pLayerParam->uiProfileIdc ? pLayerParam->uiProfileIdc : PRO_BASELINE;
488487
if (pLayerParam->uiProfileIdc == PRO_BASELINE) {
489488
pSps->bConstraintSet0Flag = true;
490489
}
491490
if (pLayerParam->uiProfileIdc <= PRO_MAIN) {
492491
pSps->bConstraintSet1Flag = true;
493492
}
494-
if (kiDlayerCount > 1) {
493+
if ((kiDlayerCount > 1) && bSVCBaselayer) {
495494
pSps->bConstraintSet2Flag = true;
496495
}
497496

@@ -508,6 +507,13 @@ int32_t WelsInitSps (SWelsSPS* pSps, SSpatialLayerConfig* pLayerParam, SSpatialL
508507
pLayerParam->uiLevelIdc = uiLevel;
509508
}
510509
pSps->iLevelIdc = g_kuiLevelMaps[pLayerParam->uiLevelIdc - 1];
510+
511+
//bGapsInFrameNumValueAllowedFlag is false when only spatial layer number and temporal layer number is 1, and ltr is 0.
512+
if ((kiDlayerCount == 1) && (pSps->iNumRefFrames == 1))
513+
pSps->bGapsInFrameNumValueAllowedFlag = false;
514+
else
515+
pSps->bGapsInFrameNumValueAllowedFlag = true;
516+
511517
pSps->bVuiParamPresentFlag = true;
512518
return 0;
513519
}
@@ -516,13 +522,14 @@ int32_t WelsInitSps (SWelsSPS* pSps, SSpatialLayerConfig* pLayerParam, SSpatialL
516522
int32_t WelsInitSubsetSps (SSubsetSps* pSubsetSps, SSpatialLayerConfig* pLayerParam,
517523
SSpatialLayerInternal* pLayerParamInternal,
518524
const uint32_t kuiIntraPeriod, const int32_t kiNumRefFrame,
519-
const uint32_t kuiSpsId, const bool kbEnableFrameCropping, bool bEnableRc) {
525+
const uint32_t kuiSpsId, const bool kbEnableFrameCropping, bool bEnableRc,
526+
const int32_t kiDlayerCount) {
520527
SWelsSPS* pSps = &pSubsetSps->pSps;
521528

522529
memset (pSubsetSps, 0, sizeof (SSubsetSps));
523530

524531
WelsInitSps (pSps, pLayerParam, pLayerParamInternal, kuiIntraPeriod, kiNumRefFrame, kuiSpsId, kbEnableFrameCropping,
525-
bEnableRc, 1);
532+
bEnableRc, kiDlayerCount, false);
526533

527534
pSps->uiProfileIdc = (pLayerParam->uiProfileIdc >= PRO_SCALABLE_BASELINE) ? pLayerParam->uiProfileIdc :
528535
PRO_SCALABLE_BASELINE;

‎codec/encoder/core/src/encoder_ext.cpp‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,7 @@ void FreeMbCache (SMbCache* pMbCache, CMemoryAlign* pMa) {
898898

899899
static int32_t WelsGenerateNewSps (sWelsEncCtx* pCtx, const bool kbUseSubsetSps, const int32_t iDlayerIndex,
900900
const int32_t iDlayerCount, const int32_t kiSpsId,
901-
SWelsSPS*& pSps, SSubsetSps*& pSubsetSps) {
901+
SWelsSPS*& pSps, SSubsetSps*& pSubsetSps, bool bSVCBaselayer) {
902902
int32_t iRet = 0;
903903

904904
if (!kbUseSubsetSps) {
@@ -914,11 +914,12 @@ static int32_t WelsGenerateNewSps (sWelsEncCtx* pCtx, const bool kbUseSubsetSps,
914914
if (!kbUseSubsetSps) {
915915
iRet = WelsInitSps (pSps, pDlayerParam, &pParam->sDependencyLayers[iDlayerIndex], pParam->uiIntraPeriod,
916916
pParam->iMaxNumRefFrame,
917-
kiSpsId, pParam->bEnableFrameCroppingFlag, pParam->iRCMode != RC_OFF_MODE, iDlayerCount);
917+
kiSpsId, pParam->bEnableFrameCroppingFlag, pParam->iRCMode != RC_OFF_MODE, iDlayerCount,
918+
bSVCBaselayer);
918919
} else {
919920
iRet = WelsInitSubsetSps (pSubsetSps, pDlayerParam, &pParam->sDependencyLayers[iDlayerIndex], pParam->uiIntraPeriod,
920921
pParam->iMaxNumRefFrame,
921-
kiSpsId, pParam->bEnableFrameCroppingFlag, pParam->iRCMode != RC_OFF_MODE);
922+
kiSpsId, pParam->bEnableFrameCroppingFlag, pParam->iRCMode != RC_OFF_MODE, iDlayerCount);
922923
}
923924
return iRet;
924925
}
@@ -978,15 +979,16 @@ static bool CheckMatchedSubsetSps (SSubsetSps* const pSubsetSps1, SSubsetSps* co
978979
int32_t FindExistingSps (SWelsSvcCodingParam* pParam, const bool kbUseSubsetSps, const int32_t iDlayerIndex,
979980
const int32_t iDlayerCount, const int32_t iSpsNumInUse,
980981
SWelsSPS* pSpsArray,
981-
SSubsetSps* pSubsetArray) {
982+
SSubsetSps* pSubsetArray, bool bSVCBaseLayer) {
982983
SSpatialLayerConfig* pDlayerParam = &pParam->sSpatialLayers[iDlayerIndex];
983984

984985
assert (iSpsNumInUse <= MAX_SPS_COUNT);
985986
if (!kbUseSubsetSps) {
986987
SWelsSPS sTmpSps;
987988
WelsInitSps (&sTmpSps, pDlayerParam, &pParam->sDependencyLayers[iDlayerIndex], pParam->uiIntraPeriod,
988989
pParam->iMaxNumRefFrame,
989-
0, pParam->bEnableFrameCroppingFlag, pParam->iRCMode != RC_OFF_MODE, iDlayerCount);
990+
0, pParam->bEnableFrameCroppingFlag, pParam->iRCMode != RC_OFF_MODE, iDlayerCount,
991+
bSVCBaseLayer);
990992
for (int32_t iId = 0; iId < iSpsNumInUse; iId++) {
991993
if (CheckMatchedSps (&sTmpSps, &pSpsArray[iId])) {
992994
return iId;
@@ -996,7 +998,7 @@ int32_t FindExistingSps (SWelsSvcCodingParam* pParam, const bool kbUseSubsetSps,
996998
SSubsetSps sTmpSubsetSps;
997999
WelsInitSubsetSps (&sTmpSubsetSps, pDlayerParam, &pParam->sDependencyLayers[iDlayerIndex], pParam->uiIntraPeriod,
9981000
pParam->iMaxNumRefFrame,
999-
0, pParam->bEnableFrameCroppingFlag, pParam->iRCMode != RC_OFF_MODE);
1001+
0, pParam->bEnableFrameCroppingFlag, pParam->iRCMode != RC_OFF_MODE, iDlayerCount);
10001002

10011003
for (int32_t iId = 0; iId < iSpsNumInUse; iId++) {
10021004
if (CheckMatchedSubsetSps (&sTmpSubsetSps, &pSubsetArray[iId])) {
@@ -1258,19 +1260,20 @@ static inline int32_t InitDqLayers (sWelsEncCtx** ppCtx, SExistingParasetList* p
12581260
SDqIdc* pDqIdc = & (*ppCtx)->pDqIdcMap[iDlayerIndex];
12591261
const bool bUseSubsetSps = (!pParam->bSimulcastAVC) && (iDlayerIndex > BASE_DEPENDENCY_ID);
12601262
SSpatialLayerConfig* pDlayerParam = &pParam->sSpatialLayers[iDlayerIndex];
1261-
1263+
bool bSvcBaselayer = (!pParam->bSimulcastAVC) && (iDlayerCount > BASE_DEPENDENCY_ID)
1264+
&& (iDlayerIndex == BASE_DEPENDENCY_ID);
12621265
pDqIdc->uiSpatialId = iDlayerIndex;
12631266

12641267
if (! (SPS_LISTING & pParam->eSpsPpsIdStrategy)) {
12651268
WelsGenerateNewSps (*ppCtx, bUseSubsetSps, iDlayerIndex,
1266-
iDlayerCount, iSpsId, pSps, pSubsetSps);
1269+
iDlayerCount, iSpsId, pSps, pSubsetSps, bSvcBaselayer);
12671270
} else {
12681271
//SPS_LISTING_AND_PPS_INCREASING == pParam->eSpsPpsIdStrategy
12691272
//check if the current param can fit in an existing SPS
12701273
const int32_t kiFoundSpsId = FindExistingSps ((*ppCtx)->pSvcParam, bUseSubsetSps, iDlayerIndex, iDlayerCount,
12711274
bUseSubsetSps ? ((*ppCtx)->sPSOVector.uiInUseSubsetSpsNum) : ((*ppCtx)->sPSOVector.uiInUseSpsNum),
12721275
(*ppCtx)->pSpsArray,
1273-
(*ppCtx)->pSubsetArray);
1276+
(*ppCtx)->pSubsetArray, bSvcBaselayer);
12741277

12751278

12761279
if (INVALID_ID != kiFoundSpsId) {
@@ -1309,7 +1312,7 @@ static inline int32_t InitDqLayers (sWelsEncCtx** ppCtx, SExistingParasetList* p
13091312
}
13101313

13111314
WelsGenerateNewSps (*ppCtx, bUseSubsetSps, iDlayerIndex,
1312-
iDlayerCount, iSpsId, pSps, pSubsetSps);
1315+
iDlayerCount, iSpsId, pSps, pSubsetSps, bSvcBaselayer);
13131316
}
13141317
}
13151318

‎test/api/decode_encode_test.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class DecodeEncodeTest : public ::testing::TestWithParam<DecodeEncodeFileParam>,
9191
BufferedData buf_;
9292
};
9393

94-
void DecEncFileParamToParamExt (DecodeEncodeFileParam * pDecEncFileParam, SEncParamExt* pEnxParamExt) {
94+
void DecEncFileParamToParamExt (DecodeEncodeFileParam* pDecEncFileParam, SEncParamExt* pEnxParamExt) {
9595
ASSERT_TRUE (NULL != pDecEncFileParam && NULL != pEnxParamExt);
9696

9797
pEnxParamExt->iPicWidth = pDecEncFileParam->width;
@@ -107,14 +107,14 @@ void DecEncFileParamToParamExt (DecodeEncodeFileParam * pDecEncFileParam, SEncPa
107107
pEnxParamExt->iEntropyCodingModeFlag = 0;
108108

109109
for (int i = 0; i < pEnxParamExt->iSpatialLayerNum; i++) {
110-
pEnxParamExt->sSpatialLayers[i].sSliceCfg.uiSliceMode = SM_SINGLE_SLICE;
110+
pEnxParamExt->sSpatialLayers[i].sSliceCfg.uiSliceMode = SM_SINGLE_SLICE;
111111
}
112112

113113
}
114114
TEST_P (DecodeEncodeTest, CompareOutput) {
115115
DecodeEncodeFileParam p = GetParam();
116116
SEncParamExt EnxParamExt;
117-
DecEncFileParamToParamExt(&p,&EnxParamExt);
117+
DecEncFileParamToParamExt (&p, &EnxParamExt);
118118

119119
#if defined(ANDROID_NDK)
120120
std::string filename = std::string ("/sdcard/") + p.fileName;
@@ -130,8 +130,8 @@ TEST_P (DecodeEncodeTest, CompareOutput) {
130130
}
131131
}
132132
static const DecodeEncodeFileParam kFileParamArray[] = {
133-
{"res/test_vd_1d.264", "26318fb8f0a9dfb27851d4d95f1743d94673f085", 320, 192, 12.0f},
134-
{"res/test_vd_rc.264", "39c0b66d769c6050fd87114c7d9e9217ed594e00", 320, 192, 12.0f},
133+
{"res/test_vd_1d.264", "9d4d682679a0746edda2824687f00ba6db91a2a8", 320, 192, 12.0f},
134+
{"res/test_vd_rc.264", "23dab419a16c6e894518ca93444666e9336aef63", 320, 192, 12.0f},
135135
};
136136

137137

‎test/api/encode_decode_api_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1707,7 +1707,7 @@ TEST_F (EncodeDecodeTestAPI, SetOptionECIDC_SpecificFrameChange) {
17071707
EXPECT_EQ (dstBufInfo_.iBufferStatus, 0); //no output
17081708
rv = decoder_->DecodeFrame2 (NULL, 0, pData, &dstBufInfo_); //reconstruction
17091709
//Ref picture is ECed, so current status is ECed, when EC disable, NO output
1710-
EXPECT_TRUE ((rv & 32) != 0);
1710+
EXPECT_TRUE (rv != 0);
17111711
EXPECT_EQ (dstBufInfo_.iBufferStatus, 0);
17121712
iIdx++;
17131713

‎test/api/encoder_test.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void EncFileParamToParamExt (EncodeFileParam* pEncFileParam, SEncParamExt* pEnxP
5656
pEnxParamExt->iEntropyCodingModeFlag = pEncFileParam->bCabac ? 1 : 0;
5757

5858
for (int i = 0; i < pEnxParamExt->iSpatialLayerNum; i++) {
59-
pEnxParamExt->sSpatialLayers[i].sSliceCfg.uiSliceMode = pEncFileParam->eSliceMode;
59+
pEnxParamExt->sSpatialLayers[i].sSliceCfg.uiSliceMode = pEncFileParam->eSliceMode;
6060
}
6161

6262
}
@@ -90,7 +90,7 @@ TEST_P (EncoderOutputTest, CompareOutput) {
9090
std::string filename = std::string ("/sdcard/") + p.pkcFileName;
9191
EncodeFile (p.pkcFileName, &EnxParamExt, this);
9292
#else
93-
EncodeFile (p.pkcFileName, &EnxParamExt, this);
93+
EncodeFile (p.pkcFileName, &EnxParamExt, this);
9494
#endif
9595
//will remove this after screen content algorithms are ready,
9696
//because the bitstream output will vary when the different algorithms are added.
@@ -103,31 +103,31 @@ TEST_P (EncoderOutputTest, CompareOutput) {
103103
static const EncodeFileParam kFileParamArray[] = {
104104
{
105105
"res/CiscoVT2people_320x192_12fps.yuv",
106-
"996a3bab4d2f6142f408c24b151e03135bd58681", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false
106+
"e36b6169dcb5bbb90e64291250ec65995d62c846", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false
107107
},
108108
{
109109
"res/CiscoVT2people_160x96_6fps.yuv",
110-
"4df94f5187c5aded3f940e29e5821297262e4862", CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false
110+
"04c73f202a29befd57ee49d242688f3e6ddfecbc", CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false
111111
},
112112
{
113113
"res/Static_152_100.yuv",
114-
"e0c620d732e5b0af53fbbe9c6b83bd79681af89a", CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false
114+
"c959ae52c5469bfc37bb31870c6a7259a1bb1917", CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false
115115
},
116116
{
117117
"res/CiscoVT2people_320x192_12fps.yuv",
118-
"ab8fded9d2a5513cd635118a5ea93cacf24ab82f", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_ROWMB_SLICE, false, 1, false, false, false // One slice per MB row
118+
"f03ca6a679cd12c90542e351eabfce0d902ffad2", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_ROWMB_SLICE, false, 1, false, false, false // One slice per MB row
119119
},
120120
{
121121
"res/CiscoVT2people_320x192_12fps.yuv",
122-
"c0372e3a02da479eba5552230f56ff6730870d17", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false
122+
"c7f37486e00c1f18715c7aaf10444f03111418cf", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false
123123
},
124124
{
125125
"res/CiscoVT2people_320x192_12fps.yuv",
126126
"5b565e29d5ca6a52982d66bb0224bff52c26db12", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2, false, false, false
127127
},
128128
{
129129
"res/Cisco_Absolute_Power_1280x720_30fps.yuv",
130-
"ace9511444c022b860abe09ea3ec5884079351aa", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false
130+
"6cc7d08b2a80fc2836396808f919f9b5d4ee1d97", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false
131131
},
132132
{
133133
"res/Cisco_Absolute_Power_1280x720_30fps.yuv",
@@ -136,19 +136,19 @@ static const EncodeFileParam kFileParamArray[] = {
136136
// the following values may be adjusted for times since we start tuning the strategy
137137
{
138138
"res/CiscoVT2people_320x192_12fps.yuv",
139-
"f1639ba3e71f45b975e39322d61ff2efe3c50c0d", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false
139+
"9b8ba682313ed9cd0512563859e050942a3e776e", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false
140140
},
141141
{
142142
"res/CiscoVT2people_160x96_6fps.yuv",
143-
"fad7e2a9fc012ab356748092650dc40ed2253251", SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false
143+
"2706c61e9459196b4161f4bbb9444a08308ae8c5", SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false
144144
},
145145
{
146146
"res/Static_152_100.yuv",
147-
"4869652f5ed64b840295d03d7be352e8c0504afc", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false
147+
"d8457a47946e91b01310d8de9afa21ac00df8edb", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false
148148
},
149149
{
150150
"res/Cisco_Absolute_Power_1280x720_30fps.yuv",
151-
"9303a2e142475c8f8637129ebfed0089a8c8f4a2", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false
151+
"116663b5a00f000ab40e95b6202563e3cb4ce488", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false
152152
},
153153
//for different strategy
154154
{
@@ -157,11 +157,11 @@ static const EncodeFileParam kFileParamArray[] = {
157157
},
158158
{
159159
"res/CiscoVT2people_320x192_12fps.yuv",
160-
"dd281aa3857dc69246d5ac4942ccd7baa8cd80e9", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac
160+
"7aaab6ef2dc5f95c3a2869979eba59553936e36f", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac
161161
},
162162
{
163163
"res/Cisco_Absolute_Power_1280x720_30fps.yuv",
164-
"15850f7047a65d15a682e3c7ffc88c4bdaea6d15", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, true
164+
"bb8ee13f829fa593b77760afdeb1215d0a577ee1", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, true
165165
},
166166
};
167167

0 commit comments

Comments
 (0)