commit 00d89ac3818feb5f513581dde20a6e197961d4f9
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Mon Nov 28 23:57:05 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 28 23:57:05 2016 +0000
tree 980993cfe92b9d4e11927ddf6e2dafe9d41b0104
parent a1d9b4383b5a8fb1d7404872862cf06ce9253f14
parent 72179bfbfa6408829a74ff93673f7c54f830163f

Merge "Decoder: Remove unnecssary optimization while setting MV context"
am: 72179bfbfa

Change-Id: Id501d46e6ce5f709a6d0f8b76f054096b827b7e2

decoder/ih264d_parse_mb_header.c

diff --git a/decoder/ih264d_parse_mb_header.c b/decoder/ih264d_parse_mb_header.c
index f30ad67..9a6a1f9 100644
--- a/decoder/ih264d_parse_mb_header.c
+++ b/decoder/ih264d_parse_mb_header.c
@@ -1172,7 +1172,6 @@
     /***************************************************************/
     /* Store abs_mvd_values cabac contexts                         */
     /***************************************************************/
-#ifndef ARM
     {
         UWORD8 u1_i;
         for(u1_i = 0; u1_i < u1_part_wd; u1_i++, pu1_top_mv_ctxt += 4)
@@ -1187,46 +1186,6 @@
             pu1_lft_mv_ctxt[1] = u1_abs_mvd_y;
         }
     }
-#else
-    /* Optimising the loop, with Little-Endian Assumption */
-    {
-        UWORD16 *pu2_top_cxt = (UWORD16 *)pu1_top_mv_ctxt;
-        UWORD16 *pu2_lft_cxt = (UWORD16 *)pu1_lft_mv_ctxt;
-        UWORD16 u2_pack_mvd = (UWORD16)((u1_abs_mvd_y << 8) | u1_abs_mvd_x);
-        UWORD8 u1_wd = u1_part_wd, u1_ht = u1_part_ht;
-
-        u1_wd--;
-        *pu2_top_cxt = u2_pack_mvd;
-        pu2_top_cxt += 2;
-        if(u1_wd)
-        {
-            u1_wd--;
-            *pu2_top_cxt = u2_pack_mvd;
-            pu2_top_cxt += 2;
-        }
-        if(u1_wd)
-        {
-            *pu2_top_cxt = u2_pack_mvd;
-            pu2_top_cxt += 2;
-            *pu2_top_cxt = u2_pack_mvd;
-        }
-        u1_ht--;
-        *pu2_lft_cxt = u2_pack_mvd;
-        pu2_lft_cxt += 2;
-        if(u1_ht)
-        {
-            u1_ht--;
-            *pu2_lft_cxt = u2_pack_mvd;
-            pu2_lft_cxt += 2;
-        }
-        if(u1_ht)
-        {
-            *pu2_lft_cxt = u2_pack_mvd;
-            pu2_lft_cxt += 2;
-            *pu2_lft_cxt = u2_pack_mvd;
-        }
-    }
-#endif
 }
 
 /*****************************************************************************/