commit ec31504d799d3762096b33801c110972f157bd0b
author Song Zhao <song.zhao@amlogic.com> Fri Jun 12 00:51:42 2020 -0700
committer Song Zhao <song.zhao@amlogic.com> Fri Jun 12 00:53:36 2020 -0700
tree b25ddf50d099f15f03fe04628d7a34a865e7e179
parent 921fbdc55f752f18e0d7016abda6d599a66e1ce2

v4l2-uvm-test: disable secure playback by default [1/1]

Change-Id: Iaddb0230227d6fc94daec4a9b3860eb6fe056bf5
Signed-off-by: Song Zhao <song.zhao@amlogic.com>

v4l2-uvm-test/src/v4l2-dec.c

diff --git a/v4l2-uvm-test/src/v4l2-dec.c b/v4l2-uvm-test/src/v4l2-dec.c
index b56754a..a157fec 100644
--- a/v4l2-uvm-test/src/v4l2-dec.c
+++ b/v4l2-uvm-test/src/v4l2-dec.c
@@ -26,7 +26,9 @@
 #include "demux.h"
 #include "drm.h"
 #include "v4l2-dec.h"
+#ifdef CONFIG_SECMEM
 #include "secmem.h"
+#endif
 #include "vp9.h"
 
 static const char* video_dev_name = "/dev/video26";
@@ -213,8 +215,10 @@
     for (i = 0 ; i < req.count ; i++) {
         struct frame_buffer *buf = output_p.buf[i];
 
+#ifdef CONFIG_SECMEM
         if (sInMemMode == V4L2_MEMORY_DMABUF)
             secmem_free(buf->smem);
+#endif
 
         free(buf);
     }
@@ -510,9 +514,11 @@
                 pthread_mutex_unlock(&output_p.lock);
                 fb->used = 0;
                 d_o_rec_num++;
+#ifdef CONFIG_SECMEM
                 if (sInMemMode == V4L2_MEMORY_DMABUF) {
                     secmem_free(fb->smem);
                 }
+#endif
                 pthread_cond_signal(&output_p.wait);
             }
         }
@@ -680,12 +686,14 @@
     decode_finish_cb = cb;
 
     if (secure) {
+#ifdef CONFIG_SECMEM
         sInMemMode = V4L2_MEMORY_DMABUF;
         ret = secmem_init();
         if (ret) {
             printf("secmem_init fail %d\n",ret);
             return 1;
         }
+#endif
     } else
         sInMemMode = V4L2_MEMORY_MMAP;
 
@@ -880,7 +888,9 @@
     get_1st_data = false;
     pthread_mutex_destroy(&res_lock);
     close(video_fd);
+#ifdef CONFIG_SECMEM
     secmem_destroy();
+#endif
     if (es_buf)
         free(es_buf);
     return 0;
@@ -976,6 +986,7 @@
         return 0;
     }
     p = output_p.buf[cur_output_index];
+#ifdef CONFIG_SECMEM
     if (sInMemMode == V4L2_MEMORY_DMABUF) {
         int frame_size = p->used;
         int offset = 0;
@@ -1023,6 +1034,7 @@
         p->v4lbuf.m.planes[0].length = frame_size;
         p->v4lbuf.m.planes[0].data_offset = 0;
     }
+#endif
     p->v4lbuf.m.planes[0].bytesused = p->used;
 
     /* convert from ns to timeval */