Fix one error of calculating VME parameter for inter-frame on Haswell

At the same time it fixes the typo in comments.

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

diff --git a/src/shaders/vme/inter_bframe_haswell.asm b/src/shaders/vme/inter_bframe_haswell.asm
index e02748e..331841f 100644 (file)
--- a/src/shaders/vme/inter_bframe_haswell.asm
+++ b/src/shaders/vme/inter_bframe_haswell.asm
@@ -8,7 +8,7 @@
  */
 // Modual name: Inter_bframe_haswell.asm
 //
-// Make intra predition estimation for Inter frame for B-frame
+// Make inter predition estimation for Inter frame for B-frame
 //
 
 //
@@ -21,7 +21,7 @@
 /*
  * __START
  */
-__INTRA_START:
+__INTER_START:
 mov  (16) tmp_reg0.0<1>:UD      0x0:UD {align1};
 mov  (16) tmp_reg2.0<1>:UD      0x0:UD {align1};
 mov  (16) tmp_reg4.0<1>:UD      0x0:UD {align1} ;
@@ -168,7 +168,7 @@ mbb_start:
 mov  (8) mb_msg0.0<1>:ud       0:ud            {align1};
 and.z.f0.0 (1)         null:uw input_mb_intra_ub<0,1,0>:ub     INTRA_PRED_AVAIL_FLAG_B:uw   {align1};
 /* MB B doesn't exist. Zero MV. mba_flag is zero */
-/* If MB B doesn't exist, neight of MB C nor D exists */
+/* If MB B doesn't exist, neither MB C nor D exists */
 (f0.0)  mov  (2)       mbb_result.20<1>:w      -1:w            {align1};
 (f0.0)  mov  (2)       mbc_result.20<1>:w      -1:w            {align1};
 (f0.0)  jmpi (1)       mb_mvp_start;
@@ -389,7 +389,7 @@ mov  (2)  mbc_result.20<1>:w                0:w     {align1};
        
 mb_mvp_start:
 /*TODO: Add the skip prediction */
-/* Check whether both MB and C are invailable */
+/* Check whether both MB B and C are inavailable */
 add    (1)     tmp_reg0.0<1>:d         mbb_result.0<0,1,0>:d   mbc_result.0<0,1,0>:d   {align1};
 cmp.z.f0.0 (1) null:d                  tmp_reg0.0<0,1,0>:d     0:d     {align1};
 (-f0.0)        jmpi (1)        mb_median_start;
@@ -442,7 +442,7 @@ cmp.z.f0.0  (1)     null:d  mba_result.22<1>:w      0:w     {align1};
 cmp.z.f0.0     (1)     null:d  mbb_result.22<1>:w      0:w     {align1};
 (f0.0) add     (1)     tmp_reg0.0<1>:w         tmp_reg0.0<1>:w 1:w     {align1};
 (f0.0) mov     (1)     tmp_reg0.4<1>:ud        mbb_result.8<0,1,0>:ud  {align1};
-cmp.z.f0.0     (1)     null:d  mbc_result.20<1>:w      0:w     {align1};
+cmp.z.f0.0     (1)     null:d  mbc_result.22<1>:w      0:w     {align1};
 (f0.0) add     (1)     tmp_reg0.0<1>:w         tmp_reg0.0<1>:w 1:w     {align1};
 (f0.0) mov     (1)     tmp_reg0.4<1>:ud        mbc_result.8<0,1,0>:ud  {align1};
 cmp.e.f0.0     (1)     null:d  tmp_reg0.0<1>:w  1:w    {align1};

diff --git a/src/shaders/vme/inter_bframe_haswell.g75b b/src/shaders/vme/inter_bframe_haswell.g75b
index e0ef98e..02759d9 100644 (file)
--- a/src/shaders/vme/inter_bframe_haswell.g75b
+++ b/src/shaders/vme/inter_bframe_haswell.g75b
@@ -223,7 +223,7 @@
    { 0x01000010, 0x20003da4, 0x00200b16, 0x00000000 },
    { 0x00010040, 0x24003dad, 0x00200400, 0x00010001 },
    { 0x00010001, 0x24040021, 0x00000b08, 0x00000000 },
-   { 0x01000010, 0x20003da4, 0x00200b34, 0x00000000 },
+   { 0x01000010, 0x20003da4, 0x00200b36, 0x00000000 },
    { 0x00010040, 0x24003dad, 0x00200400, 0x00010001 },
    { 0x00010001, 0x24040021, 0x00000b28, 0x00000000 },
    { 0x01000010, 0x20003da4, 0x00200400, 0x00010001 },

