From 8cb96bb66d3de04a3dae3e2c886c4a49736f1b65 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 21 Sep 2014 20:41:25 +0200 Subject: Centralise all media configuration values in mediaconfig.h --- src/v4l.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/v4l.cc') 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 } +#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; -- cgit v1.2.3