shithub: openh264

Download patch

ref: e5abbdcdab7fcbf98148a910050494e993450c10
parent: c228c51423b5e957678d00c205816bdeae027844
author: Martin Storsjö <martin@martin.st>
date: Tue Jul 8 09:47:14 EDT 2014 

Check left/top flag instead of uiNeighborAvail in neon deblocking

When deblocking over slice edges (in single threaded sliced
encoding), uiNeighborAvail might say that a MB isn't available,
even though it is available for deblocking here.

This fixes the encoder test of dynamic slicing, with neon
optimizations enabled.


--- a/codec/encoder/core/src/deblocking.cpp
+++ b/codec/encoder/core/src/deblocking.cpp
@@ -555,7 +555,8 @@
 #if defined(HAVE_NEON) && defined(SINGLE_REF_FRAME)
 void DeblockingBSCalc_neon (SWelsFuncPtrList* pFunc, SMB* pCurMb, uint8_t uiBS[2][4][4], Mb_Type uiCurMbType,
                             int32_t iMbStride, int32_t iLeftFlag, int32_t iTopFlag) {
-  DeblockingBSCalcEnc_neon (pCurMb->pNonZeroCount, pCurMb->sMv, pCurMb->uiNeighborAvail, iMbStride, uiBS);
+  DeblockingBSCalcEnc_neon (pCurMb->pNonZeroCount, pCurMb->sMv,
+                            (iLeftFlag ? LEFT_MB_POS : 0) | (iTopFlag ? TOP_MB_POS : 0), iMbStride, uiBS);
   if (iLeftFlag) {
     if (IS_INTRA ((pCurMb - 1)->uiMbType)) {
       * (uint32_t*)uiBS[0][0] = 0x04040404;
@@ -576,7 +577,8 @@
 #if defined(HAVE_NEON_AARCH64) && defined(SINGLE_REF_FRAME)
 void DeblockingBSCalc_AArch64_neon (SWelsFuncPtrList* pFunc, SMB* pCurMb, uint8_t uiBS[2][4][4], Mb_Type uiCurMbType,
                                     int32_t iMbStride, int32_t iLeftFlag, int32_t iTopFlag) {
-  DeblockingBSCalcEnc_AArch64_neon (pCurMb->pNonZeroCount, pCurMb->sMv, pCurMb->uiNeighborAvail, iMbStride, uiBS);
+  DeblockingBSCalcEnc_AArch64_neon (pCurMb->pNonZeroCount, pCurMb->sMv,
+                                    (iLeftFlag ? LEFT_MB_POS : 0) | (iTopFlag ? TOP_MB_POS : 0), iMbStride, uiBS);
   if (iLeftFlag) {
     if (IS_INTRA ((pCurMb - 1)->uiMbType)) {
       * (uint32_t*)uiBS[0][0] = 0x04040404;