Add the support of the chroma intra prediction on Haswell

Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>

diff --git a/src/gen75_mfc.c b/src/gen75_mfc.c
index 974aca3..6660940 100644 (file)
--- a/src/gen75_mfc.c
+++ b/src/gen75_mfc.c
@@ -1029,7 +1029,7 @@ gen75_mfc_avc_pak_object_intra(VADriverContextP ctx, int x, int y, int end_mb,
     /*Stuff for Intra MB*/
     OUT_BCS_BATCH(batch, msg[1]);                      /* We using Intra16x16 no 4x4 predmode*/        
     OUT_BCS_BATCH(batch, msg[2]);      
-    OUT_BCS_BATCH(batch, msg[3]&0xFC);         
+    OUT_BCS_BATCH(batch, msg[3]&0xFF); 
     
     /*MaxSizeInWord and TargetSzieInWord*/
     OUT_BCS_BATCH(batch, (max_mb_size << 24) |

diff --git a/src/shaders/vme/intra_frame_haswell.asm b/src/shaders/vme/intra_frame_haswell.asm
index 1a2f0a5..022a3e6 100644 (file)
--- a/src/shaders/vme/intra_frame_haswell.asm
+++ b/src/shaders/vme/intra_frame_haswell.asm
@@ -105,7 +105,7 @@ mov  (8) vme_msg_6.0<1>:UW       CHROMA_COL.2<16,8,2>:UW {align1};
  */
 /* m0 */        
 mov  (8) vme_msg_0.0<1>:UD      vme_m0.0<8,8,1>:UD {align1};
-mov  (1) tmp_reg0.0<1>:UW      LUMA_INTRA_MODE:UW {align1};
+mov  (1) tmp_reg0.0<1>:UW      LUMA_CHROMA_MODE:UW {align1};
 /* Use the Luma mode */
 mov  (1) vme_msg_4.5<1>:UB     tmp_reg0.0<0,1,0>:UB {align1};
 

diff --git a/src/shaders/vme/intra_frame_haswell.g75b b/src/shaders/vme/intra_frame_haswell.g75b
index 69abe0d..4bb8ad9 100644 (file)
--- a/src/shaders/vme/intra_frame_haswell.g75b
+++ b/src/shaders/vme/intra_frame_haswell.g75b
@@ -46,7 +46,7 @@
    { 0x00400001, 0x28d00021, 0x00690608, 0x00000000 },
    { 0x00600001, 0x28c00129, 0x00ae0622, 0x00000000 },
    { 0x00600001, 0x28000021, 0x008d0440, 0x00000000 },
-   { 0x00000001, 0x24000169, 0x00000000, 0x00010001 },
+   { 0x00000001, 0x24000169, 0x00000000, 0x00000000 },
    { 0x00000001, 0x28850231, 0x00000400, 0x00000000 },
    { 0x00000001, 0x247c0169, 0x00000000, 0x00000000 },
    { 0x01000005, 0x20002e28, 0x000000a4, 0x00010001 },