Centralise all media configuration values in mediaconfig.h

1 files changed, 5 insertions, 3 deletions

diff --git a/src/v4l.cc b/src/v4l.cc
index bd193f4..ed75f7c 100644
--- a/src/v4l.cc
+++ b/src/v4l.cc
@@ -50,6 +50,8 @@ extern "C" {
 #include <jpeglib.h>
 }
 
+#include "mediaconfig.h"
+
 #define JPEG_HEADER_PAD 500
 
 static bool isYUYV = false;
@@ -173,7 +175,7 @@ static void process_image(const void *p, int size)
   int img_size = size;
 
   if(isYUYV) {
-    toJpeg(70, (unsigned char*)p, 640, 480, (char**)&img, (size_t*)&img_size);
+    toJpeg(70, (unsigned char*)p, V4LWIDTH, V4LHEIGHT, (char**)&img, (size_t*)&img_size);
   }
 
   if(v4l) v4l->processImage(img, img_size);
@@ -590,8 +592,8 @@ static void init_device(void)
 
   fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
   if (true || force_format) {
-    fmt.fmt.pix.width       = 640;
-    fmt.fmt.pix.height      = 480;
+    fmt.fmt.pix.width       = V4LWIDTH; 
+    fmt.fmt.pix.height      = V4LHEIGHT;
     fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_JPEG;
     // fmt.fmt.pix.field       = V4L2_FIELD_NONE;