commit 8520690e241ad92a07893e198b2df417fe045d79
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Thu Aug 13 10:59:13 2015 +0530
committer Marco Nelissen <marcone@google.com> Fri Oct 16 20:15:49 2015 +0000
tree 1fd034f495a58663a5423622c0112a0ec63239c7
parent 903fd2be3063609dd3cd7ad0691de46c1b52b7d1

Added deinterlacer

Decoder output is deinterlaced if a picture is signalled as interlaced
Added SIMD optimizations for arm, armv8 and x86/x64

Bug: 20932810

Change-Id: I6079922f4fc8f1d3680e5169a4d8e70efe8ea471

test/decoder/main.c

diff --git a/test/decoder/main.c b/test/decoder/main.c
index 5930bd1..c344ec0 100644
--- a/test/decoder/main.c
+++ b/test/decoder/main.c
@@ -184,6 +184,7 @@
 
     void *cocodec_obj;
     UWORD32 share_disp_buf;
+    UWORD32 deinterlace;
     UWORD32 num_disp_buf;
     UWORD32 b_pic_present;
     WORD32 i4_degrade_type;
@@ -255,6 +256,7 @@
     NUM_CORES,
 
     SHARE_DISPLAY_BUF,
+    DEINTERLACE,
     LOOPBACK,
     DISPLAY,
     FULLSCREEN,
@@ -312,7 +314,8 @@
         "Number of cores to be used\n" },
     { "--", "--share_display_buf",      SHARE_DISPLAY_BUF,
         "Enable shared display buffer mode\n" },
-
+    { "--", "--deinterlace",      DEINTERLACE,
+        "Enable deinterlacing for interlaced pics\n" },
     { "--", "--loopback",      LOOPBACK,
         "Enable playback in a loop\n" },
     { "--", "--display",      DISPLAY,
@@ -350,6 +353,7 @@
 #define MAX_REF_FRAMES              16
 #define MAX_REORDER_FRAMES          16
 #define DEFAULT_SHARE_DISPLAY_BUF   0
+#define DEFAULT_DEINTERLACE         0
 #define STRIDE                      0
 #define DEFAULT_NUM_CORES           1
 
@@ -1232,6 +1236,9 @@
         case SHARE_DISPLAY_BUF:
             sscanf(value, "%d", &ps_app_ctx->share_disp_buf);
             break;
+        case DEINTERLACE:
+            sscanf(value, "%d", &ps_app_ctx->deinterlace);
+            break;
         case LOOPBACK:
             sscanf(value, "%d", &ps_app_ctx->loopback);
             break;
@@ -1848,6 +1855,7 @@
 #ifdef PROFILE_ENABLE
     memset(peak_window, 0, sizeof(WORD32) * PEAK_WINDOW_SIZE);
 #endif
+    s_app_ctx.deinterlace = DEFAULT_DEINTERLACE;
     s_app_ctx.share_disp_buf = DEFAULT_SHARE_DISPLAY_BUF;
     s_app_ctx.u4_num_cores = DEFAULT_NUM_CORES;
     s_app_ctx.i4_degrade_type = 0;
@@ -1976,6 +1984,7 @@
     s_app_ctx.i4_degrade_pics = 0;
     s_app_ctx.i4_degrade_type = 0;
     s_app_ctx.loopback = 0;
+    s_app_ctx.deinterlace = 0;
     s_app_ctx.share_disp_buf = 0;
     s_app_ctx.display = 0;
 #endif
@@ -2118,6 +2127,7 @@
             s_fill_mem_rec_ip.s_ivd_fill_mem_rec_ip_t.u4_max_frm_ht =
                             (s_app_ctx.max_ht == 0) ? MAX_FRAME_HEIGHT : s_app_ctx.max_ht;
             s_fill_mem_rec_ip.u4_share_disp_buf = s_app_ctx.share_disp_buf;
+            s_fill_mem_rec_ip.u4_deinterlace = s_app_ctx.deinterlace;
             s_fill_mem_rec_ip.e_output_format =
                             (IV_COLOR_FORMAT_T)s_app_ctx.e_output_chroma_format;
 
@@ -2183,7 +2193,7 @@
             s_init_ip.s_ivd_init_ip_t.u4_frm_max_ht = (s_app_ctx.max_ht == 0) ? MAX_FRAME_HEIGHT : s_app_ctx.max_ht;
 
             s_init_ip.u4_share_disp_buf = s_app_ctx.share_disp_buf;
-
+            s_init_ip.u4_deinterlace = s_app_ctx.deinterlace;
             s_init_ip.s_ivd_init_ip_t.u4_num_mem_rec = u4_num_mem_recs;
             s_init_ip.s_ivd_init_ip_t.e_output_format =
                             (IV_COLOR_FORMAT_T)s_app_ctx.e_output_chroma_format;
@@ -2588,6 +2598,8 @@
                s_ctl_get_frame_dimensions_op.u4_y_offset[0]);
 */
     }
+
+
     /*************************************************************************/
     /* Get VUI parameters                                                    */
     /*************************************************************************/