modify log messages to dlog

Change-Id: Ifc879fbb5914cca6b9f4c6d2c1080a9592b9ca71
Signed-off-by: KwangCheol Lee <kclee@dignsys.com>

diff --git a/configure.ac b/configure.ac
index a953fe2..00630c9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,14 @@ AC_PROG_CC
 # Checks for libraries.
 
 # Checks for header files.
+PKG_CHECK_MODULES(DLOG, dlog, [
+  AC_SUBST(DLOG_CFLAGS)
+  AC_SUBST(DLOG_LIBS)
+], [
+  AC_MSG_ERROR([
+    There is no dlog.
+  ])
+])
 
 # Initialize libtool
 LT_PREREQ([2.2])

diff --git a/packaging/nx-video-api.spec b/packaging/nx-video-api.spec
index f4adaec..6075878 100644 (file)
--- a/packaging/nx-video-api.spec
+++ b/packaging/nx-video-api.spec
@@ -9,6 +9,7 @@ Source:  %{name}-%{version}.tar.gz
 BuildRequires:  pkgconfig automake autoconf libtool
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libtbm)
+BuildRequires:  pkgconfig(dlog)
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig

diff --git a/src/Makefile.am b/src/Makefile.am
index 1d443ac..11dc398 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,13 @@
 AM_CFLAGS = \
        $(WARN_CFLAGS)  \
+       $(DLOG_CFLAGS)  \
        -DTIZEN_FEATURE_ARTIK530 \
        -I./include             \
        -I${includedir}
 
 libnx_video_api_la_LTLIBRARIES = libnx_video_api.la
 libnx_video_api_ladir = ${libdir}
-libnx_video_api_la_LDFLAGS = -L${libdir} -ldrm -ltbm
+libnx_video_api_la_LDFLAGS = -L${libdir} -ldrm -ltbm $(DLOG_LIBS)
 
 libnx_video_api_la_SOURCES = \
        nx_video_alloc.c        \

diff --git a/src/nx_video_alloc.c b/src/nx_video_alloc.c
index effd3f8..e674eec 100644 (file)
--- a/src/nx_video_alloc.c
+++ b/src/nx_video_alloc.c
@@ -28,6 +28,7 @@
 #ifdef TIZEN_FEATURE_ARTIK530
 #include <tbm_bufmgr.h>
 #endif
+#include "nx_video_log.h"
 
 #define DRM_DEVICE_NAME "/dev/dri/card0"
 
@@ -76,10 +77,10 @@ alloc_gem (int drm_fd, int size, int flags)
 
   ret = drm_command_write_read (drm_fd, DRM_NX_GEM_CREATE, &arg, sizeof (arg));
   if (ret) {
-    perror ("drm_command_write_read\n");
+    _E ("drm_command_write_read\n");
     return ret;
   }
-  //printf("[DRM ALLOC] gem %d, size %d, flags 0x%x\n", arg.handle, size, flags);
+  //_D ("[DRM ALLOC] gem %d, size %d, flags 0x%x\n", arg.handle, size, flags);
 
   return arg.handle;
 }
@@ -106,7 +107,7 @@ gem_to_dmafd (int drm_fd, int gem_fd)
   arg.flags = O_CLOEXEC | O_RDWR;
   ret = drm_ioctl (drm_fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg);
   if (0 != ret) {
-    printf ("fail : get fd from gem:%d (DRM_IOCTL_PRIME_HANDLE_TO_FD)\n", ret);
+    _E ("fail : get fd from gem:%d (DRM_IOCTL_PRIME_HANDLE_TO_FD)\n", ret);
     return -1;
   }
   return arg.fd;
@@ -119,7 +120,7 @@ get_flink_name (int fd, int gem)
 
   arg.handle = gem;
   if (drm_ioctl (fd, DRM_IOCTL_GEM_FLINK, &arg)) {
-    printf ("fail : get flink from gem:%d (DRM_IOCTL_GEM_FLINK)\n", gem);
+    _E ("fail : get flink from gem:%d (DRM_IOCTL_GEM_FLINK)\n", gem);
     return 0;
   }
   return arg.name;
@@ -133,7 +134,7 @@ gem_from_flink (int fd, uint32_t flink_name)
 
   arg.name = flink_name;
   if (drm_ioctl (fd, DRM_IOCTL_GEM_OPEN, &arg)) {
-    printf ("fail : cannot open gem name=%d\n", flink_name);
+    _E ("fail : cannot open gem name=%d\n", flink_name);
     return -EINVAL;
   }
   return arg.handle;
@@ -280,7 +281,7 @@ NX_AllocateVideoMemory (int width, int height, int32_t planes, uint32_t format,
       cVStride = 0;
       break;
     default:
-      printf ("Unknown format type\n");
+      _E ("Unknown format type\n");
       goto ErrorExit;
   }
 
