[x265] [PATCH] SAO: remove resetSaoUnit()

[Ashok Kumar Mishra]

Please ignore the this patch. I'll resend this patch with minor corrections.

Thanks
Ashok.

On Thu, Nov 19, 2015 at 5:15 PM, <ashok at multicorewareinc.com> wrote:

> # HG changeset patch
> # User Ashok Kumar Mishra<ashok at multicorewareinc.com>
> # Date 1445505834 -19800
> #      Thu Oct 22 14:53:54 2015 +0530
> # Node ID ec452c4fd379d2e4c456722ffc7f7dc49e9c9d37
> # Parent  c1575815b250fb02c1fdae803aead10a4997c835
> SAO: remove resetSaoUnit()
>
> diff -r c1575815b250 -r ec452c4fd379 source/encoder/sao.cpp
> --- a/source/encoder/sao.cpp    Thu Oct 29 17:15:15 2015 +0530
> +++ b/source/encoder/sao.cpp    Thu Oct 22 14:53:54 2015 +0530
> @@ -704,15 +704,15 @@
>      std::swap(m_tmpU1[plane], m_tmpU2[plane]);
>  }
>
> -void SAO::resetSaoUnit(SaoCtuParam* saoUnit)
> -{
> -    saoUnit->mergeMode  = SAO_MERGE_NONE;
> -    saoUnit->typeIdx    = -1;
> -    saoUnit->bandPos    = 0;
> -
> -    for (int i = 0; i < SAO_NUM_OFFSET; i++)
> -        saoUnit->offset[i] = 0;
> -}
> +//void SAO::resetSaoUnit(SaoCtuParam* saoUnit)
> +//{
> +//    saoUnit->mergeMode  = SAO_MERGE_NONE;
> +//    saoUnit->typeIdx    = -1;
> +//    saoUnit->bandPos    = 0;
> +//
> +//    for (int i = 0; i < SAO_NUM_OFFSET; i++)
> +//        saoUnit->offset[i] = 0;
> +//}
>
>  void SAO::copySaoUnit(SaoCtuParam* saoUnitDst, const SaoCtuParam*
> saoUnitSrc)
>  {
> @@ -1172,9 +1172,14 @@
>                  }
>              }
>
> -            saoParam->ctuParam[plane][addr].mergeMode = SAO_MERGE_NONE;
> -            saoParam->ctuParam[plane][addr].typeIdx   = -1;
> -            saoParam->ctuParam[plane][addr].bandPos   = 0;
> +//            saoParam->ctuParam[plane][addr].mergeMode = SAO_MERGE_NONE;
> +//            saoParam->ctuParam[plane][addr].typeIdx   = -1;
> +//            saoParam->ctuParam[plane][addr].bandPos   = 0;
> +
> +            saoParam->ctuParam[plane][addr].reset();
> +
> +            mergeSaoParam[plane][0].reset();
> +            mergeSaoParam[plane][1].reset();
>              if (saoParam->bSaoFlag[plane > 0])
>                  calcSaoStatsCu(addr, plane);
>          }
> @@ -1326,7 +1331,7 @@
>      int    currentDistortionTableBo[MAX_NUM_SAO_CLASS];
>      double currentRdCostTableBo[MAX_NUM_SAO_CLASS];
>
> -    resetSaoUnit(lclCtuParam);
> +//    resetSaoUnit(lclCtuParam);
>      m_entropyCoder.load(m_rdContexts.temp);
>      m_entropyCoder.resetBits();
>      m_entropyCoder.codeSaoOffset(*lclCtuParam, 0);
> @@ -1413,8 +1418,8 @@
>
>              mergeDist[mergeIdx + 1] = ((double)estDist / m_lumaLambda);
>          }
> -        else
> -            resetSaoUnit(&mergeSaoParam[mergeIdx]);
> +//        else
> +//            resetSaoUnit(&mergeSaoParam[mergeIdx]);
>      }
>  }
>
> @@ -1428,8 +1433,8 @@
>      int    bestClassTableBo[2] = { 0, 0 };
>      int    currentDistortionTableBo[MAX_NUM_SAO_CLASS];
>
> -    resetSaoUnit(lclCtuParam[0]);
> -    resetSaoUnit(lclCtuParam[1]);
> +//    resetSaoUnit(lclCtuParam[0]);
> +//    resetSaoUnit(lclCtuParam[1]);
>      m_entropyCoder.load(m_rdContexts.temp);
>      m_entropyCoder.resetBits();
>      m_entropyCoder.codeSaoOffset(*lclCtuParam[0], 1);
> @@ -1536,8 +1541,8 @@
>                  mergeSaoParam[plane][mergeIdx].mergeMode = mergeIdx ?
> SAO_MERGE_UP : SAO_MERGE_LEFT;
>                  mergeDist[mergeIdx + 1] += ((double)estDist /
> m_chromaLambda);
>              }
> -            else
> -                resetSaoUnit(&mergeSaoParam[plane][mergeIdx]);
> +//            else
> +//                resetSaoUnit(&mergeSaoParam[plane][mergeIdx]);
>          }
>      }
>  }
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20151119/93d9165a/attachment-0001.html>