shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1794 from syureyi/monochroma

to support monochroma

--- a/codec/decoder/core/inc/dec_golomb.h

+++ b/codec/decoder/core/inc/dec_golomb.h

@@ -89,7 +89,9 @@

 // for data sharing cross modules and try to reduce size of binary generated, 12/10/2009

 extern const uint8_t g_kuiIntra4x4CbpTable[48];

+    extern const uint8_t g_kuiIntra4x4CbpTable400[16];

 extern const uint8_t g_kuiInterCbpTable[48];

+    extern const uint8_t g_kuiInterCbpTable400[16];

 extern const uint8_t g_kuiLeadingZeroTable[256];

--- a/codec/decoder/core/src/au_parser.cpp

+++ b/codec/decoder/core/src/au_parser.cpp

@@ -948,11 +948,17 @@

     WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //chroma_format_idc

     pSps->uiChromaFormatIdc = uiCode;

-    if (pSps->uiChromaFormatIdc != 1) {

-      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): chroma_format_idc (%d) = 1 supported.",

+//    if (pSps->uiChromaFormatIdc != 1) {

+//      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): chroma_format_idc (%d) = 1 supported.",

+//               pSps->uiChromaFormatIdc);

+//      return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_NON_BASELINE);

+//    }

+    if (pSps->uiChromaFormatIdc > 1) {

+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): chroma_format_idc (%d) <=1 supported.",

                pSps->uiChromaFormatIdc);

       return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_NON_BASELINE);

-    }

+

+    }// To support 4:0:0; 4:2:0

     pSps->uiChromaArrayType = pSps->uiChromaFormatIdc;

     WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //bit_depth_luma_minus8

     if (uiCode != 0) {

--- a/codec/decoder/core/src/decode_slice.cpp

+++ b/codec/decoder/core/src/decode_slice.cpp

@@ -444,6 +444,10 @@

   pCurDqLayer->pIntraPredMode[iMbXy][4] = pIntraPredMode[4 + 8 * 1];

   pCurDqLayer->pIntraPredMode[iMbXy][5] = pIntraPredMode[4 + 8 * 2];

   pCurDqLayer->pIntraPredMode[iMbXy][6] = pIntraPredMode[4 + 8 * 3];

+

+  if (pCtx->pSps->uiChromaFormatIdc == 0)//no need parse chroma

+    return ERR_NONE;

+

   if (pCurDqLayer->sLayerInfo.pPps->bEntropyCodingModeFlag) {

     WELS_READ_VERIFY (ParseIntraPredModeChromaCabac (pCtx, uiNeighAvail, iCode));

     if (iCode > MAX_PRED_MODE_ID_CHROMA) {

@@ -462,7 +466,6 @@

       || CheckIntraChromaPredMode (uiNeighAvail, &pCurDqLayer->pChromaPredMode[iMbXy])) {

     return ERR_INFO_INVALID_I_CHROMA_PRED_MODE;

   }

-

   return ERR_NONE;

 }

@@ -478,6 +481,9 @@

                                &pCurDqLayer->pIntraPredMode[iMbXy][7])) { //invalid iPredMode, must stop decoding

     return ERR_INFO_INVALID_I16x16_PRED_MODE;

   }

+  if (pCtx->pSps->uiChromaFormatIdc == 0)

+    return ERR_NONE;

