From 2c4e929f5416c6ad2b6b8afd731c29754a13870c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 14 Mar 2009 03:51:39 +0000 Subject: [PATCH] - force 320x240 for now - fixed uninitialized fields in CamDeframer, it works also in Haiku now :) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29507 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../media/media-add-ons/usb_webcam/CamDeframer.cpp | 8 +++++++- src/add-ons/media/media-add-ons/usb_webcam/Producer.cpp | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamDeframer.cpp b/src/add-ons/media/media-add-ons/usb_webcam/CamDeframer.cpp index 7cf99d6fe9..b14ed1e8a3 100644 --- a/src/add-ons/media/media-add-ons/usb_webcam/CamDeframer.cpp +++ b/src/add-ons/media/media-add-ons/usb_webcam/CamDeframer.cpp @@ -18,8 +18,14 @@ fDevice(device), fState(ST_SYNC), fFrameSem(B_ERROR), fLocker("CamDeframer Framelist lock", true), +fSOFTags(NULL), +fEOFTags(NULL), fNumSOFTags(0), -fNumEOFTags(0) +fNumEOFTags(0), +fLenSOFTags(0), +fLenEOFTags(0), +fSkipSOFTags(0), +fSkipEOFTags(0) { fMinFrameSize = fDevice->MinRawFrameSize(); fMaxFrameSize = fDevice->MaxRawFrameSize(); diff --git a/src/add-ons/media/media-add-ons/usb_webcam/Producer.cpp b/src/add-ons/media/media-add-ons/usb_webcam/Producer.cpp index 479475f0b8..bce8f7d66a 100644 --- a/src/add-ons/media/media-add-ons/usb_webcam/Producer.cpp +++ b/src/add-ons/media/media-add-ons/usb_webcam/Producer.cpp @@ -29,7 +29,7 @@ #define SINGLE_PARAMETER_GROUP 1 // CodyCam and eXposer prefer 320x240 -//#define FORCE_320_240 1 +#define FORCE_320_240 1 //#define FORCE_160_120 1 //#define FORCE_MAX_FRAME 1