Merge pull request #1877 from ruil2/vui_base1.4

fix vui writting
cisco · Mar 25, 2015 · 4adf9cd · 4adf9cd
2 parents bdb850d + 343c7f2
commit 4adf9cd
Show file tree

Hide file tree

Showing 5 changed files with 7,687 additions and 7,685 deletions.
diff --git a/codec/encoder/core/src/au_set.cpp b/codec/encoder/core/src/au_set.cpp
@@ -280,10 +280,12 @@ int32_t WelsWriteSpsSyntax (SWelsSPS* pSps, SBitStringAux* pBitStringAux, int32_
     BsWriteUE (pLocalBitStringAux, pSps->sFrameCrop.iCropTop);	// frame_crop_top_offset
     BsWriteUE (pLocalBitStringAux, pSps->sFrameCrop.iCropBottom);	// frame_crop_bottom_offset
   }
-
-  BsWriteOneBit (pLocalBitStringAux, pSps->bVuiParamPresentFlag);	// vui_parameters_present_flag
-  if (pSps->bVuiParamPresentFlag && bBaseLayer)
+  if (bBaseLayer) {
+    BsWriteOneBit (pLocalBitStringAux, true);	// vui_parameters_present_flag
     WelsWriteVUI (pSps, pBitStringAux);
+  } else {
+    BsWriteOneBit (pLocalBitStringAux, false);
+  }
   return 0;
 }
 

diff --git a/test/api/encoder_test.cpp b/test/api/encoder_test.cpp
@@ -123,15 +123,15 @@ static const EncodeFileParam kFileParamArray[] = {
   },
   {
     "res/CiscoVT2people_320x192_12fps.yuv",
-    "5b565e29d5ca6a52982d66bb0224bff52c26db12", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2, false, false, false
+    "c493a8087050d2993f39ad1081940dd707e6fb3e", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2, false, false, false
   },
   {
     "res/Cisco_Absolute_Power_1280x720_30fps.yuv",
     "6cc7d08b2a80fc2836396808f919f9b5d4ee1d97", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false
   },
   {
     "res/Cisco_Absolute_Power_1280x720_30fps.yuv",
-    "c6527d1be6a8b3850bb2e23ca57fc83eb072f40e", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4, false, false, false
+    "cd10602a951712c1b93bef82a445415723e52af6", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4, false, false, false
   },
   // the following values may be adjusted for times since we start tuning the strategy
   {