diff --git a/src/shaders/vme/inter_frame_haswell.asm b/src/shaders/vme/inter_frame_haswell.asm
index fa9a0a0..79d9a70 100644 (file)
--- a/src/shaders/vme/inter_frame_haswell.asm
+++ b/src/shaders/vme/inter_frame_haswell.asm
@@ -6,9 +6,9 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php.
  *
  */
-// Modual name: IntraFrame.asm
+// Modual name: Inter_frame_haswell.asm
 //
-// Make intra predition estimation for Intra frame
+// Make inter predition estimation for Inter-frame on Haswell
 //
 
 //
@@ -21,7 +21,7 @@
 /*
  * __START
  */
-__INTRA_START:
+__INTER_START:
 mov  (16) tmp_reg0.0<1>:UD      0x0:UD {align1};
 mov  (16) tmp_reg2.0<1>:UD      0x0:UD {align1};
 mov  (16) tmp_reg4.0<1>:UD      0x0:UD {align1} ;
@@ -150,7 +150,7 @@ mbb_start:
 mov  (8) mb_msg0.0<1>:ud       0:ud            {align1};
 and.z.f0.0 (1)         null:uw input_mb_intra_ub<0,1,0>:ub     INTRA_PRED_AVAIL_FLAG_B:uw   {align1};
 /* MB B doesn't exist. Zero MV. mba_flag is zero */
-/* If MB B doesn't exist, neight of MB C nor D exists */
+/* If MB B doesn't exist, neither MB C nor D exists */
 (f0.0)  mov  (2)       mbb_result.20<1>:w      -1:w            {align1};
 (f0.0)  mov  (2)       mbc_result.20<1>:w      -1:w            {align1};
 (f0.0)  jmpi (1)       mb_mvp_start;
@@ -318,11 +318,11 @@ send (16)
 
 /* Forward MV */
 mov       (2)          mbc_result.4<1>:ud              mb_mv3.24<2,2,1>:ud     {align1};
-mov       (1)          mbc_result.18<1>:w              MB_PRED_FLAG            {align1};
+mov       (1)          mbc_result.16<1>:w              MB_PRED_FLAG            {align1};
        
 mb_mvp_start:
 /*TODO: Add the skip prediction */
-/* Check whether both MB and C are invailable */
+/* Check whether both MB B and C are inavailable */
 add    (1)     tmp_reg0.0<1>:d         mbb_result.0<0,1,0>:d   mbc_result.0<0,1,0>:d   {align1};
 cmp.z.f0.0 (1) null:d                  tmp_reg0.0<0,1,0>:d     0:d     {align1};
 (-f0.0)        jmpi (1)        mb_median_start;

diff --git a/src/shaders/vme/inter_frame_haswell.g75b b/src/shaders/vme/inter_frame_haswell.g75b
index 2ef1826..36d9419 100644 (file)
--- a/src/shaders/vme/inter_frame_haswell.g75b
+++ b/src/shaders/vme/inter_frame_haswell.g75b
@@ -113,7 +113,7 @@
    { 0x00000040, 0x2b480c21, 0x00000b48, 0x00000003 },
    { 0x0a800031, 0x2ba01cb1, 0x00000b40, 0x02480403 },
    { 0x00200001, 0x2b240021, 0x00450c18, 0x00000000 },
-   { 0x00000001, 0x2b3201ed, 0x00000000, 0x00010001 },
+   { 0x00000001, 0x2b3001ed, 0x00000000, 0x00010001 },
    { 0x00000040, 0x240014a5, 0x00000b00, 0x00000b20 },
    { 0x01000010, 0x20001ca4, 0x00000400, 0x00000000 },
    { 0x00110020, 0x34001c00, 0x00001400, 0x00000080 },

diff --git a/src/shaders/vme/mpeg2_inter_frame_haswell.g75b b/src/shaders/vme/mpeg2_inter_frame_haswell.g75b
index 64f8e2d..1d5b276 100644 (file)
--- a/src/shaders/vme/mpeg2_inter_frame_haswell.g75b
+++ b/src/shaders/vme/mpeg2_inter_frame_haswell.g75b
@@ -113,7 +113,7 @@
    { 0x00000040, 0x2b480c21, 0x00000b48, 0x00000003 },
    { 0x0a800031, 0x2ba01cb1, 0x00000b40, 0x02480403 },
    { 0x00200001, 0x2b240021, 0x00450c18, 0x00000000 },
-   { 0x00000001, 0x2b3201ed, 0x00000000, 0x00010001 },
+   { 0x00000001, 0x2b3001ed, 0x00000000, 0x00010001 },
    { 0x00000040, 0x240014a5, 0x00000b00, 0x00000b20 },
    { 0x01000010, 0x20001ca4, 0x00000400, 0x00000000 },
    { 0x00110020, 0x34001c00, 0x00001400, 0x00000080 },