Merge pull request #1 from AwesomeLemon/master

JpgEncoder: options

Author: iakov

ov7670/jpeg_encoder/include/internal/common.h

@@ -40,6 +40,12 @@ typedef struct TargetLocation
   int m_targetY;
   int m_targetSize;
 } TargetLocation;
+
+typedef struct TargetJpgParams
+{
+  uint8_t jpgQuality;
+  bool ifBlackAndWhite;
+} TargetJpgParams;
 /*
 typedef struct TargetLocation
 {

ov7670/jpeg_encoder/include/internal/module_ce.h

@@ -53,6 +53,7 @@ int codecEngineStop(CodecEngine* _ce);
 
 int codecEngineTranscodeFrame(CodecEngine* _ce,
                               const void* _srcFramePtr, size_t _srcFrameSize,
+                              const TargetJpgParams* _targetJpgParams,
                               /*
                               void* _dstFramePtr, size_t _dstFrameSize, size_t* _dstFrameUsed,
                               const TargetDetectParams* _targetDetectParams,

ov7670/jpeg_encoder/include/internal/runtime.h

@@ -46,6 +46,7 @@ typedef struct RuntimeState
   TargetDetectParams      m_targetDetectParams;
   TargetDetectCommand     m_targetDetectCommand;
   bool                    m_videoOutEnable;
+  TargetJpgParams         m_targetJpgParams;
 } RuntimeState;
 
 typedef struct Runtime

ov7670/jpeg_encoder/src/module_ce.c

@@ -198,6 +198,7 @@ static int makeValueWrap(int _val, int _adj, int _min, int _max)
 
 static int do_transcodeFrame(CodecEngine* _ce,
                              const void* _srcFramePtr, size_t _srcFrameSize,
+                             const TargetJpgParams* _targetJpgParams,
                              /*
                              void* _dstFramePtr, size_t _dstFrameSize, size_t* _dstFrameUsed,
                              const TargetDetectParams* _targetDetectParams,
@@ -221,6 +222,8 @@ static int do_transcodeFrame(CodecEngine* _ce,
   tcInArgs.base.size = sizeof(tcInArgs);
   tcInArgs.base.numBytes = _srcFrameSize;
   tcInArgs.base.inputID = 1; // must be non-zero, otherwise caching issues appear
+  tcInArgs.alg.jpgImageQuality = _targetJpgParams->jpgQuality;
+  tcInArgs.alg.ifBlackAndWhite = _targetJpgParams->ifBlackAndWhite;
 //  tcInArgs.alg.autoDetectHsv = _targetDetectCommand->m_cmd;
 
   TRIK_VIDTRANSCODE_CV_OutArgs tcOutArgs;
@@ -439,6 +442,7 @@ int codecEngineStop(CodecEngine* _ce)
 
 int codecEngineTranscodeFrame(CodecEngine* _ce,
                               const void* _srcFramePtr, size_t _srcFrameSize,
+                              const TargetJpgParams* _targetJpgParams,
                               /*
                               void* _dstFramePtr, size_t _dstFrameSize, size_t* _dstFrameUsed,
                               const TargetDetectParams* _targetDetectParams,
@@ -456,7 +460,7 @@ int codecEngineTranscodeFrame(CodecEngine* _ce,
     return ENOTCONN;
 
   res = do_transcodeFrame(_ce,
-                          _srcFramePtr, _srcFrameSize,
+                          _srcFramePtr, _srcFrameSize, _targetJpgParams,
                           /*_dstFramePtr, _dstFrameSize, _dstFrameUsed,
                           _targetDetectParams,
                           _targetDetectCommand,

ov7670/jpeg_encoder/src/runtime.c

@@ -46,6 +46,8 @@ void runtimeReset(Runtime* _runtime)
   pthread_mutex_init(&_runtime->m_state.m_mutex, NULL);
   memset(&_runtime->m_state.m_targetDetectParams,  0, sizeof(_runtime->m_state.m_targetDetectParams));
   memset(&_runtime->m_state.m_targetDetectCommand, 0, sizeof(_runtime->m_state.m_targetDetectCommand));
+  memset(&_runtime->m_state.m_targetJpgParams, 0, sizeof(_runtime->m_state.m_targetJpgParams));//maybe not
+  _runtime->m_state.m_targetJpgParams.jpgQuality = 40; 
 }
 
 
@@ -70,6 +72,8 @@ bool runtimeParseArgs(Runtime* _runtime, int _argc, char* const _argv[])
     { "rc-fifo-in",		1,	NULL,	0   }, // 7
     { "rc-fifo-out",		1,	NULL,	0   },
     { "video-out",		1,	NULL,	0   },
+    { "jpeg-qual",		1,	NULL,	0   },
+    { "white-black",		1,	NULL,	0   },
     { "verbose",		0,	NULL,	'v' },
     { "help",			0,	NULL,	'h' },
     { NULL,			0,	NULL,	0   }
@@ -117,7 +121,11 @@ bool runtimeParseArgs(Runtime* _runtime, int _argc, char* const _argv[])
           case 7  : cfg->m_rcConfig.m_fifoInput  = optarg;					break;
           case 7+1: cfg->m_rcConfig.m_fifoOutput = optarg;					break;
           case 7+2: cfg->m_rcConfig.m_videoOutEnable = atoi(optarg); break;
-
+          case 7+3: _runtime->m_state.m_targetJpgParams.jpgQuality = atoi(optarg); break;
+          case 7+4: 
+            if (strcmp(optarg, "false") == 0) _runtime->m_state.m_targetJpgParams.ifBlackAndWhite = false;
+            else _runtime->m_state.m_targetJpgParams.ifBlackAndWhite = true; 
+            break;
           default:
             return false;
         }
@@ -153,6 +161,8 @@ void runtimeArgsHelpMessage(Runtime* _runtime, const char* _arg0)
                   "   --rc-fifo-in            <remote-control-fifo-input>\n"
                   "   --rc-fifo-out           <remote-control-fifo-output>\n"
                   "   --video-out             <enable-video-output>\n"
+                  "   --jpeg-qual    <desired-video-quality>\n"
+                  "   --black-white  <if-video-should-be-black-and-white>\n"
                   "   --verbose\n"
                   "   --help\n",
           _arg0);
@@ -404,6 +414,17 @@ int runtimeGetTargetDetectParams(Runtime* _runtime, TargetDetectParams* _targetD
   return 0;
 }
 
+int runtimeGetTargetJpgParams(Runtime* _runtime, TargetJpgParams* _targetJpgParams)
+{
+  if (_runtime == NULL || _targetJpgParams == NULL)
+    return EINVAL;
+
+  pthread_mutex_lock(&_runtime->m_state.m_mutex);
+  *_targetJpgParams = _runtime->m_state.m_targetJpgParams;
+  pthread_mutex_unlock(&_runtime->m_state.m_mutex);
+  return 0;
+}
+
 int runtimeSetTargetDetectParams(Runtime* _runtime, const TargetDetectParams* _targetDetectParams)
 {
   if (_runtime == NULL || _targetDetectParams == NULL)

ov7670/jpeg_encoder/src/thread_video.c

@@ -79,6 +79,15 @@ static int threadVideoSelectLoop(Runtime* _runtime, CodecEngine* _ce, V4L2Input*
     return res;
   }
 */
+  TargetJpgParams  targetJpgParams;
+  
+  if ((res = runtimeGetTargetJpgParams(_runtime, &targetJpgParams)) != 0)
+  {
+    fprintf(stderr, "runtimeGetTargetJpgParams() failed: %d\n", res);
+    return res;
+  }
+
+
   if ((res = runtimeGetVideoOutParams(_runtime, &(_ce->m_videoOutEnable))) != 0)
   {
     fprintf(stderr, "runtimeGetVideoOutParams() failed: %d\n", res);
@@ -89,6 +98,7 @@ static int threadVideoSelectLoop(Runtime* _runtime, CodecEngine* _ce, V4L2Input*
 //  size_t frameDstUsed = frameDstSize;
   if ((res = codecEngineTranscodeFrame(_ce,
                                        frameSrcPtr, frameSrcSize,
+                                       &targetJpgParams,
                                        /*frameDstPtr, frameDstSize, &frameDstUsed,
                                        &targetDetectParams,
                                        &targetDetectCommand,