commit 0544a6bbcb94660095e2650ecb783b80b0cf3bee
author Venkatarama NG. Avadhani <venkatarama.avadhani@ittiam.com> Fri Apr 06 10:43:53 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Apr 06 10:43:53 2018 -0700
tree d2f481cc11196bb83009e81fe5cd9a513e066dfb
parent 4347d0064eec7a3de727fa26236c80eea3694a5d
parent e9d732e3e52fbe11ca06a1479e913bf28ab81f60

[automerger] Adding Check For Number of Skip MBs am: 414cd5db73 am: 5da13fdeb2 am: 7b162d4405 am: c03b3f3f0c am: 7dd36bd482 am: 46ab28d876 am: cae5c0be2d am: 27cd5e4b15 am: d24451b7ef am: 8abe536118
am: e9d732e3e5

Change-Id: I4653ad933781dc2b05ab3a32512f377503093d23

Android.bp

diff --git a/Android.bp b/Android.bp
index 31d257c..2eff420 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,7 @@
 cc_library_static {
     name: "libmpeg2dec",
+    vendor_available: true,
+    shared_libs: ["liblog", "libcutils"],
 
     cflags: [
         "-D_LIB",

OWNERS

diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..3b88fc5
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+marcone@google.com
+lajos@google.com
+essick@google.com

decoder/impeg2d_api_main.c

diff --git a/decoder/impeg2d_api_main.c b/decoder/impeg2d_api_main.c
index cd549e4..cc85eff 100644
--- a/decoder/impeg2d_api_main.c
+++ b/decoder/impeg2d_api_main.c
@@ -1974,6 +1974,7 @@
 
     ps_dec_state->pv_jobq_buf = ps_mem_rec->pv_base;
     ps_dec_state->i4_jobq_buf_size = ps_mem_rec->u4_mem_size;
+    u4_num_mem_rec++;
     ps_mem_rec++;
 
     if(u4_num_mem_rec > ps_dec_init_ip->s_ivd_init_ip_t.u4_num_mem_rec)
@@ -1989,9 +1990,11 @@
 
 
     ps_dec_state->pv_deinterlacer_ctxt = ps_mem_rec->pv_base;
+    u4_num_mem_rec++;
     ps_mem_rec++;
 
     ps_dec_state->pu1_deint_fmt_buf = ps_mem_rec->pv_base;
+    u4_num_mem_rec++;
     ps_mem_rec++;
 
 

test/decoder/main.c

diff --git a/test/decoder/main.c b/test/decoder/main.c
index 6229f50..9502dec 100644
--- a/test/decoder/main.c
+++ b/test/decoder/main.c
@@ -2415,9 +2415,13 @@
 
             if(ret != IV_SUCCESS)
             {
+                if (IMPEG2D_UNSUPPORTED_DIMENSIONS == s_video_decode_op.u4_error_code)
+                {
+                    sprintf(ac_error_str, "\nSummary\nUnsupported Dimensions. Reinit decoder with width %d and height %d\n", s_video_decode_op.u4_pic_wd, s_video_decode_op.u4_pic_ht);
+                    codec_exit(ac_error_str);
+                }
                 sprintf(ac_error_str, "\nError in header decode %x",
                         s_video_decode_op.u4_error_code);
-                // codec_exit(ac_error_str);
             }
 
             u4_num_bytes_dec = s_video_decode_op.u4_num_bytes_consumed;