+

   if (pCurDqLayer->sLayerInfo.pPps->bEntropyCodingModeFlag) {

     WELS_READ_VERIFY (ParseIntraPredModeChromaCabac (pCtx, uiNeighAvail, iCode));

     if (iCode > MAX_PRED_MODE_ID_CHROMA) {

@@ -519,6 +525,9 @@

   WELS_READ_VERIFY (ParseMBTypeISliceCabac (pCtx, &sNeighAvail, uiMbType));

   if (uiMbType > 25) {

     return ERR_INFO_INVALID_MB_TYPE;

+  } else if (!pCtx->pSps->uiChromaFormatIdc && ((uiMbType >= 5 && uiMbType <= 12) || (uiMbType >= 17

+             && uiMbType <= 24))) {

+    return ERR_INFO_INVALID_MB_TYPE;

   } else if (25 == uiMbType) {   //I_PCM

     WELS_READ_VERIFY (ParseIPCMInfoCabac (pCtx));

     pSlice->iLastDeltaQp = 0;

@@ -536,19 +545,18 @@

     WELS_READ_VERIFY (ParseCbpInfoCabac (pCtx, &sNeighAvail, uiCbp));

     pCurLayer->pCbp[iMbXy] = uiCbp;

     pSlice->iLastDeltaQp = uiCbp == 0 ? 0 : pSlice->iLastDeltaQp;

-    uiCbpChroma = uiCbp >> 4;

+    uiCbpChroma = pCtx->pSps->uiChromaFormatIdc ? uiCbp >> 4 : 0;

     uiCbpLuma = uiCbp & 15;

   } else { //I16x16;

     pCurLayer->pMbType[iMbXy] = MB_TYPE_INTRA16x16;

     pCurLayer->pIntraPredMode[iMbXy][7] = (uiMbType - 1) & 3;

     pCurLayer->pCbp[iMbXy] = g_kuiI16CbpTable[ (uiMbType - 1) >> 2];

-    uiCbpChroma = pCurLayer->pCbp[iMbXy] >> 4;

+    uiCbpChroma = pCtx->pSps->uiChromaFormatIdc ? pCurLayer->pCbp[iMbXy] >> 4 : 0 ;

     uiCbpLuma = pCurLayer->pCbp[iMbXy] & 15;

     WelsFillCacheNonZeroCount (&sNeighAvail, pNonZeroCount, pCurLayer);

     WELS_READ_VERIFY (ParseIntra16x16Mode (pCtx, &sNeighAvail, pBsAux, pCurLayer));

   }

-

   ST32 (&pCurLayer->pNzc[iMbXy][0], 0);

   ST32 (&pCurLayer->pNzc[iMbXy][4], 0);

   ST32 (&pCurLayer->pNzc[iMbXy][8], 0);

@@ -705,9 +713,10 @@

     pCurLayer->pInterPredictionDoneFlag[iMbXy] = 0;

   } else { //Intra mode

     uiMbType -= 5;

-    if (uiMbType > 25) {

+    if (uiMbType > 25)

       return ERR_INFO_INVALID_MB_TYPE;

-    }

+    if (!pCtx->pSps->uiChromaFormatIdc && ((uiMbType >= 5 && uiMbType <= 12) || (uiMbType >= 17 && uiMbType <= 24)))

+      return ERR_INFO_INVALID_MB_TYPE;

     if (25 == uiMbType) {   //I_PCM

       WELS_READ_VERIFY (ParseIPCMInfoCabac (pCtx));

@@ -727,7 +736,7 @@

         pCurLayer->pMbType[iMbXy] = MB_TYPE_INTRA16x16;

         pCurLayer->pIntraPredMode[iMbXy][7] = (uiMbType - 1) & 3;

         pCurLayer->pCbp[iMbXy] = g_kuiI16CbpTable[ (uiMbType - 1) >> 2];

-        uiCbpChroma = pCurLayer->pCbp[iMbXy] >> 4;

+        uiCbpChroma = pCtx->pSps->uiChromaFormatIdc ? pCurLayer->pCbp[iMbXy] >> 4 : 0;

         uiCbpLuma = pCurLayer->pCbp[iMbXy] & 15;

         WelsFillCacheNonZeroCount (pNeighAvail, pNonZeroCount, pCurLayer);

         WELS_READ_VERIFY (ParseIntra16x16Mode (pCtx, pNeighAvail, pBsAux, pCurLayer));

@@ -735,21 +744,6 @@

     }

   }

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

   ST32 (&pCurLayer->pNzc[iMbXy][0], 0);

   ST32 (&pCurLayer->pNzc[iMbXy][4], 0);

   ST32 (&pCurLayer->pNzc[iMbXy][8], 0);

@@ -759,9 +753,10 @@

   if (MB_TYPE_INTRA16x16 != pCurLayer->pMbType[iMbXy]) {

     WELS_READ_VERIFY (ParseCbpInfoCabac (pCtx, pNeighAvail, uiCbp));

+

     pCurLayer->pCbp[iMbXy] = uiCbp;

     pSlice->iLastDeltaQp = uiCbp == 0 ? 0 : pSlice->iLastDeltaQp;

-    uiCbpChroma = pCurLayer->pCbp[iMbXy] >> 4;

+    uiCbpChroma = pCtx->pSps->uiChromaFormatIdc ? pCurLayer->pCbp[iMbXy] >> 4 : 0 ;

     uiCbpLuma = pCurLayer->pCbp[iMbXy] & 15;

   }

@@ -1104,9 +1099,10 @@

   WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //uiMbType

   uiMbType = uiCode;

-  if (uiMbType > 25) {

+  if (uiMbType > 25)

     return ERR_INFO_INVALID_MB_TYPE;

-  }

+  if (!pCtx->pSps->uiChromaFormatIdc && ((uiMbType >= 5 && uiMbType <= 12) || (uiMbType >= 17 && uiMbType <= 24)))

+    return ERR_INFO_INVALID_MB_TYPE;

   if (25 == uiMbType) {

     int32_t iDecStrideL = pCurLayer->pDec->iLinesize[0];

@@ -1169,11 +1165,15 @@

     WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //coded_block_pattern

     uiCbp = uiCode;

     //G.9.1 Alternative parsing process for coded pBlock pattern

-    if (uiCbp > 47)

+    if (pCtx->pSps->uiChromaFormatIdc && (uiCbp > 47))

       return ERR_INFO_INVALID_CBP;

+    if (!pCtx->pSps->uiChromaFormatIdc && (uiCbp > 15))

+      return ERR_INFO_INVALID_CBP;

-    uiCbp = g_kuiIntra4x4CbpTable[uiCbp];

-

+    if (pCtx->pSps->uiChromaFormatIdc)

+      uiCbp = g_kuiIntra4x4CbpTable[uiCbp];

+    else

+      uiCbp = g_kuiIntra4x4CbpTable400[uiCbp];

     pCurLayer->pCbp[iMbXy] = uiCbp;

     uiCbpC = uiCbp >> 4;

     uiCbpL = uiCbp & 15;

@@ -1181,7 +1181,7 @@

     pCurLayer->pMbType[iMbXy] = MB_TYPE_INTRA16x16;

     pCurLayer->pIntraPredMode[iMbXy][7] = (uiMbType - 1) & 3;

     pCurLayer->pCbp[iMbXy] = g_kuiI16CbpTable[ (uiMbType - 1) >> 2];

-    uiCbpC = pCurLayer->pCbp[iMbXy] >> 4;

+    uiCbpC = pCtx->pSps->uiChromaFormatIdc ? pCurLayer->pCbp[iMbXy] >> 4 : 0;

     uiCbpL = pCurLayer->pCbp[iMbXy] & 15;

     WelsFillCacheNonZeroCount (&sNeighAvail, pNonZeroCount, pCurLayer);

     WELS_READ_VERIFY (ParseIntra16x16Mode (pCtx, &sNeighAvail, pBs, pCurLayer));

@@ -1398,9 +1398,10 @@

     }

   } else { //intra MB type

     uiMbType -= 5;

-    if (uiMbType > 25) {

+    if (uiMbType > 25)

       return ERR_INFO_INVALID_MB_TYPE;

-    }

+    if (!pCtx->pSps->uiChromaFormatIdc && ((uiMbType >= 5 && uiMbType <= 12) || (uiMbType >= 17 && uiMbType <= 24)))

+      return ERR_INFO_INVALID_MB_TYPE;

     if (25 == uiMbType) {

       int32_t iDecStrideL = pCurLayer->pDec->iLinesize[0];

@@ -1471,7 +1472,7 @@

         pCurLayer->pMbType[iMbXy] = MB_TYPE_INTRA16x16;

         pCurLayer->pIntraPredMode[iMbXy][7] = (uiMbType - 1) & 3;

         pCurLayer->pCbp[iMbXy] = g_kuiI16CbpTable[ (uiMbType - 1) >> 2];

-        uiCbpC = pCurLayer->pCbp[iMbXy] >> 4;

+        uiCbpC = pCtx->pSps->uiChromaFormatIdc ? pCurLayer->pCbp[iMbXy] >> 4 : 0;

         uiCbpL = pCurLayer->pCbp[iMbXy] & 15;

         WelsFillCacheNonZeroCount (&sNeighAvail, pNonZeroCount, pCurLayer);

         if (ParseIntra16x16Mode (pCtx, &sNeighAvail, pBs, pCurLayer)) {

@@ -1485,13 +1486,15 @@

     WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //coded_block_pattern

     uiCbp = uiCode;

     {

-      if (uiCbp > 47)

+      if (pCtx->pSps->uiChromaFormatIdc && (uiCbp > 47))

         return ERR_INFO_INVALID_CBP;

-

+      if (!pCtx->pSps->uiChromaFormatIdc && (uiCbp > 15))

+        return ERR_INFO_INVALID_CBP;

       if (MB_TYPE_INTRA4x4 == pCurLayer->pMbType[iMbXy]) {

-        uiCbp = g_kuiIntra4x4CbpTable[uiCbp];

+

+        uiCbp = pCtx->pSps->uiChromaFormatIdc ? g_kuiIntra4x4CbpTable[uiCbp] : g_kuiIntra4x4CbpTable400[uiCbp];

       } else //inter

-        uiCbp = g_kuiInterCbpTable[uiCbp];

+        uiCbp = pCtx->pSps->uiChromaFormatIdc ?  g_kuiInterCbpTable[uiCbp] : g_kuiInterCbpTable400[uiCbp];

     }

     pCurLayer->pCbp[iMbXy] = uiCbp;

--- a/codec/decoder/core/src/decoder_data_tables.cpp

+++ b/codec/decoder/core/src/decoder_data_tables.cpp

@@ -134,10 +134,19 @@

   8, 17, 18, 20, 24,  6,  9, 22, 25, 32, 33, 34, 36, 40, 38, 41  //47

 };

+const uint8_t g_kuiIntra4x4CbpTable400[16] = {

+  15, 0, 7, 11, 13, 14, 3, 5, 10, 12, 1, 2, 4, 8, 6, 9

+

+};

+

 const uint8_t g_kuiInterCbpTable[48] = {

   0, 16,  1,  2,  4,  8, 32,  3,  5, 10, 12, 15, 47,  7, 11, 13, //15

   14,  6,  9, 31, 35, 37, 42, 44, 33, 34, 36, 40, 39, 43, 45, 46, //31

   17, 18, 20, 24, 19, 21, 26, 28, 23, 27, 29, 30, 22, 25, 38, 41  //47

+};

+

+const uint8_t g_kuiInterCbpTable400[16] = {

+  0, 1, 2, 4, 8, 3, 5, 10, 12, 15, 7, 11, 13, 14, 6, 9

 };

 const uint8_t g_kuiLeadingZeroTable[256] = {

--- a/codec/decoder/core/src/parse_mb_syn_cabac.cpp

+++ b/codec/decoder/core/src/parse_mb_syn_cabac.cpp

@@ -669,6 +669,10 @@

   if (pCbpBit[3])

     uiCbp += 0x08;

+  if (pCtx->pSps->uiChromaFormatIdc == 0)//monochroma

+    return ERR_NONE;

+

+

   //Chroma: bit by bit

   iIdxB = pNeighAvail->iTopAvail  && (pNeighAvail->iTopType  == MB_TYPE_INTRA_PCM || (pNeighAvail->iTopCbp  >> 4));

   iIdxA = pNeighAvail->iLeftAvail && (pNeighAvail->iLeftType == MB_TYPE_INTRA_PCM || (pNeighAvail->iLeftCbp >> 4));

@@ -687,7 +691,9 @@

                                       pCtx->pCabacCtx + NEW_CTX_OFFSET_CBP + 2 * CTX_NUM_CBP + iCtxInc,

                                       pCbpBit[5]));

     uiCbp += 1 << (4 + pCbpBit[5]);

+

   }

+

   return ERR_NONE;

 }