@@ -363,6 +364,7 @@ NX_AllocateVideoMemory (int width, int height, int32_t planes, uint32_t format,
 
 #ifdef TIZEN_FEATURE_ARTIK530
   pVidMem->bufmgr = tbm_bufmgr_init (drmFd);
+  _D ("bufmgr = %p", pVidMem->bufmgr);
   if (!pVidMem->bufmgr)
     goto ErrorExit;
 #endif
@@ -381,6 +383,7 @@ NX_AllocateVideoMemory (int width, int height, int32_t planes, uint32_t format,
     pVidMem->flink[i] = flink[i];
 #ifdef TIZEN_FEATURE_ARTIK530
     pVidMem->bo[i] = tbm_bo_import (pVidMem->bufmgr, flink[i]);
+    _D ("bo[%d] = %p", i, pVidMem->bo[i]);
     if (!pVidMem->bo[i])
       goto alloc_bo_fail;
 #endif
@@ -460,7 +463,7 @@ NX_MapMemory (NX_MEMORY_INFO * pMem)
   pBuf =
       mmap (0, pMem->size, PROT_READ | PROT_WRITE, MAP_SHARED, pMem->dmaFd, 0);
   if (pBuf == MAP_FAILED) {
-    printf("Map failed : size %d, fd %d, error : %s\n", pMem->size, pMem->dmaFd, strerror(errno));
+    _E ("Map failed : size %d, fd %d, error : %s\n", pMem->size, pMem->dmaFd, strerror(errno));
     return -1;
   }
   pMem->pBuffer = pBuf;

diff --git a/src/nx_video_dec.c b/src/nx_video_dec.c
index cfb013a..895f8c4 100644 (file)
--- a/src/nx_video_dec.c
+++ b/src/nx_video_dec.c
@@ -28,6 +28,7 @@
 
 #include <nx_video_alloc.h>
 #include <nx_video_api.h>
+#include "nx_video_log.h"
 
 
 /*----------------------------------------------------------------------------*/
@@ -94,17 +95,17 @@ V4l2DecOpen (void)
       sprintf (filename, "/sys/class/video4linux/video%d/name", i);
       stream_fd = fopen (filename, "r");
       if (stream_fd == NULL) {
-        printf ("failed to open sysfs entry for videodev \n");
+        _D ("failed to open sysfs entry for videodev \n");
         i++;
         continue;
       }
 
       /* read sysfs entry for device name */
       if (fgets (name, sizeof (name), stream_fd) == 0) {
-        printf ("failed to read sysfs entry for videodev\n");
+        _D ("failed to read sysfs entry for videodev\n");
       } else {
         if (strncmp (name, NX_V4L2_DEC_NAME, strlen (NX_V4L2_DEC_NAME)) == 0) {
-          printf ("node found for device %s: /dev/video%d \n", NX_V4L2_DEC_NAME,
+          _D ("node found for device %s: /dev/video%d \n", NX_V4L2_DEC_NAME,
               i);
           found = true;
         }
@@ -580,7 +581,7 @@ NX_V4l2DecOpen (uint32_t codecType)
 
   hDec->fd = V4l2DecOpen ();
   if (hDec->fd <= 0) {
-    printf ("Failed to open video decoder device\n");
+    _E ("Failed to open video decoder device\n");
     goto ERROR_EXIT;
   }
 
@@ -591,7 +592,7 @@ NX_V4l2DecOpen (uint32_t codecType)
     memset (&cap, 0, sizeof (cap));
 
     if (ioctl (hDec->fd, VIDIOC_QUERYCAP, &cap) != 0) {
-      printf ("failed to ioctl: VIDIOC_QUERYCAP\n");
+      _E ("failed to ioctl: VIDIOC_QUERYCAP\n");
       goto ERROR_EXIT;
     }
   }
@@ -613,7 +614,7 @@ NX_V4l2DecClose (NX_V4L2DEC_HANDLE hDec)
   int32_t ret = 0, i;
 
   if (NULL == hDec) {
-    printf ("Fail, Invalid Handle.\n");
+    _E ("Fail, Invalid Handle.\n");
     return -1;
   }
 
@@ -622,13 +623,13 @@ NX_V4l2DecClose (NX_V4L2DEC_HANDLE hDec)
 
     type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
     if (ioctl (hDec->fd, VIDIOC_STREAMOFF, &type) != 0) {
-      printf ("failed to ioctl: VIDIOC_STREAMOFF(Stream)\n");
+      _E ("failed to ioctl: VIDIOC_STREAMOFF(Stream)\n");
       return -1;
     }
 
     type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
     if (ioctl (hDec->fd, VIDIOC_STREAMOFF, &type) != 0) {
-      printf ("failed to ioctl: VIDIOC_STREAMOFF(Image)\n");
+      _E ("failed to ioctl: VIDIOC_STREAMOFF(Image)\n");
       return -1;
     }
 
@@ -663,7 +664,7 @@ NX_V4l2DecParseVideoCfg (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_SEQ_IN * pSeqIn,
   memset (pSeqOut, 0, sizeof (NX_V4L2DEC_SEQ_OUT));
 
   if (NULL == hDec) {
-    printf ("Fail, Invalid Handle.\n");
+    _E ("Fail, Invalid Handle.\n");
     return -1;
   }
 
@@ -690,7 +691,7 @@ NX_V4l2DecParseVideoCfg (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_SEQ_IN * pSeqIn,
     fmt.fmt.pix_mp.num_planes = 1;
 
     if (ioctl (hDec->fd, VIDIOC_S_FMT, &fmt) != 0) {
-      printf ("Failed to ioctx : VIDIOC_S_FMT(Input Stream)\n");
+      _E ("Failed to ioctx : VIDIOC_S_FMT(Input Stream)\n");
       return -1;
     }
   }
@@ -707,7 +708,7 @@ NX_V4l2DecParseVideoCfg (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_SEQ_IN * pSeqIn,
     req.memory = V4L2_MEMORY_DMABUF;
 
     if (ioctl (hDec->fd, VIDIOC_REQBUFS, &req) != 0) {
-      printf ("failed to ioctl: VIDIOC_REQBUFS(Input Stream)\n");
+      _E ("failed to ioctl: VIDIOC_REQBUFS(Input Stream)\n");
       return -1;
     }
 
@@ -715,13 +716,13 @@ NX_V4l2DecParseVideoCfg (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_SEQ_IN * pSeqIn,
       hDec->hStream[i] =
           NX_AllocateMemory (MAX_IMAGE_WIDTH * MAX_IMAGE_HEIGHT * 3 / 4, 4096);
       if (hDec->hStream[i] == NULL) {
-        printf ("Failed to allocate stream buffer(%d, %d)\n", i,
+        _E ("Failed to allocate stream buffer(%d, %d)\n", i,
             MAX_IMAGE_WIDTH * MAX_IMAGE_HEIGHT * 3 / 4);
         return -1;
       }
 
       if (NX_MapMemory (hDec->hStream[i]) != 0) {
-        printf ("Stream memory Mapping Failed\n");
+        _E ("Stream memory Mapping Failed\n");
         return -1;
       }
     }
@@ -736,7 +737,7 @@ NX_V4l2DecParseVideoCfg (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_SEQ_IN * pSeqIn,
       ctrl.value = pSeqIn->thumbnailMode;
 
       if (ioctl (hDec->fd, VIDIOC_S_CTRL, &ctrl) != 0) {
-        printf ("failed to ioctl: Set Thumbnail Mode\n");
+        _E ("failed to ioctl: Set Thumbnail Mode\n");
         return -1;
       }
     }
@@ -750,7 +751,7 @@ NX_V4l2DecParseVideoCfg (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_SEQ_IN * pSeqIn,
     int32_t iSeqSize = GetSequenceHeader (hDec, pSeqIn);
 
     if (iSeqSize <= 0) {
-      printf ("Fail, input data has error!!");
+      _E ("Fail, input data has error!!");
       return -1;
     }
 
@@ -771,12 +772,12 @@ NX_V4l2DecParseVideoCfg (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_SEQ_IN * pSeqIn,
     buf.timestamp.tv_usec = (pSeqIn->timeStamp % 1000) * 1000;
 
     if (ioctl (hDec->fd, VIDIOC_QBUF, &buf) != 0) {
-      printf ("failed to ioctl: VIDIOC_QBUF(Header Stream)\n");
+      _E ("failed to ioctl: VIDIOC_QBUF(Header Stream)\n");
       return -1;
     }
 
     if (ioctl (hDec->fd, VIDIOC_STREAMON, &type) != 0) {
-      printf ("Fail, ioctl(): VIDIOC_STREAMON. (Input)\n");
+      _E ("Fail, ioctl(): VIDIOC_STREAMON. (Input)\n");
       return -1;
     }
 
@@ -787,7 +788,7 @@ NX_V4l2DecParseVideoCfg (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_SEQ_IN * pSeqIn,
     buf.memory = V4L2_MEMORY_DMABUF;
 
     if (ioctl (hDec->fd, VIDIOC_DQBUF, &buf) != 0) {
-      printf ("failed to ioctl: VIDIOC_DQBUF(Header Stream)\n");
+      _E ("failed to ioctl: VIDIOC_DQBUF(Header Stream)\n");
       return -1;
     }
 
@@ -810,7 +811,7 @@ NX_V4l2DecParseVideoCfg (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_SEQ_IN * pSeqIn,
     fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
 
     if (ioctl (hDec->fd, VIDIOC_G_FMT, &fmt) != 0) {
-      printf ("Fail, ioctl(): VIDIOC_G_FMT.\n");
+      _E ("Fail, ioctl(): VIDIOC_G_FMT.\n");
       return -1;
     }
 
@@ -824,7 +825,7 @@ NX_V4l2DecParseVideoCfg (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_SEQ_IN * pSeqIn,
     crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
 
     if (ioctl (hDec->fd, VIDIOC_G_CROP, &crop) != 0) {
-      printf ("Fail, ioctl(): VIDIOC_G_CROP\n");
+      _E ("Fail, ioctl(): VIDIOC_G_CROP\n");
       return -1;
     }
 
@@ -853,7 +854,7 @@ NX_V4l2DecInit (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_SEQ_IN * pSeqIn)
     fmt.fmt.pix_mp.num_planes = pSeqIn->imgPlaneNum;
 
     if (ioctl (hDec->fd, VIDIOC_S_FMT, &fmt) != 0) {
-      printf ("failed to ioctl: VIDIOC_S_FMT(Output Yuv)\n");
+      _E ("failed to ioctl: VIDIOC_S_FMT(Output Yuv)\n");
       return -1;
     }
 
@@ -875,7 +876,7 @@ NX_V4l2DecInit (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_SEQ_IN * pSeqIn)
     } else {
       hDec->useExternalFrameBuffer = true;
       if (2 > pSeqIn->numBuffers - hDec->numFrameBuffers)
-        printf ("External Buffer too small.(min=%d, buffers=%d)\n",
+        _D ("External Buffer too small.(min=%d, buffers=%d)\n",
             hDec->numFrameBuffers, pSeqIn->numBuffers);
 
       imgBuffCnt = pSeqIn->numBuffers;
@@ -889,7 +890,7 @@ NX_V4l2DecInit (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_SEQ_IN * pSeqIn)
     req.memory = V4L2_MEMORY_DMABUF;
 
     if (ioctl (hDec->fd, VIDIOC_REQBUFS, &req) != 0) {
-      printf ("failed to ioctl: VIDIOC_REQBUFS(Output YUV)\n");
+      _E ("failed to ioctl: VIDIOC_REQBUFS(Output YUV)\n");
       return -1;
     }
 
@@ -908,13 +909,13 @@ NX_V4l2DecInit (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_SEQ_IN * pSeqIn)
             NX_AllocateVideoMemory (pSeqIn->width, pSeqIn->height,
             pSeqIn->imgPlaneNum, pSeqIn->imgFormat, 4096);
         if (hDec->hImage[i] == NULL) {
-          printf ("Failed to allocate image buffer(%d, %d, %d)\n", i,
+          _E ("Failed to allocate image buffer(%d, %d, %d)\n", i,
               pSeqIn->width, pSeqIn->height);
           return -1;
         }
 
         if (NX_MapVideoMemory (hDec->hImage[i]) != 0) {
-          printf ("Video Memory Mapping Failed\n");
+          _E ("Video Memory Mapping Failed\n");
           return -1;
         }
       }
@@ -927,14 +928,14 @@ NX_V4l2DecInit (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_SEQ_IN * pSeqIn)
       }
 
       if (ioctl (hDec->fd, VIDIOC_QBUF, &buf) != 0) {
-        printf ("failed to ioctl: VIDIOC_QBUF(Output YUV - %d)\n", i);
+        _E ("failed to ioctl: VIDIOC_QBUF(Output YUV - %d)\n", i);
         return -1;
       }
     }
 
     type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
     if (ioctl (hDec->fd, VIDIOC_STREAMON, &type) != 0) {
-      printf ("failed to ioctl: VIDIOC_STREAMON\n");
+      _E ("failed to ioctl: VIDIOC_STREAMON\n");
       return -1;
     }
   }
@@ -954,7 +955,7 @@ NX_V4l2DecDecodeFrame (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_IN * pDecIn,
   int32_t frameType;
 
   if (NULL == hDec) {
-    printf ("Fail, Invalid Handle.\n");
+    _E ("Fail, Invalid Handle.\n");
     return -1;
   }
 
@@ -978,7 +979,7 @@ NX_V4l2DecDecodeFrame (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_IN * pDecIn,
   buf.m.planes[0].data_offset = 0;
 
   if (ioctl (hDec->fd, VIDIOC_QBUF, &buf) != 0) {
-    printf ("Fail, ioctl(): VIDIOC_QBUF.(Input)\n");
+    _E ("Fail, ioctl(): VIDIOC_QBUF.(Input)\n");
     return -1;
   }
 
@@ -991,7 +992,7 @@ NX_V4l2DecDecodeFrame (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_IN * pDecIn,
     buf.memory = V4L2_MEMORY_DMABUF;
 
     if (ioctl (hDec->fd, VIDIOC_DQBUF, &buf) != 0) {
-      printf ("Fail, ioctl(): VIDIOC_DQBUF.(Input)\n");
+      _E ("Fail, ioctl(): VIDIOC_DQBUF.(Input)\n");
       return -1;
     }
 
@@ -1029,7 +1030,7 @@ NX_V4l2DecDecodeFrame (NX_V4L2DEC_HANDLE hDec, NX_V4L2DEC_IN * pDecIn,
   buf.memory = V4L2_MEMORY_DMABUF;
 
   if (ioctl (hDec->fd, VIDIOC_DQBUF, &buf) != 0) {
-    printf ("Fail, ioctl(): VIDIOC_DQBUF(Output)\n");
+    _E ("Fail, ioctl(): VIDIOC_DQBUF(Output)\n");
     return -100;
   }
 
@@ -1079,7 +1080,7 @@ NX_V4l2DecClrDspFlag (NX_V4L2DEC_HANDLE hDec, NX_VID_MEMORY_HANDLE hFrameBuf,
   int32_t i;
 
   if (NULL == hDec) {
-    printf ("Fail, Invalid Handle.\n");
+    _E ("Fail, Invalid Handle.\n");
     return -1;
   }
 
@@ -1098,7 +1099,7 @@ NX_V4l2DecClrDspFlag (NX_V4L2DEC_HANDLE hDec, NX_VID_MEMORY_HANDLE hFrameBuf,
   }
 
   if (index < 0) {
-    printf ("Fail, Invalid FrameBuffer or FrameIndex.\n");
+    _E ("Fail, Invalid FrameBuffer or FrameIndex.\n");
     return -1;
   }
 
@@ -1116,7 +1117,7 @@ NX_V4l2DecClrDspFlag (NX_V4L2DEC_HANDLE hDec, NX_VID_MEMORY_HANDLE hFrameBuf,
 
   /* Queue Output Buffer */
   if (ioctl (hDec->fd, VIDIOC_QBUF, &buf) != 0) {
-    printf ("Fail, ioctl(): VIDIOC_QBUF.(Clear Display Index, index = %d)\n",
+    _E ("Fail, ioctl(): VIDIOC_QBUF.(Clear Display Index, index = %d)\n",
         index);
     return -1;
   }
@@ -1131,31 +1132,31 @@ NX_V4l2DecFlush (NX_V4L2DEC_HANDLE hDec)
   enum v4l2_buf_type type;
 
   if (NULL == hDec) {
-    printf ("Fail, Invalid Handle.\n");
+    _E ("Fail, Invalid Handle.\n");
     return -1;
   }
 
   type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
   if (ioctl (hDec->fd, VIDIOC_STREAMOFF, &type) != 0) {
-    printf ("failed to ioctl: VIDIOC_STREAMOFF(Stream)\n");
+    _E ("failed to ioctl: VIDIOC_STREAMOFF(Stream)\n");
     return -1;
   }
 
   type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
   if (ioctl (hDec->fd, VIDIOC_STREAMOFF, &type) != 0) {
-    printf ("failed to ioctl: VIDIOC_STREAMOFF(Image)\n");
+    _E ("failed to ioctl: VIDIOC_STREAMOFF(Image)\n");
     return -1;
   }
 
   type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
   if (ioctl (hDec->fd, VIDIOC_STREAMON, &type) != 0) {
-    printf ("Fail, ioctl(): VIDIOC_STREAMON. (Input)\n");
+    _E ("Fail, ioctl(): VIDIOC_STREAMON. (Input)\n");
     return -1;
   }
 
   type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
   if (ioctl (hDec->fd, VIDIOC_STREAMON, &type) != 0) {
-    printf ("failed to ioctl: VIDIOC_STREAMON\n");
+    _E ("failed to ioctl: VIDIOC_STREAMON\n");
     return -1;
   }
 
@@ -1179,7 +1180,7 @@ NX_V4l2DecFlush (NX_V4L2DEC_HANDLE hDec)
       }
 
       if (ioctl (hDec->fd, VIDIOC_QBUF, &buf) != 0) {
-        printf ("failed to ioctl: VIDIOC_QBUF(Output YUV - %d)\n", i);
+        _E ("failed to ioctl: VIDIOC_QBUF(Output YUV - %d)\n", i);
         return -1;
       }
     }

diff --git a/src/nx_video_enc.c b/src/nx_video_enc.c
index 234d185..cf611ff 100644 (file)
--- a/src/nx_video_enc.c
+++ b/src/nx_video_enc.c
@@ -28,6 +28,7 @@
 
 #include <nx_video_alloc.h>
 #include <nx_video_api.h>
+#include "nx_video_log.h"
 
 /*----------------------------------------------------------------------------*/
 #define NX_V4L2_ENC_NAME               "nx-vpu-enc"
@@ -77,17 +78,17 @@ V4l2EncOpen (void)
       sprintf (filename, "/sys/class/video4linux/video%d/name", i);
       stream_fd = fopen (filename, "r");
       if (stream_fd == NULL) {
-        printf ("failed to open sysfs entry for videodev \n");
+        _D ("failed to open sysfs entry for videodev \n");
         i++;
         continue;
       }
 
       /* read sysfs entry for device name */
       if (fgets (name, sizeof (name), stream_fd) == 0) {
-        printf ("failed to read sysfs entry for videodev\n");
+        _D ("failed to read sysfs entry for videodev\n");
       } else {
         if (strncmp (name, NX_V4L2_ENC_NAME, strlen (NX_V4L2_ENC_NAME)) == 0) {
-          printf ("node found for device %s: /dev/video%d\n", NX_V4L2_ENC_NAME,
+          _D ("node found for device %s: /dev/video%d\n", NX_V4L2_ENC_NAME,
               i);
           found = true;
         }
@@ -122,7 +123,7 @@ NX_V4l2EncOpen (uint32_t codecType)
 
   hEnc->fd = V4l2EncOpen ();
   if (hEnc->fd <= 0) {
-    printf ("failed to open video encoder device\n");
+    _E ("failed to open video encoder device\n");
     goto ERROR_EXIT;
   }
 
@@ -133,7 +134,7 @@ NX_V4l2EncOpen (uint32_t codecType)
     memset (&cap, 0, sizeof (cap));
 
     if (ioctl (hEnc->fd, VIDIOC_QUERYCAP, &cap) != 0) {
-      printf ("failed to ioctl: VIDIOC_QUERYCAP\n");
+      _E ("failed to ioctl: VIDIOC_QUERYCAP\n");
       goto ERROR_EXIT;
     }
   }
@@ -157,19 +158,19 @@ NX_V4l2EncClose (NX_V4L2ENC_HANDLE hEnc)
   int i;
 
   if (NULL == hEnc) {
-    printf ("Fail, Invalid Handle.\n");
+    _E ("Fail, Invalid Handle.\n");
     return -1;
   }
 
   type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
   if (ioctl (hEnc->fd, VIDIOC_STREAMOFF, &type) != 0) {
-    printf ("Fail, ioctl(): VIDIOC_STREAMOFF - Stream\n");
+    _E ("Fail, ioctl(): VIDIOC_STREAMOFF - Stream\n");
     ret = -1;
   }
 
   type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
   if (ioctl (hEnc->fd, VIDIOC_STREAMOFF, &type) != 0) {
-    printf ("Fail, ioctl(): VIDIOC_STREAMOFF - Image\n");
+    _E ("Fail, ioctl(): VIDIOC_STREAMOFF - Image\n");
     ret = -1;
   }
 
@@ -195,7 +196,7 @@ NX_V4l2EncInit (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_PARA * pEncPara)
   int i;
 
   if (NULL == hEnc) {
-    printf ("Fail, Invalid Handle.\n");
+    _E ("Fail, Invalid Handle.\n");
     return -1;
   }
 
@@ -210,7 +211,7 @@ NX_V4l2EncInit (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_PARA * pEncPara)
     fmt.fmt.pix_mp.plane_fmt[0].sizeimage = inWidth * inHeight * 3 / 4;
 
     if (ioctl (hEnc->fd, VIDIOC_S_FMT, &fmt) != 0) {
-      printf ("failed to ioctl: VIDIOC_S_FMT(Stream)\n");
+      _E ("failed to ioctl: VIDIOC_S_FMT(Stream)\n");
       return -1;
     }
   }
@@ -228,7 +229,7 @@ NX_V4l2EncInit (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_PARA * pEncPara)
     fmt.fmt.pix_mp.num_planes = pEncPara->imgPlaneNum;
 
     if (ioctl (hEnc->fd, VIDIOC_S_FMT, &fmt) != 0) {
-      printf ("Failed to s_fmt : YUV \n");
+      _E ("Failed to s_fmt : YUV \n");
       return -1;
     }
 
@@ -320,7 +321,7 @@ NX_V4l2EncInit (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_PARA * pEncPara)
       ext_ctrls.controls = ext_ctrl;
 
       if (ioctl (hEnc->fd, VIDIOC_S_EXT_CTRLS, &ext_ctrls) != 0) {
-        printf ("Fail, ioctl(): VIDIOC_S_EXT_CTRLS\n");
+        _E ("Fail, ioctl(): VIDIOC_S_EXT_CTRLS\n");
         return -1;
       }
     } else {
@@ -330,7 +331,7 @@ NX_V4l2EncInit (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_PARA * pEncPara)
       ctrl.value = pEncPara->jpgQuality;
 
       if (ioctl (hEnc->fd, VIDIOC_S_CTRL, &ctrl) != 0) {
-        printf ("Fail, ioctl(): VIDIOC_S_CTRL\n");
+        _E ("Fail, ioctl(): VIDIOC_S_CTRL\n");
         return -1;
       }
     }
@@ -348,7 +349,7 @@ NX_V4l2EncInit (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_PARA * pEncPara)
     req.memory = V4L2_MEMORY_DMABUF;    /* V4L2_MEMORY_USERPTR, V4L2_MEMORY_DMABUF, V4L2_MEMORY_MMAP */
 
     if (ioctl (hEnc->fd, VIDIOC_REQBUFS, &req) != 0) {
-      printf ("failed to ioctl: VIDIOC_REQBUFS(Input YUV)\n");
+      _E ("failed to ioctl: VIDIOC_REQBUFS(Input YUV)\n");
       return -1;
     }
   }
@@ -365,7 +366,7 @@ NX_V4l2EncInit (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_PARA * pEncPara)
     req.memory = V4L2_MEMORY_DMABUF;
 
     if (ioctl (hEnc->fd, VIDIOC_REQBUFS, &req) != 0) {
-      printf ("failed to ioctl: VIDIOC_REQBUFS(Output ES)\n");
+      _E ("failed to ioctl: VIDIOC_REQBUFS(Output ES)\n");
       return -1;
     }
 
@@ -374,13 +375,13 @@ NX_V4l2EncInit (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_PARA * pEncPara)
       hEnc->hBitStream[i] =
           NX_AllocateMemory (inWidth * inHeight * 3 / 4, 4096);
       if (hEnc->hBitStream[i] == NULL) {
-        printf ("Failed to allocate stream buffer(%d, %d)\n", i,
+        _E ("Failed to allocate stream buffer(%d, %d)\n", i,
             inWidth * inHeight * 3 / 4);
         return -1;
       }
 
       if (NX_MapMemory (hEnc->hBitStream[i]) != 0) {
-        printf ("Stream memory Mapping Failed\n");
+        _E ("Stream memory Mapping Failed\n");
         return -1;
       }
     }
@@ -408,18 +409,18 @@ NX_V4l2EncInit (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_PARA * pEncPara)
     buf.m.planes[0].data_offset = 0;
 
     if (ioctl (hEnc->fd, VIDIOC_QBUF, &buf) != 0) {
-      printf ("failed to ioctl: VIDIOC_QBUF(Header)\n");
+      _E ("failed to ioctl: VIDIOC_QBUF(Header)\n");
       return -1;
     }
 
     type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
     if (ioctl (hEnc->fd, VIDIOC_STREAMON, &type) != 0) {
-      printf ("failed to ioctl: VIDIOC_STREAMON\n");
+      _E ("failed to ioctl: VIDIOC_STREAMON\n");
       return -1;
     }
 
     if (ioctl (hEnc->fd, VIDIOC_DQBUF, &buf) != 0) {
-      printf ("failed to ioctl: VIDIOC_DQBUF(Header)\n");
+      _E ("failed to ioctl: VIDIOC_DQBUF(Header)\n");
       return -1;
     }
 
@@ -436,7 +437,7 @@ NX_V4l2EncInit (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_PARA * pEncPara)
     enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
 
     if (ioctl (hEnc->fd, VIDIOC_STREAMON, &type) != 0) {
-      printf ("Fail, ioctl(): VIDIOC_STREAMON(Image)\n");
+      _E ("Fail, ioctl(): VIDIOC_STREAMON(Image)\n");
       return -1;
     }
   }
@@ -450,7 +451,7 @@ NX_V4l2EncGetSeqInfo (NX_V4L2ENC_HANDLE hEnc, uint8_t ** ppSeqBuf,
     int32_t * iSeqSize)
 {
   if (hEnc == NULL) {
-    printf ("Fail, Invalid Handle.\n");
+    _E ("Fail, Invalid Handle.\n");
     return -1;
   }
 
@@ -470,7 +471,7 @@ NX_V4l2EncEncodeFrame (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_IN * pEncIn,
   int i;
 
   if (hEnc == NULL) {
-    printf ("Fail, Invalid Handle.\n");
+    _E ("Fail, Invalid Handle.\n");
     return -1;
   }
 
@@ -484,7 +485,7 @@ NX_V4l2EncEncodeFrame (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_IN * pEncIn,
     ctrl.value = pEncIn->forcedIFrame;
 
     if (ioctl (hEnc->fd, VIDIOC_S_CTRL, &ctrl) != 0) {
-      printf ("failed to ioctl: Forced Intra Frame\n");
+      _E ("failed to ioctl: Forced Intra Frame\n");
       return -1;
     }
 
@@ -492,7 +493,7 @@ NX_V4l2EncEncodeFrame (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_IN * pEncIn,
     ctrl.value = pEncIn->forcedSkipFrame;
 
     if (ioctl (hEnc->fd, VIDIOC_S_CTRL, &ctrl) != 0) {
-      printf ("failed to ioctl: Forced Skip Frame\n");
+      _E ("failed to ioctl: Forced Skip Frame\n");
       return -1;
     }
 
@@ -506,7 +507,7 @@ NX_V4l2EncEncodeFrame (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_IN * pEncIn,
     ctrl.value = pEncIn->quantParam;
 
     if (ioctl (hEnc->fd, VIDIOC_S_CTRL, &ctrl) != 0) {
-      printf ("failed to ioctl: Forced QP\n");
+      _E ("failed to ioctl: Forced QP\n");
       return -1;
     }
   }
@@ -525,7 +526,7 @@ NX_V4l2EncEncodeFrame (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_IN * pEncIn,
   }
 
   if (ioctl (hEnc->fd, VIDIOC_QBUF, &buf) != 0) {
-    printf ("Fail, ioctl(): VIDIOC_QBUF(Image)\n");
+    _E ("Fail, ioctl(): VIDIOC_QBUF(Image)\n");
     return -1;
   }
 
@@ -547,7 +548,7 @@ NX_V4l2EncEncodeFrame (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_IN * pEncIn,
     buf.m.planes[0].data_offset = 0;
 
     if (ioctl (hEnc->fd, VIDIOC_QBUF, &buf) != 0) {
-      printf ("failed to ioctl: VIDIOC_QBUF(Stream)\n");
+      _E ("failed to ioctl: VIDIOC_QBUF(Stream)\n");
       return -1;
     }
   }
@@ -561,7 +562,7 @@ NX_V4l2EncEncodeFrame (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_IN * pEncIn,
     buf.memory = V4L2_MEMORY_DMABUF;
 
     if (ioctl (hEnc->fd, VIDIOC_DQBUF, &buf) != 0) {
-      printf ("Fail, ioctl(): VIDIOC_DQBUF(Input Image)\n");
+      _E ("Fail, ioctl(): VIDIOC_DQBUF(Input Image)\n");
       return -1;
     }
   }
@@ -575,7 +576,7 @@ NX_V4l2EncEncodeFrame (NX_V4L2ENC_HANDLE hEnc, NX_V4L2ENC_IN * pEncIn,
     buf.memory = V4L2_MEMORY_DMABUF;    //V4L2_MEMORY_USERPTR;
 
     if (ioctl (hEnc->fd, VIDIOC_DQBUF, &buf) != 0) {
-      printf ("Fail, ioctl(): VIDIOC_DQBUF(Compressed Stream)\n");
+      _E ("Fail, ioctl(): VIDIOC_DQBUF(Compressed Stream)\n");
       return -1;
     }
 
@@ -605,7 +606,7 @@ NX_V4l2EncChangeParameter (NX_V4L2ENC_HANDLE hEnc,
   struct v4l2_control ctrl;
 
   if (hEnc == NULL) {
-    printf ("Fail, Invalid Handle.\n");
+    _E ("Fail, Invalid Handle.\n");
     return -1;
   }
 
@@ -614,7 +615,7 @@ NX_V4l2EncChangeParameter (NX_V4L2ENC_HANDLE hEnc,
     ctrl.value = pChgPara->keyFrmInterval;
 
     if (ioctl (hEnc->fd, VIDIOC_S_CTRL, &ctrl) != 0) {
-      printf ("failed to ioctl: Change Key Frame Interval\n");
+      _E ("failed to ioctl: Change Key Frame Interval\n");
       return -1;
     }
   }
@@ -624,7 +625,7 @@ NX_V4l2EncChangeParameter (NX_V4L2ENC_HANDLE hEnc,
     ctrl.value = pChgPara->bitrate;
 
     if (ioctl (hEnc->fd, VIDIOC_S_CTRL, &ctrl) != 0) {
-      printf ("failed to ioctl: Change Bitrate\n");
+      _E ("failed to ioctl: Change Bitrate\n");
       return -1;
     }
   }
@@ -634,7 +635,7 @@ NX_V4l2EncChangeParameter (NX_V4L2ENC_HANDLE hEnc,
     ctrl.value = pChgPara->fpsNum;
 
     if (ioctl (hEnc->fd, VIDIOC_S_CTRL, &ctrl) != 0) {
-      printf ("failed to ioctl: Change Fps Number\n");
+      _E ("failed to ioctl: Change Fps Number\n");
       return -1;
     }
 
@@ -642,7 +643,7 @@ NX_V4l2EncChangeParameter (NX_V4L2ENC_HANDLE hEnc,
     ctrl.value = pChgPara->fpsDen;
 
     if (ioctl (hEnc->fd, VIDIOC_S_CTRL, &ctrl) != 0) {
-      printf ("failed to ioctl: Change Fps Density\n");
+      _E ("failed to ioctl: Change Fps Density\n");
       return -1;
     }
   }
@@ -652,7 +653,7 @@ NX_V4l2EncChangeParameter (NX_V4L2ENC_HANDLE hEnc,
     ctrl.value = pChgPara->numIntraRefreshMbs;
 
     if (ioctl (hEnc->fd, VIDIOC_S_CTRL, &ctrl) != 0) {
-      printf ("failed to ioctl: Change Intra Refresh Mbs\n");
+      _E ("failed to ioctl: Change Intra Refresh Mbs\n");
       return -1;
     }
   }

diff --git a/src/nx_video_log.h b/src/nx_video_log.h
new file mode 100755 (executable)
index 0000000..e05495d
--- /dev/null
+++ b/src/nx_video_log.h
@@ -0,0 +1,25 @@
+#ifndef __NX_VIDEO_LOG_H__
+#define __NX_VIDEO_LOG_H__
+
+#ifdef TIZEN_FEATURE_ARTIK530
+
+#include <dlog.h>
+
+#ifdef LOG_TAG
+#undef LOG_TAG
+#endif /* LOG_TAG */
+#define LOG_TAG "NX_VIDEO"
+
+#define _I(fmt, args...)        SLOGI(fmt, ##args)
+#define _D(fmt, args...)        SLOGD(fmt, ##args)
+#define _E(fmt, args...)        SLOGE(fmt, ##args)
+
+#else /* TIZEN_FEATURE_ARTIK530 */
+
+#define _I(x, ...)              do { } while (0)
+#define _D(x, ...)              do { } while (0)
+#define _E(x, ...)              do { } while (0)
+
+#endif /* TIZEN_FEATURE_ARTIK530 */
+
+#endif /* __NX_VIDEO_LOG_H__ */