commit 608fc7f4ae44cbbbef7f1b553e83751d536f6af6
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Thu Jan 07 21:07:40 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 07 21:07:40 2016 +0000
tree 2e35e915a499c35c16b398e9dc9cd3abc7608d43
parent 1c01bc10a9d105be5dc286a4c48969d73827cc03
parent 4a524d3a8ae9aa20c36430008e6bd429443f8f1d

Decoder Update mb count after mb map is set.
am: 4a524d3a8a

* commit '4a524d3a8ae9aa20c36430008e6bd429443f8f1d':
  Decoder Update mb count after mb map is set.

decoder/ih264d_parse_islice.c

diff --git a/decoder/ih264d_parse_islice.c b/decoder/ih264d_parse_islice.c
index 4f58c5b..f712c64 100644
--- a/decoder/ih264d_parse_islice.c
+++ b/decoder/ih264d_parse_islice.c
@@ -898,7 +898,6 @@
                                      (UWORD16)(u1_num_mbs >> u1_mbaff));
         }
         u1_num_mbs++;
-        ps_dec->u2_total_mbs_coded++;
 
         /****************************************************************/
         /* Check for End Of Row                                         */
@@ -928,7 +927,7 @@
                                             u1_num_mbs_next, u1_tfr_n_mb,
                                             u1_end_of_row);
             }
-
+            ps_dec->u2_total_mbs_coded += u1_num_mbs;
             if(u1_tfr_n_mb)
                 u1_num_mbs = 0;
             u1_mb_idx = u1_num_mbs;
@@ -1117,7 +1116,6 @@
                                          (UWORD16)(u1_num_mbs >> u1_mbaff));
             }
             u1_num_mbs++;
-            ps_dec->u2_total_mbs_coded++;
 
         }
 
@@ -1146,7 +1144,7 @@
                                             u1_num_mbs_next, u1_tfr_n_mb,
                                             u1_end_of_row);
             }
-
+            ps_dec->u2_total_mbs_coded += u1_num_mbs;
             if(u1_tfr_n_mb)
                 u1_num_mbs = 0;
             u1_mb_idx = u1_num_mbs;

decoder/ih264d_parse_pslice.c

diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c
index 5a105cc..4084fca 100644
--- a/decoder/ih264d_parse_pslice.c
+++ b/decoder/ih264d_parse_pslice.c
@@ -1020,7 +1020,6 @@
         }
 
         u1_num_mbs++;
-        ps_dec->u2_total_mbs_coded++;
         u1_num_mbsNby2++;
         ps_parse_mb_data++;
 
@@ -1071,7 +1070,7 @@
                                             u1_num_mbs_next, u1_tfr_n_mb,
                                             u1_end_of_row);
             }
-
+            ps_dec->u2_total_mbs_coded += u1_num_mbs;
             if(u1_tfr_n_mb)
                 u1_num_mbs = 0;
             u1_mb_idx = u1_num_mbs;
@@ -1356,7 +1355,6 @@
         i2_cur_mb_addr++;
 
         u1_num_mbs++;
-        ps_dec->u2_total_mbs_coded++;
         u1_num_mbsNby2++;
         ps_parse_mb_data++;
 
@@ -1409,7 +1407,7 @@
                                             u1_num_mbs_next, u1_tfr_n_mb,
                                             u1_end_of_row);
             }
-
+            ps_dec->u2_total_mbs_coded += u1_num_mbs;
             if(u1_tfr_n_mb)
                 u1_num_mbs = 0;
             u1_mb_idx = u1_num_mbs;
@@ -1618,7 +1616,7 @@
                     ih264d_decode_recon_tfr_nmb(ps_dec, u1_mb_idx, u1_num_mbs,
                             u1_num_mbs_next, u1_tfr_n_mb, u1_end_of_row);
                 }
-
+                ps_dec->u2_total_mbs_coded += u1_num_mbs;
                 ps_dec->u1_mb_idx = 0;
                 ps_dec->u4_num_mbs_cur_nmb = 0;
             }
@@ -1788,7 +1786,6 @@
         i2_cur_mb_addr++;
 
         u1_num_mbs++;
-        ps_dec->u2_total_mbs_coded++;
         u1_num_mbsNby2++;
         ps_parse_mb_data++;
 
@@ -1824,7 +1821,7 @@
                 ih264d_decode_recon_tfr_nmb(ps_dec, u1_mb_idx, u1_num_mbs, u1_num_mbs_next,
                                             u1_tfr_n_mb, u1_end_of_row);
             }
-
+            ps_dec->u2_total_mbs_coded += u1_num_mbs;
             if(u1_tfr_n_mb)
                 u1_num_mbs = 0;
             u1_mb_idx = u1_num_mbs;