shithub: openh264

Download patch

ref: 338092ce689f70f38905dd6adfbf3b11cacf54d8
parent: a5b14c2998c67e0a81ae5365b43c1aa9491908ac
parent: 8636ca79c75beab9266e7d75ac297e0c3feb14b6
author: guangwei <[email protected]>
date: Thu Aug 31 12:54:29 EDT 2017 

Merge pull request #2841 from huili2/fix_I8_pred

fix IntraNxN pred mode bug


--- a/codec/decoder/core/src/parse_mb_syn_cavlc.cpp
+++ b/codec/decoder/core/src/parse_mb_syn_cavlc.cpp
@@ -168,8 +168,8 @@
     iLeftXy = iCurXy - 1;
   }
 
-  //intra4x4_pred_mode
-  if (pNeighAvail->iTopAvail && IS_INTRA4x4 (pNeighAvail->iTopType)) { //top
+  //intraNxN_pred_mode
+  if (pNeighAvail->iTopAvail && IS_INTRANxN (pNeighAvail->iTopType)) { //top
     ST32 (pIntraPredMode + 1, LD32 (&pCurLayer->pIntraPredMode[iTopXy][0]));
   } else {
     int32_t iPred;
@@ -180,7 +180,7 @@
     ST32 (pIntraPredMode + 1, iPred);
   }
 
-  if (pNeighAvail->iLeftAvail && IS_INTRA4x4 (pNeighAvail->iLeftType)) { //left
+  if (pNeighAvail->iLeftAvail && IS_INTRANxN (pNeighAvail->iLeftType)) { //left
     pIntraPredMode[ 0 + 8    ] = pCurLayer->pIntraPredMode[iLeftXy][4];
     pIntraPredMode[ 0 + 8 * 2] = pCurLayer->pIntraPredMode[iLeftXy][5];
     pIntraPredMode[ 0 + 8 * 3] = pCurLayer->pIntraPredMode[iLeftXy][6];