Skip to content

Commit 4adf9cd

Browse files
committed
Merge pull request #1877 from ruil2/vui_base1.4
fix vui writting
2 parents bdb850d + 343c7f2 commit 4adf9cd

File tree

5 files changed

+7687
-7685
lines changed

5 files changed

+7687
-7685
lines changed

codec/encoder/core/src/au_set.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,12 @@ int32_t WelsWriteSpsSyntax (SWelsSPS* pSps, SBitStringAux* pBitStringAux, int32_
280280
BsWriteUE (pLocalBitStringAux, pSps->sFrameCrop.iCropTop); // frame_crop_top_offset
281281
BsWriteUE (pLocalBitStringAux, pSps->sFrameCrop.iCropBottom); // frame_crop_bottom_offset
282282
}
283-
284-
BsWriteOneBit (pLocalBitStringAux, pSps->bVuiParamPresentFlag); // vui_parameters_present_flag
285-
if (pSps->bVuiParamPresentFlag && bBaseLayer)
283+
if (bBaseLayer) {
284+
BsWriteOneBit (pLocalBitStringAux, true); // vui_parameters_present_flag
286285
WelsWriteVUI (pSps, pBitStringAux);
286+
} else {
287+
BsWriteOneBit (pLocalBitStringAux, false);
288+
}
287289
return 0;
288290
}
289291

test/api/encoder_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,15 @@ static const EncodeFileParam kFileParamArray[] = {
123123
},
124124
{
125125
"res/CiscoVT2people_320x192_12fps.yuv",
126-
"5b565e29d5ca6a52982d66bb0224bff52c26db12", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2, false, false, false
126+
"c493a8087050d2993f39ad1081940dd707e6fb3e", 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",
130130
"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",
134-
"c6527d1be6a8b3850bb2e23ca57fc83eb072f40e", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4, false, false, false
134+
"cd10602a951712c1b93bef82a445415723e52af6", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4, false, false, false
135135
},
136136
// the following values may be adjusted for times since we start tuning the strategy
137137
{

0 commit comments

Comments
 (0)