shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #705 from ruil2/enc_update_2

    update level_idc setting

--- a/codec/encoder/core/inc/parameter_sets.h

+++ b/codec/encoder/core/inc/parameter_sets.h

@@ -82,8 +82,7 @@

 bool		bConstraintSet0Flag;

 bool		bConstraintSet1Flag;

 bool		bConstraintSet2Flag;

-

-//	bool		bConstraintSet3Flag;		// reintroduce constrain_set3_flag instead of reserved filling bytes here

+bool		bConstraintSet3Flag;

 //	bool		bSeparateColorPlaneFlag;  // =false,: only used in decoder, encoder in general_***; it can be removed when removed general up_sample

 } SWelsSPS, *PWelsSPS;

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

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

@@ -144,7 +144,7 @@

   BsWriteOneBit (pLocalBitStringAux, pSps->bConstraintSet0Flag);	// bConstraintSet0Flag

   BsWriteOneBit (pLocalBitStringAux, pSps->bConstraintSet1Flag);	// bConstraintSet1Flag

   BsWriteOneBit (pLocalBitStringAux, pSps->bConstraintSet2Flag);	// bConstraintSet2Flag

-  BsWriteOneBit (pLocalBitStringAux, 0/*pSps->bConstraintSet3Flag*/);	// bConstraintSet3Flag

+  BsWriteOneBit (pLocalBitStringAux, pSps->bConstraintSet3Flag);	// bConstraintSet3Flag

   BsWriteBits (pLocalBitStringAux, 4, 0);							// reserved_zero_4bits, equal to 0

   BsWriteBits (pLocalBitStringAux, 8, pSps->iLevelIdc);				// iLevelIdc

   BsWriteUE (pLocalBitStringAux, pSps->uiSpsId + pSpsIdDelta[pSps->uiSpsId]);					     // seq_parameter_set_id

@@ -364,7 +364,6 @@

   return (iWidth > iActualWidth) || (iHeight > iActualHeight);

 }

-

 int32_t WelsInitSps (SWelsSPS* pSps, SDLayerParam* pLayerParam, const uint32_t kuiIntraPeriod,

                      const int32_t kiNumRefFrame,

                      const uint32_t kuiSpsId, const bool kbEnableFrameCropping, bool bEnableRc) {

@@ -403,6 +402,13 @@

     pSps->iLevelIdc  = WelsGetLevelIdc (pSps, pLayerParam->fOutputFrameRate,

                                         0); // Set tar_br = 0 to remove the bitrate constraint; a better way is to set actual tar_br as 0

+  //for Scalable Baseline, Scalable High, and Scalable High Intra profiles.If level_idc is equal to 9, the indicated level is level 1b.

+  //for the Baseline, Constrained Baseline, Main, and Extended profiles,If level_idc is equal to 11 and constraint_set3_flag is equal to 1, the indicated level is level 1b.

+  if((pSps->iLevelIdc == 9)&&

+    ((pSps->uiProfileIdc == PRO_BASELINE) ||(pSps->uiProfileIdc == PRO_MAIN)||(pSps->uiProfileIdc == PRO_EXTENDED))) {

+    pSps->iLevelIdc = 11;

+    pSps->bConstraintSet3Flag = true;

+  }

   return 0;

 }