shithub: openh264

Download patch

ref: 73c2acb91a20f6d3a0c44a2b181f9a35910d1bf4
parent: 6015c6afade889670fcd52c48bf1bb8b1a548a09
parent: d0699a7a9e91534d61ec78d9b570b9eef67d17f7
author: ruil2 <ruil2@cisco.com>
date: Mon Oct 23 06:54:25 EDT 2017 

Merge pull request #2861 from GuangweiWang/astyle-code-dec

astyle code style for dec


--- a/codec/decoder/core/src/deblocking.cpp
+++ b/codec/decoder/core/src/deblocking.cpp
@@ -787,7 +787,7 @@
     GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[0], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
                             iBeta);
     if (iAlpha | iBeta) {
-      TC0_TBL_LOOKUP(iTc, iIndexA, uiBSx4, 1);
+      TC0_TBL_LOOKUP (iTc, iIndexA, uiBSx4, 1);
       pFilter->pLoopf->pfChromaDeblockingLT4Ver (&pDestCb[ (2 << 1)*iLineSize], &pDestCr[ (2 << 1)*iLineSize], iLineSize,
           iAlpha, iBeta, iTc);
     }
@@ -797,7 +797,7 @@
       GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[i], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
                               iBeta);
       if (iAlpha | iBeta) {
-        TC0_TBL_LOOKUP(iTc, iIndexA, uiBSx4, 1);
+        TC0_TBL_LOOKUP (iTc, iIndexA, uiBSx4, 1);
         uint8_t* pDestCbCr = (i == 0) ? &pDestCb[ (2 << 1) * iLineSize] : &pDestCr[ (2 << 1) * iLineSize];
         pFilter->pLoopf->pfChromaDeblockingLT4Ver2 (pDestCbCr, iLineSize,
             iAlpha, iBeta, iTc);
--- a/codec/decoder/core/src/get_intra_predictor.cpp
+++ b/codec/decoder/core/src/get_intra_predictor.cpp
@@ -102,7 +102,8 @@
 void WelsI4x4LumaPredDcTop_c (uint8_t* pPred, const int32_t kiStride) {
   const int32_t kiStride2  = kiStride << 1;
   const int32_t kiStride3  = kiStride2 + kiStride;
-  const uint8_t kuiMean    = (pPred[-kiStride] + pPred[-kiStride + 1] + pPred[-kiStride + 2] + pPred[-kiStride + 3] + 2) >> 2;
+  const uint8_t kuiMean    = (pPred[-kiStride] + pPred[-kiStride + 1] + pPred[-kiStride + 2] + pPred[-kiStride + 3] + 2)
+                             >> 2;
   const uint32_t kuiMean32 = 0x01010101U * kuiMean;
 
   ST32A4 (pPred            , kuiMean32);
@@ -995,7 +996,8 @@
   int32_t iTmp          = (kiStride << 3) - kiStride;
   /*caculate the kMean value*/
   const uint8_t kuiM1   = (pPred[-kiStride] + pPred[1 - kiStride] + pPred[2 - kiStride] + pPred[3 - kiStride] + 2) >> 2;
-  const uint8_t kuiM2   = (pPred[4 - kiStride] + pPred[5 - kiStride] + pPred[6 - kiStride] + pPred[7 - kiStride] + 2) >> 2;
+  const uint8_t kuiM2   = (pPred[4 - kiStride] + pPred[5 - kiStride] + pPred[6 - kiStride] + pPred[7 - kiStride] + 2) >>
+                          2;
   const uint8_t kuiM[8] = {kuiM1, kuiM1, kuiM1, kuiM1, kuiM2, kuiM2, kuiM2, kuiM2};
 
   uint8_t i = 7;