merge level table

ruil2 committed 12 years ago

Commit 493d2541 parent 49f8fe85 files · +227 −249Browse files

Showing the changes to codec/decoder/core/src/au_parser.cpp (1 of 5 files). Show all

Unified · Split

codec/decoder/core/src/au_parser.cpp+21−42

   return 0;
 }
-// table A-1 - Level limits
-static const SLevelLimits g_kSLevelLimits[17] = {
-  {1485, 99, 396, 64, 175, -256, 255, 2, 0x7fff}, /* level 1 */
-  {1485, 99, 396, 128, 350, -256, 255, 2, 0x7fff}, /* level 1.b */
-  {3000, 396, 900, 192, 500, -512, 511, 2, 0x7fff}, /* level 1.1 */
-  {6000, 396, 2376, 384, 1000, -512, 511, 2, 0x7fff}, /* level 1.2 */
-  {11880, 396, 2376, 768, 2000, -512, 511, 2, 0x7fff}, /* level 1.3 */
-  {11880, 396, 2376, 2000, 2000, -512, 511, 2, 0x7fff}, /* level 2 */
-  {19800, 792, 4752, 4000, 4000, -1024, 1023, 2, 0x7fff}, /* level 2.1 */
-  {20250, 1620, 8100, 4000, 4000, -1024, 1023, 2, 0x7fff}, /* level 2.2 */
-  {40500, 1620, 8100, 10000, 10000, -1024, 1023, 2, 32 }, /* level 3 */
-  {108000, 3600, 18000, 14000, 14000, -2048, 2047, 4, 16}, /* level 3.1 */
-  {216000, 5120, 20480, 20000, 20000, -2048, 2047, 4, 16}, /* level 3.2 */
-  {245760, 8192, 32768, 20000, 25000, -2048, 2047, 4, 16}, /* level 4 */
-  {245760, 8192, 32768, 50000, 62500, -2048, 2047, 2, 16}, /* level 4.1 */
-  {522240, 8704, 34816, 50000, 62500, -2048, 2047, 2, 16}, /* level 4.2 */
-  {589824, 22080, 110400, 135000, 135000, -2048, 2047, 2, 16}, /* level 5 */
-  {983040, 36864, 184320, 240000, 240000, -2048, 2047, 2, 16}, /* level 5.1 */
-  {2073600, 36864, 184320, 240000, 240000, -2048, 2047, 2, 16} /* level 5.2 */
-};
 const SLevelLimits* GetLevelLimits (int32_t iLevelIdx, bool bConstraint3) {
   switch (iLevelIdx) {
   case 10:
-    return &g_kSLevelLimits[0];
+    return &g_ksLevelLimits[0];
   case 11:
     if (bConstraint3)
-      return &g_kSLevelLimits[1];
+      return &g_ksLevelLimits[1];
     else
-      return &g_kSLevelLimits[2];
+      return &g_ksLevelLimits[2];
   case 12:
-    return &g_kSLevelLimits[3];
+    return &g_ksLevelLimits[3];
   case 13:
-    return &g_kSLevelLimits[4];
+    return &g_ksLevelLimits[4];
   case 20:
-    return &g_kSLevelLimits[5];
+    return &g_ksLevelLimits[5];
   case 21:
-    return &g_kSLevelLimits[6];
+    return &g_ksLevelLimits[6];
   case 22:
-    return &g_kSLevelLimits[7];
+    return &g_ksLevelLimits[7];
   case 30:
-    return &g_kSLevelLimits[8];
+    return &g_ksLevelLimits[8];
   case 31:
-    return &g_kSLevelLimits[9];
+    return &g_ksLevelLimits[9];
   case 32:
-    return &g_kSLevelLimits[10];
+    return &g_ksLevelLimits[10];
   case 40:
-    return &g_kSLevelLimits[11];
+    return &g_ksLevelLimits[11];
   case 41:
-    return &g_kSLevelLimits[12];
+    return &g_ksLevelLimits[12];
   case 42:
-    return &g_kSLevelLimits[13];
+    return &g_ksLevelLimits[13];
   case 50:
-    return &g_kSLevelLimits[14];
+    return &g_ksLevelLimits[14];
   case 51:
-    return &g_kSLevelLimits[15];
+    return &g_ksLevelLimits[15];
   case 52:
-    return &g_kSLevelLimits[16];
+    return &g_ksLevelLimits[16];
   default:
     return NULL;
   }
     WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "pic_width_in_mbs(%d) exceeds the maximum allowed!\n", pSps->iMbWidth);
     return  GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_MAX_MB_SIZE);
   }
-  if (((uint64_t)pSps->iMbWidth * (uint64_t)pSps->iMbWidth) > (uint64_t) (8 * pSLevelLimits->iMaxFS)) {
+  if (((uint64_t)pSps->iMbWidth * (uint64_t)pSps->iMbWidth) > (uint64_t) (8 * pSLevelLimits->uiMaxFS)) {
     WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, " the pic_width_in_mbs exceeds the level limits!\n");
   }
   WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //pic_height_in_map_units_minus1
     WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "pic_height_in_mbs(%d) exceeds the maximum allowed!\n", pSps->iMbHeight);
     return  GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_MAX_MB_SIZE);
   }
-  if (((uint64_t)pSps->iMbHeight * (uint64_t)pSps->iMbHeight) > (uint64_t) (8 * pSLevelLimits->iMaxFS)) {
+  if (((uint64_t)pSps->iMbHeight * (uint64_t)pSps->iMbHeight) > (uint64_t) (8 * pSLevelLimits->uiMaxFS)) {
     WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, " the pic_height_in_mbs exceeds the level limits!\n");
   }
   uint32_t uiTmp32 = pSps->iMbWidth * pSps->iMbHeight;
-  if (uiTmp32 > (uint32_t)pSLevelLimits->iMaxFS) {
+  if (uiTmp32 > (uint32_t)pSLevelLimits->uiMaxFS) {
     WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, " the total count of mb exceeds the level limits!\n");
   }
   pSps->uiTotalMbCount	= uiTmp32;
   WELS_CHECK_SE_UPPER_ERROR (pSps->iNumRefFrames, SPS_MAX_NUM_REF_FRAMES_MAX, "max_num_ref_frames",
                              GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_MAX_NUM_REF_FRAMES));
   // here we check max_num_ref_frames
-  uint32_t uiMaxDpbMbs = pSLevelLimits->iMaxDPBMbs;
+  uint32_t uiMaxDpbMbs = pSLevelLimits->uiMaxDPBMbs;
   uint32_t uiMaxDpbFrames = uiMaxDpbMbs / pSps->uiTotalMbCount;
   if (uiMaxDpbFrames > SPS_MAX_NUM_REF_FRAMES_MAX)
     uiMaxDpbFrames = SPS_MAX_NUM_REF_FRAMES_MAX;

merge level table

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code