You can subscribe to this list here.
2003 |
Jan
(16) |
Feb
(15) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(8) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
|
Dec
|
From: Harald <hx...@us...> - 2010-10-29 19:59:08
|
Update of /cvsroot/webcam-osx/macam/macam.xcodeproj In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv441/macam.xcodeproj Modified Files: project.pbxproj Log Message: Update to compile for Xcode 3.2.4 Index: project.pbxproj =================================================================== RCS file: /cvsroot/webcam-osx/macam/macam.xcodeproj/project.pbxproj,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** project.pbxproj 25 Sep 2009 20:14:46 -0000 1.51 --- project.pbxproj 29 Oct 2010 19:59:00 -0000 1.52 *************** *** 440,444 **** F535ED6208DB3970007943DA /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5AA417801DA8F350157C38C /* IOKit.framework */; }; F535ED6308DB3970007943DA /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F538BD1D01E5D0440166DE0F /* QuickTime.framework */; }; - F535ED6408DB3970007943DA /* ICACameraPriv.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 39FE215504030E7E00BAABE7 /* ICACameraPriv.framework */; }; F535ED6508DB3970007943DA /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F538BD1B01E5D03A0166DE0F /* Carbon.framework */; }; F535F1E308DF2703007943DA /* SPCA5XXDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = F535F1DB08DF2703007943DA /* SPCA5XXDriver.h */; }; --- 440,443 ---- *************** *** 537,540 **** --- 536,540 ---- F5821C880DAC0F690052E94E /* trust_space.init in Resources */ = {isa = PBXBuildFile; fileRef = F5821C610DAC0F690052E94E /* trust_space.init */; }; F5821C890DAC0F690052E94E /* Twinkle.init in Resources */ = {isa = PBXBuildFile; fileRef = F5821C620DAC0F690052E94E /* Twinkle.init */; }; + F58BA891127B5C4F008068AE /* ICADevices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F58BA890127B5C4F008068AE /* ICADevices.framework */; }; F592C8E30974504700183A7D /* spcausb.h in Headers */ = {isa = PBXBuildFile; fileRef = F592C8E20974504700183A7D /* spcausb.h */; }; F592C8E50974504700183A7D /* spcausb.h in Headers */ = {isa = PBXBuildFile; fileRef = F592C8E20974504700183A7D /* spcausb.h */; }; *************** *** 897,901 **** 39CBD65003DC0D79000F7EFC /* MyKiaraFlippedDriver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MyKiaraFlippedDriver.h; sourceTree = "<group>"; }; 39FE214904030BB800BAABE7 /* ICD_CameraCalls.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ICD_CameraCalls.h; sourceTree = "<group>"; }; - 39FE215504030E7E00BAABE7 /* ICACameraPriv.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ICACameraPriv.framework; path = /System/Library/PrivateFrameworks/ICACameraPriv.framework; sourceTree = "<absolute>"; }; F500FB6D022FB1BD01369AA6 /* Global */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = Global; path = app.icns; sourceTree = "<group>"; }; F500FB6E022FB1BD01369AA6 /* DownloadToolbarItem.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = DownloadToolbarItem.tiff; sourceTree = "<group>"; }; --- 897,900 ---- *************** *** 1057,1060 **** --- 1056,1060 ---- F589EB0E02268A6901D99A1F /* MySTV680Driver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MySTV680Driver.h; sourceTree = "<group>"; }; F589EB0F02268A6901D99A1F /* MySTV680Driver.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MySTV680Driver.m; sourceTree = "<group>"; }; + F58BA890127B5C4F008068AE /* ICADevices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ICADevices.framework; path = /System/Library/Frameworks/ICADevices.framework; sourceTree = "<absolute>"; }; F58DB238024E9803019A97FC /* MyImageWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MyImageWindowController.h; sourceTree = "<group>"; }; F58DB239024E9803019A97FC /* MyImageWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MyImageWindowController.m; sourceTree = "<group>"; }; *************** *** 1148,1154 **** F5C80D8D02417A800166DE75 /* MyScrollView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MyScrollView.h; sourceTree = "<group>"; }; F5C80D8E02417A800166DE75 /* MyScrollView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MyScrollView.m; sourceTree = "<group>"; }; ! F5CD7018092AEBF600E9EEE3 /* generate_app.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = generate_app.plist; sourceTree = "<group>"; }; ! F5CD701A092AEC1000E9EEE3 /* generate_ica_module.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = generate_ica_module.plist; sourceTree = "<group>"; }; ! F5CD701C092AEC2600E9EEE3 /* generate_component.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = generate_component.plist; sourceTree = "<group>"; }; F5CFB8AE09D8804E001FBB48 /* CTDC1100Driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CTDC1100Driver.h; sourceTree = "<group>"; }; F5CFB8AF09D8804E001FBB48 /* CTDC1100Driver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CTDC1100Driver.m; sourceTree = "<group>"; }; --- 1148,1154 ---- F5C80D8D02417A800166DE75 /* MyScrollView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MyScrollView.h; sourceTree = "<group>"; }; F5C80D8E02417A800166DE75 /* MyScrollView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MyScrollView.m; sourceTree = "<group>"; }; ! F5CD7018092AEBF600E9EEE3 /* generate_app.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = generate_app.plist; sourceTree = "<group>"; }; ! F5CD701A092AEC1000E9EEE3 /* generate_ica_module.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = generate_ica_module.plist; sourceTree = "<group>"; }; ! F5CD701C092AEC2600E9EEE3 /* generate_component.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = generate_component.plist; sourceTree = "<group>"; }; F5CFB8AE09D8804E001FBB48 /* CTDC1100Driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CTDC1100Driver.h; sourceTree = "<group>"; }; F5CFB8AF09D8804E001FBB48 /* CTDC1100Driver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CTDC1100Driver.m; sourceTree = "<group>"; }; *************** *** 1296,1301 **** F535ED6208DB3970007943DA /* IOKit.framework in Frameworks */, F535ED6308DB3970007943DA /* QuickTime.framework in Frameworks */, - F535ED6408DB3970007943DA /* ICACameraPriv.framework in Frameworks */, F535ED6508DB3970007943DA /* Carbon.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; --- 1296,1301 ---- F535ED6208DB3970007943DA /* IOKit.framework in Frameworks */, F535ED6308DB3970007943DA /* QuickTime.framework in Frameworks */, F535ED6508DB3970007943DA /* Carbon.framework in Frameworks */, + F58BA891127B5C4F008068AE /* ICADevices.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 1340,1344 **** F538BD1D01E5D0440166DE0F /* QuickTime.framework */, F538BD1B01E5D03A0166DE0F /* Carbon.framework */, ! 39FE215504030E7E00BAABE7 /* ICACameraPriv.framework */, ); name = Frameworks; --- 1340,1344 ---- F538BD1D01E5D0440166DE0F /* QuickTime.framework */, F538BD1B01E5D03A0166DE0F /* Carbon.framework */, ! F58BA890127B5C4F008068AE /* ICADevices.framework */, ); name = Frameworks; *************** *** 2290,2293 **** --- 2290,2295 ---- isa = PBXProject; buildConfigurationList = F5E3BBBF08A9C910009E490F /* Build configuration list for PBXProject "macam" */; + compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( *************** *** 2300,2303 **** --- 2302,2306 ---- mainGroup = 29B97314FDCFA39411CA2CEA /* wc */; projectDirPath = ""; + projectRoot = ""; targets = ( F535EC0808DB3970007943DA /* app */, *************** *** 3061,3065 **** GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; - OPTIMIZATION_CFLAGS = "-O0"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; --- 3064,3067 ---- *************** *** 3081,3085 **** COPY_PHASE_STRIP = YES; GCC_ENABLE_FIX_AND_CONTINUE = NO; ! OPTIMIZATION_CFLAGS = "-O2"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; --- 3083,3087 ---- COPY_PHASE_STRIP = YES; GCC_ENABLE_FIX_AND_CONTINUE = NO; ! GCC_OPTIMIZATION_LEVEL = 2; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; *************** *** 3099,3102 **** --- 3101,3106 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; COPY_PHASE_STRIP = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; *************** *** 3116,3120 **** OTHER_LDFLAGS = ""; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; ! SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; ZERO_LINK = NO; }; --- 3120,3124 ---- OTHER_LDFLAGS = ""; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; ! SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; ZERO_LINK = NO; }; *************** *** 3237,3241 **** GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; - OPTIMIZATION_CFLAGS = "-O0"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; --- 3241,3244 ---- *************** *** 3357,3361 **** COPY_PHASE_STRIP = YES; GCC_ENABLE_FIX_AND_CONTINUE = NO; ! OPTIMIZATION_CFLAGS = "-O2"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; --- 3360,3364 ---- COPY_PHASE_STRIP = YES; GCC_ENABLE_FIX_AND_CONTINUE = NO; ! GCC_OPTIMIZATION_LEVEL = 2; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; |
From: Harald <hx...@us...> - 2010-10-29 19:58:53
|
Update of /cvsroot/webcam-osx/macam/component_specific In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv371/component_specific Modified Files: QTVideoDigitizer.m Log Message: Update to compile for Xcode 3.2.4 Index: QTVideoDigitizer.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/component_specific/QTVideoDigitizer.m,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** QTVideoDigitizer.m 23 Sep 2009 20:47:50 -0000 1.13 --- QTVideoDigitizer.m 29 Oct 2010 19:58:44 -0000 1.14 *************** *** 21,25 **** #import "MyCameraCentral.h" ! #include "sys/time.h" #include "Resolvers.h" #include "MiscTools.h" --- 21,26 ---- #import "MyCameraCentral.h" ! #include <sys/time.h> ! #include "Resolvers.h" #include "MiscTools.h" |
From: Harald <hx...@us...> - 2010-10-29 19:58:52
|
Update of /cvsroot/webcam-osx/macam/driver_core In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv371/driver_core Modified Files: MyCameraCentral.m Log Message: Update to compile for Xcode 3.2.4 Index: MyCameraCentral.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/driver_core/MyCameraCentral.m,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** MyCameraCentral.m 23 May 2010 04:34:51 -0000 1.89 --- MyCameraCentral.m 29 Oct 2010 19:58:44 -0000 1.90 *************** *** 404,409 **** [self registerCameraDriver:[SQ930C class]]; ! [self registerCameraDriver:[SQ930B class]]; ! [self registerCameraDriver:[SQ930Bvariant1 class]]; // [self registerCameraDriver:[MyPixartDriver class]]; // Deprecated in favor of PixartDriver - has problems --- 404,409 ---- [self registerCameraDriver:[SQ930C class]]; ! // [self registerCameraDriver:[SQ930B class]]; ! // [self registerCameraDriver:[SQ930Bvariant1 class]]; // [self registerCameraDriver:[MyPixartDriver class]]; // Deprecated in favor of PixartDriver - has problems |
From: Harald <hx...@us...> - 2010-10-29 19:58:52
|
Update of /cvsroot/webcam-osx/macam/utilities In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv371/utilities Modified Files: AGC.m FrameCounter.m Histogram.m Log Message: Update to compile for Xcode 3.2.4 Index: AGC.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/utilities/AGC.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AGC.m 10 Apr 2008 04:32:16 -0000 1.4 --- AGC.m 29 Oct 2010 19:58:44 -0000 1.5 *************** *** 13,16 **** --- 13,17 ---- #include <unistd.h> + #include <sys/time.h> Index: Histogram.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/utilities/Histogram.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Histogram.m 8 Apr 2008 19:47:45 -0000 1.4 --- Histogram.m 29 Oct 2010 19:58:44 -0000 1.5 *************** *** 11,14 **** --- 11,15 ---- #include <unistd.h> + #include <sys/time.h> Index: FrameCounter.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/utilities/FrameCounter.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FrameCounter.m 30 Apr 2008 14:31:28 -0000 1.2 --- FrameCounter.m 29 Oct 2010 19:58:44 -0000 1.3 *************** *** 10,13 **** --- 10,14 ---- #include <unistd.h> + #include <sys/time.h> |
From: Harald <hx...@us...> - 2010-05-23 04:34:59
|
Update of /cvsroot/webcam-osx/macam/driver_core In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1111/driver_core Modified Files: MyCameraCentral.m Log Message: Removing EXPERIMENTAL around SQ930 (still iffy though) Index: MyCameraCentral.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/driver_core/MyCameraCentral.m,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** MyCameraCentral.m 8 May 2009 19:17:37 -0000 1.88 --- MyCameraCentral.m 23 May 2010 04:34:51 -0000 1.89 *************** *** 402,408 **** [self registerCameraDriver:[SQ905CDriver class]]; [self registerCameraDriver:[SQ905Cvariant1 class]]; ! #if EXPERIMENTAL [self registerCameraDriver:[SQ930C class]]; ! #endif // [self registerCameraDriver:[MyPixartDriver class]]; // Deprecated in favor of PixartDriver - has problems // [self registerCameraDriver:[PixartDriver class]]; // Disabled because working on SPCA5XX-based version instead --- 402,410 ---- [self registerCameraDriver:[SQ905CDriver class]]; [self registerCameraDriver:[SQ905Cvariant1 class]]; ! [self registerCameraDriver:[SQ930C class]]; ! [self registerCameraDriver:[SQ930B class]]; ! [self registerCameraDriver:[SQ930Bvariant1 class]]; ! // [self registerCameraDriver:[MyPixartDriver class]]; // Deprecated in favor of PixartDriver - has problems // [self registerCameraDriver:[PixartDriver class]]; // Disabled because working on SPCA5XX-based version instead |
From: <ma...@us...> - 2003-12-22 01:32:53
|
Update of /cvsroot/webcam-osx/macam/macam.pbproj In directory sc8-pr-cvs1:/tmp/cvs-serv27076 Modified Files: project.pbxproj Log Message: added QTDummyPanel Index: project.pbxproj =================================================================== RCS file: /cvsroot/webcam-osx/macam/macam.pbproj/project.pbxproj,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** project.pbxproj 24 Feb 2003 15:21:54 -0000 1.21 --- project.pbxproj 22 Dec 2003 01:32:50 -0000 1.22 *************** *** 4,14 **** classes = { }; ! objectVersion = 38; objects = { 1058C7A1FEA54F0111CA2CBB = { isa = PBXFrameworkReference; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; refType = 0; }; [...2063 lines suppressed...] *** 3921,3934 **** --- 4365,4382 ---- }; F5FC0F23028351A7015925D2 = { + expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; path = MyVV6410Sensor.h; refType = 4; + sourceTree = "<group>"; }; F5FC0F24028351A7015925D2 = { + expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; path = MyVV6410Sensor.m; refType = 4; + sourceTree = "<group>"; }; F5FC0F25028351A7015925D2 = { |
From: <ma...@us...> - 2003-12-22 01:28:46
|
Update of /cvsroot/webcam-osx/macam/cameras In directory sc8-pr-cvs1:/tmp/cvs-serv26176 Modified Files: MyOV511Driver.m MyQCExpressADriver.m Log Message: Removed compiler warnings, re-arranged layout Index: MyOV511Driver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyOV511Driver.m,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** MyOV511Driver.m 17 Mar 2003 17:19:51 -0000 1.12 --- MyOV511Driver.m 22 Dec 2003 01:28:43 -0000 1.13 *************** *** 1089,1093 **** --- 1089,1095 ---- } { + //To avoid compiler warning when NSLog is commented out - mattik int size = Decompress420(grabContext.tmpBuffer, grabContext.chunkBuffer, NULL, width, height, grabContext.tmpLength); + #pragma unused (size) //NSLog(@"OV511:org size %d decomp size = %d", grabContext.tmpLength,size); } Index: MyQCExpressADriver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCExpressADriver.m,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MyQCExpressADriver.m 24 Feb 2003 13:05:08 -0000 1.10 --- MyQCExpressADriver.m 22 Dec 2003 01:28:43 -0000 1.11 *************** *** 290,295 **** } ! void GetFillingChunk(STV600GrabContext* gCtx) ! { //Make sure there is a filling buffer if (gCtx->fillingChunk) --- 290,294 ---- } ! void GetFillingChunk(STV600GrabContext* gCtx) { //Make sure there is a filling buffer if (gCtx->fillingChunk) *************** *** 356,406 **** long dataRunCode; long dataRunLength; ! ! ! gCtx->framesSinceLastChunk+=STV600_FRAMES_PER_TRANSFER; ! ! // USB error handling ! switch (result) ! { ! case 0: ! // no error is fine with us :-) ! break; ! ! case kIOReturnUnderrun: ! case kIOUSBNotSent2Err: ! case kIOReturnIsoTooOld: ! // ignore these errors ! result = 0; ! break; ! ! case kIOReturnOverrun: ! // we didn't setup the transfer in time ! *(gCtx->shouldBeGrabbing) = NO; ! if (! gCtx->err) ! gCtx->err=CameraErrorTimeout; ! break; ! ! default: ! *(gCtx->shouldBeGrabbing) = NO; ! if (!gCtx->err) ! gCtx->err=CameraErrorUSBProblem; ! ! // log to console ! CheckError(result,"isocComplete"); } ! ! if (*(gCtx->shouldBeGrabbing)) ! { ! //look up which transfer we are ! while ((!frameListFound)&&(transferIdx<STV600_NUM_TRANSFERS)) ! { ! if ((gCtx->transferContexts[transferIdx].frameList)==myFrameList) ! frameListFound=true; ! else ! transferIdx++; } ! ! if (!frameListFound) ! { #ifdef VERBOSE NSLog(@"isocComplete: Didn't find my frameList"); --- 355,399 ---- long dataRunCode; long dataRunLength; ! ! ! gCtx->framesSinceLastChunk+=STV600_FRAMES_PER_TRANSFER; ! ! // USB error handling ! switch (result) { ! case 0: ! // no error is fine with us :-) ! break; ! ! case kIOReturnUnderrun: ! case kIOUSBNotSent2Err: ! case kIOReturnIsoTooOld: ! // ignore these errors ! result = 0; ! break; ! ! case kIOReturnOverrun: ! // we didn't setup the transfer in time ! *(gCtx->shouldBeGrabbing) = NO; ! if (! gCtx->err) ! gCtx->err=CameraErrorTimeout; ! break; ! ! default: ! *(gCtx->shouldBeGrabbing) = NO; ! if (!gCtx->err) ! gCtx->err=CameraErrorUSBProblem; ! ! // log to console ! CheckError(result,"isocComplete"); } ! ! if (*(gCtx->shouldBeGrabbing)) { ! //look up which transfer we are ! while ((!frameListFound)&&(transferIdx<STV600_NUM_TRANSFERS)) { ! if ((gCtx->transferContexts[transferIdx].frameList)==myFrameList) frameListFound=true; ! else transferIdx++; } ! ! if (!frameListFound) { #ifdef VERBOSE NSLog(@"isocComplete: Didn't find my frameList"); *************** *** 409,436 **** } } ! ! if (*(gCtx->shouldBeGrabbing)) ! { ! //let's have a look into the usb frames we got ! for (i=0;i<STV600_FRAMES_PER_TRANSFER;i++) ! { ! // cache this - it won't change and we need it several times ! const long currFrameLength = myFrameList[i].frActCount; ! frameRun=0; frameBase=gCtx->transferContexts[transferIdx].buffer+gCtx->bytesPerFrame*i; ! ! while (frameRun<currFrameLength) ! { dataRunCode = (frameBase[frameRun] <<8)+frameBase[frameRun+1]; dataRunLength = (frameBase[frameRun+2]<<8)+frameBase[frameRun+3]; frameRun += 4; ! ! switch (dataRunCode) ! { case 0x8005: //Start of image chunk - sensor change pending (???) case 0xc001: //Start of image chunk - some exposure error (???) case 0xc005: //Start of image chunk - some exposure error (???) ! // NSLog (@"flagged start chunk"); case 0x8001: //Start of image chunk GetFillingChunk(gCtx); --- 402,425 ---- } } ! ! if (*(gCtx->shouldBeGrabbing)) { ! //let's have a look into the usb frames we got ! for (i=0;i<STV600_FRAMES_PER_TRANSFER;i++) { ! // cache this - it won't change and we need it several times ! const long currFrameLength = myFrameList[i].frActCount; ! frameRun=0; frameBase=gCtx->transferContexts[transferIdx].buffer+gCtx->bytesPerFrame*i; ! ! while (frameRun<currFrameLength) { dataRunCode = (frameBase[frameRun] <<8)+frameBase[frameRun+1]; dataRunLength = (frameBase[frameRun+2]<<8)+frameBase[frameRun+3]; frameRun += 4; ! ! switch (dataRunCode) { case 0x8005: //Start of image chunk - sensor change pending (???) case 0xc001: //Start of image chunk - some exposure error (???) case 0xc005: //Start of image chunk - some exposure error (???) ! // NSLog (@"flagged start chunk"); case 0x8001: //Start of image chunk GetFillingChunk(gCtx); *************** *** 439,443 **** case 0xc002: //End of image chunk - some exposure error (???) case 0xc006: //End of image chunk - some exposure error (???) ! // NSLog (@"flagged end chunk"); case 0x8002: //End of image chunk gCtx->framesSinceLastChunk=0; --- 428,432 ---- case 0xc002: //End of image chunk - some exposure error (???) case 0xc006: //End of image chunk - some exposure error (???) ! // NSLog (@"flagged end chunk"); case 0x8002: //End of image chunk gCtx->framesSinceLastChunk=0; *************** *** 445,468 **** break; case 0x4200: //Data run with some flag set (lighting? timing?) ! // NSLog (@"flagged data chunk"); case 0x0200: //Data run ! if (gCtx->fillingChunk) ! { ! if (gCtx->fillingChunkBuffer.numBytes+dataRunLength<=gCtx->chunkBufferLength) ! { ! // copy the data run to our chunk memcpy (gCtx->fillingChunkBuffer.buffer ! + gCtx->fillingChunkBuffer.numBytes, ! frameBase+frameRun, ! dataRunLength); ! ! gCtx->fillingChunkBuffer.numBytes+=dataRunLength; } - else - { - //Buffer Overflow - NSLog (@"buffer overflow"); - DiscardFillingChunk(gCtx); - } } break; --- 434,452 ---- break; case 0x4200: //Data run with some flag set (lighting? timing?) ! // NSLog (@"flagged data chunk"); case 0x0200: //Data run ! if (gCtx->fillingChunk) { ! if (gCtx->fillingChunkBuffer.numBytes+dataRunLength<=gCtx->chunkBufferLength) { ! // copy the data run to our chunk memcpy (gCtx->fillingChunkBuffer.buffer ! + gCtx->fillingChunkBuffer.numBytes, ! frameBase+frameRun, ! dataRunLength); ! gCtx->fillingChunkBuffer.numBytes+=dataRunLength; ! } else { ! //Buffer Overflow ! NSLog (@"buffer overflow"); ! DiscardFillingChunk(gCtx); } } break; *************** *** 471,475 **** if (dataRunLength) DumpMem(frameBase+frameRun,dataRunLength); break; ! }; frameRun+=dataRunLength; } --- 455,459 ---- if (dataRunLength) DumpMem(frameBase+frameRun,dataRunLength); break; ! } frameRun+=dataRunLength; } *************** *** 477,501 **** } ! if (gCtx->framesSinceLastChunk>1000) ! { ! // more than a second without data? *(gCtx->shouldBeGrabbing)=NO; ! if (!gCtx->err) ! gCtx->err=CameraErrorUSBProblem; } ! ! if (*(gCtx->shouldBeGrabbing)) ! { ! // initiate next transfer ! if (!StartNextIsochRead(gCtx,transferIdx)) ! *(gCtx->shouldBeGrabbing)=NO; } ! ! if (!(*(gCtx->shouldBeGrabbing))) ! { ! // on error: collect finished transfers and exit if all transfers have ended gCtx->finishedTransfers++; ! if ((gCtx->finishedTransfers)>=(STV600_NUM_TRANSFERS)) ! { CFRunLoopStop(CFRunLoopGetCurrent()); } --- 461,479 ---- } ! if (gCtx->framesSinceLastChunk>1000) { ! // more than a second without data? *(gCtx->shouldBeGrabbing)=NO; ! if (!gCtx->err) gCtx->err=CameraErrorUSBProblem; } ! ! if (*(gCtx->shouldBeGrabbing)) { ! // initiate next transfer ! if (!StartNextIsochRead(gCtx,transferIdx)) *(gCtx->shouldBeGrabbing)=NO; } ! ! if (!(*(gCtx->shouldBeGrabbing))) { ! // on error: collect finished transfers and exit if all transfers have ended gCtx->finishedTransfers++; ! if ((gCtx->finishedTransfers)>=(STV600_NUM_TRANSFERS)) { CFRunLoopStop(CFRunLoopGetCurrent()); } *************** *** 673,738 **** // Forward decoding thread error if sensible ! if (!err) ! return grabContext.err; ! else ! return err; } ! - (void) decodeChunk:(STV600ChunkBuffer*) chunkBuffer ! { ! unsigned char * bayerData = 0; ! ! // no need to decode ! if (!nextImageBufferSet) ! { ! NSLog (@"no next image buffer set"); return; ! } ! ! // lock image buffer access ! [imageBufferLock lock]; ! ! // check if an output buffer is available if (!nextImageBuffer) ! { ! // release lock ! [imageBufferLock unlock]; ! NSLog (@"no next image buffer"); ! return; ! } ! ! // quick-hack fix by Mark.Asbach ! if (resolution==ResolutionCIF) ! bayerData = chunkBuffer->buffer + 3; ! else ! bayerData = chunkBuffer->buffer + 2; ! ! // convert the data ! [bayerConverter convertFromSrc: bayerData ! toDest: nextImageBuffer ! srcRowBytes: [self width] + extraBytesInLine ! dstRowBytes: nextImageBufferRowBytes ! dstBPP: nextImageBufferBPP ! flip: hFlip]; ! ! // advance buffer ! lastImageBuffer = nextImageBuffer; ! lastImageBufferBPP = nextImageBufferBPP; ! lastImageBufferRowBytes = nextImageBufferRowBytes; ! ! // nextBuffer has been eaten up ! nextImageBufferSet = NO; ! ! // release lock ! [imageBufferLock unlock]; ! ! // notify delegate about the image. perhaps get a new buffer [self mergeImageReady]; ! ! // adapt gain if necessary ! if (autoGain) ! { ! [sensor setLastMeanBrightness: [bayerConverter lastMeanBrightness]]; ! [sensor adjustExposure]; } } --- 651,714 ---- // Forward decoding thread error if sensible ! if (!err) return grabContext.err; ! else return err; } ! - (void) decodeChunk:(STV600ChunkBuffer*) chunkBuffer { ! unsigned char * bayerData = 0; ! ! // no need to decode ! if (!nextImageBufferSet) { ! NSLog (@"no next image buffer set"); return; ! } ! ! // lock image buffer access ! [imageBufferLock lock]; ! ! // check if an output buffer is available if (!nextImageBuffer) ! { ! // release lock ! [imageBufferLock unlock]; ! NSLog (@"no next image buffer"); ! return; ! } ! ! // quick-hack fix by Mark.Asbach ! //disabled because it causes trouble with QCWeb / VV6410 - mattik ! ! /* if (resolution==ResolutionCIF) ! bayerData = chunkBuffer->buffer + 3; ! else ! */ ! bayerData = chunkBuffer->buffer + 2; ! ! // convert the data ! [bayerConverter convertFromSrc: bayerData ! toDest: nextImageBuffer ! srcRowBytes: [self width] + extraBytesInLine ! dstRowBytes: nextImageBufferRowBytes ! dstBPP: nextImageBufferBPP ! flip: hFlip]; ! ! // advance buffer ! lastImageBuffer = nextImageBuffer; ! lastImageBufferBPP = nextImageBufferBPP; ! lastImageBufferRowBytes = nextImageBufferRowBytes; ! ! // nextBuffer has been eaten up ! nextImageBufferSet = NO; ! ! // release lock ! [imageBufferLock unlock]; ! ! // notify delegate about the image. perhaps get a new buffer [self mergeImageReady]; ! ! // adapt gain if necessary ! if (autoGain) { ! [sensor setLastMeanBrightness: [bayerConverter lastMeanBrightness]]; ! [sensor adjustExposure]; } } |
From: <ma...@us...> - 2003-12-22 01:26:43
|
Update of /cvsroot/webcam-osx/macam/app_specific In directory sc8-pr-cvs1:/tmp/cvs-serv25893 Added Files: QTDummyPanel.h QTDummyPanel.m Log Message: Initial version --- NEW FILE: QTDummyPanel.h --- /* macam - webcam app and QuickTime driver component Copyright (C) 2002 Matthias Krauss (ma...@ma...) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA $Id: QTDummyPanel.h,v 1.1 2003/12/22 01:26:39 mattik Exp $ */ /* QTDummyComponent.h and QTDummyComponent.m define a dummy "Sequence Grabber Panel" (sgpn) component. It has no functionality in itself. Its sole purpose is to be registered. It has the same signature (type, subtype, creator) as the sgpn component that macam.component uses. But it has a higher version number. It is registered to the component database before QuickTime is launched. Now QuickTime considers macam.component to be outdated and therefore doesn't even try to load it any more. Caution! Higher art of dirty workaround. Don't try this at home... :) */ #ifndef _QT_SG_DUMMY_PANEL_ #define _QT_SG_DUMMY_PANEL_ #include <Carbon/Carbon.h> #include <QuickTime/QuickTime.h> #include <QuickTime/QuickTimeComponents.h> #include <QuickTime/QuickTimeComponents.k.h> #include "GlobalDefs.h" //Component Registration void RegisterDummyComponent (void); //Main Entry pascal ComponentResult sgpnMainEntry (ComponentParameters *params, Handle storage); //Function Dispatcher bool sgpnLookupSelector(short what,ProcPtr* ptr,ProcInfoType* info); //Required Generic Component Functions pascal ComponentResult sgpnRegister(void* storage); pascal ComponentResult sgpnOpen(void* storage, ComponentInstance self); pascal ComponentResult sgpnClose(void* storage, ComponentInstance self); pascal ComponentResult sgpnCanDo(void* storage, short ftnNumber); pascal ComponentResult sgpnVersion(void* storage); #endif _QT_SG_DUMMY_PANEL_ --- NEW FILE: QTDummyPanel.m --- /* macam - webcam app and QuickTime driver component Copyright (C) 2002 Matthias Krauss (ma...@ma...) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA $Id: QTDummyPanel.m,v 1.1 2003/12/22 01:26:39 mattik Exp $ */ #include "QTDummyPanel.h" #include "Resolvers.h" #include <ApplicationServices/ApplicationServices.h> #include <QuickTime/QuickTimeComponents.k.h> #include "QTVideoDigitizer.h" void RegisterDummyComponent (void) { ComponentDescription cd; cd.componentType='sgpn'; cd.componentSubType='vide'; cd.componentManufacturer='MaCa'; cd.componentFlags= componentHasMultiplePlatforms +cmpWantsRegisterMessage +componentDoAutoVersion +componentAutoVersionIncludeFlags; cd.componentFlagsMask=0; Str255 pname="\pDummy sgpn"; Str255 pdesc="\pDummy sgpn to prevent macam app from loading macam component"; Handle name; Handle desc; PtrToHand ((Ptr)pname, &name, pname[0]+1); PtrToHand ((Ptr)pdesc, &desc, pdesc[0]+1); RegisterComponent (&cd, NewComponentRoutineUPP(&sgpnMainEntry), 0, name, desc, NULL); } pascal ComponentResult sgpnMainEntry (ComponentParameters *params, Handle storage) { ComponentResult err = 0; ProcPtr procPtr = 0; ProcInfoType procInfo; #ifdef LOG_QT_CALLS char selectorName[200]; if(ResolveVDSelector(params->what, selectorName)) { printf("QT call to dummy sgpn:%s\n",selectorName); } else { printf("QT call to dummy sgpn with unknown selector %d\n",params->what); } #endif if (sgpnLookupSelector(params->what,&procPtr,&procInfo)) { err=CallComponentFunctionWithStorageProcInfo((Handle)storage, params, procPtr,procInfo); } else { err=badComponentSelector; } #ifdef LOG_QT_CALLS printf("QT call resulted in %d\n",(int)err); #endif return err; } bool sgpnLookupSelector(short what,ProcPtr* ptr,ProcInfoType* info) { bool ok=true; if (what < 0) { switch(what) { case kComponentRegisterSelect: *info=uppCallComponentRegisterProcInfo; *ptr=(ComponentRoutineUPP)sgpnRegister; break; case kComponentOpenSelect: *info=uppCallComponentOpenProcInfo; *ptr=(ComponentRoutineUPP)sgpnOpen; break; case kComponentCloseSelect: *info=uppCallComponentCloseProcInfo; *ptr=(ComponentRoutineUPP)sgpnClose; break; case kComponentCanDoSelect: *info=uppCallComponentCanDoProcInfo; *ptr=(ComponentRoutineUPP)sgpnCanDo; break; case kComponentVersionSelect: *info=uppCallComponentVersionProcInfo; *ptr=(ComponentRoutineUPP)sgpnVersion; break; default: ok=false; break; } } else ok=false; return ok; } pascal ComponentResult sgpnRegister(void* storage) { return 0; } pascal ComponentResult sgpnUnregister(void* storage) { return 0; } pascal ComponentResult sgpnOpen(void* storage, ComponentInstance self) { return 0; } pascal ComponentResult sgpnClose(void* storage, ComponentInstance self) { return 0; } pascal ComponentResult sgpnCanDo(void* storage, short ftnNumber) { ProcPtr procPtr; ProcInfoType procInfo; if (sgpnLookupSelector(ftnNumber,&procPtr,&procInfo)) return 1; else return 0; } pascal ComponentResult sgpnVersion(void* storage) { return 0x00990099; } |
From: <ma...@us...> - 2003-12-22 01:25:09
|
Update of /cvsroot/webcam-osx/macam/component_specific In directory sc8-pr-cvs1:/tmp/cvs-serv25657 Modified Files: QTPanel.m QTVideoDigitizer.m Log Message: Panther fix Index: QTPanel.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/component_specific/QTPanel.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** QTPanel.m 30 Jan 2003 11:26:08 -0000 1.2 --- QTPanel.m 22 Dec 2003 01:25:05 -0000 1.3 *************** *** 58,62 **** char selectorName[200]; if(ResolveVDSelector(params->what, selectorName)) { ! printf("QT call to %s\n",selectorName); } else { printf("QT call unknown selector %d\n",params->what); --- 58,62 ---- char selectorName[200]; if(ResolveVDSelector(params->what, selectorName)) { ! printf("QT call to sgpn:%s\n",selectorName); } else { printf("QT call unknown selector %d\n",params->what); *************** *** 128,135 **** unsigned long cid; Component comp; ! MyCameraCentral* central=[[MyCameraCentral alloc] init]; MyBridge* bridge; char cname[256]; Str255 pname; if (!central) return 0; if (![central startupWithNotificationsOnMainThread:NO recognizeLaterPlugins:NO]) return 0; --- 128,145 ---- unsigned long cid; Component comp; ! ! //Bail if the camera central has already been loaded (might register-loop infinitely...) ! if ([MyCameraCentral isCameraCentralExisting]) { ! #ifdef VERBOSE ! NSLog(@"Camera central already inited - probably duplicate register. Skipping..."); ! #endif ! return 1; ! } ! ! MyCameraCentral* central; MyBridge* bridge; char cname[256]; Str255 pname; + central=[MyCameraCentral sharedCameraCentral]; if (!central) return 0; if (![central startupWithNotificationsOnMainThread:NO recognizeLaterPlugins:NO]) return 0; Index: QTVideoDigitizer.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/component_specific/QTVideoDigitizer.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** QTVideoDigitizer.m 22 May 2002 04:57:16 -0000 1.1.1.1 --- QTVideoDigitizer.m 22 Dec 2003 01:25:06 -0000 1.2 *************** *** 15,19 **** You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA $Id$ */ --- 15,19 ---- You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA $Id$ */ *************** *** 38,42 **** #endif if(ResolveVDSelector(params->what, selectorName)) { ! NSLog(@"QT call to %s\n",selectorName); } else { NSLog(@"QT call unknown selector %d\n",params->what); --- 38,42 ---- #endif if(ResolveVDSelector(params->what, selectorName)) { ! NSLog(@"QT call to vdig: %s\n",selectorName); } else { NSLog(@"QT call unknown selector %d\n",params->what); |
From: <ma...@us...> - 2003-12-22 01:23:27
|
Update of /cvsroot/webcam-osx/macam/driver_core In directory sc8-pr-cvs1:/tmp/cvs-serv25481 Modified Files: MyCameraCentral.m MyCameraCentral.h Log Message: Added singleton constructor Index: MyCameraCentral.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/driver_core/MyCameraCentral.m,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** MyCameraCentral.m 24 Feb 2003 13:04:20 -0000 1.19 --- MyCameraCentral.m 22 Dec 2003 01:23:24 -0000 1.20 *************** *** 53,56 **** --- 53,58 ---- static NSString* driverBundleName=@"net.sourceforge.webcam-osx.common"; static NSMutableDictionary* prefsDict=NULL; + MyCameraCentral* sharedCameraCentral=NULL; + @interface MyCameraCentral (Private) *************** *** 66,69 **** --- 68,84 ---- @implementation MyCameraCentral + + + //MyCameraCentral is a singleton. Use this function to get the shared instance + + (MyCameraCentral*) sharedCameraCentral { + if (!sharedCameraCentral) sharedCameraCentral=[[MyCameraCentral alloc] init]; + return sharedCameraCentral; + } + + //See if someone has requested MyCameraCentral before + + (BOOL) isCameraCentralExisting { + return (sharedCameraCentral!=NULL)?YES:NO; + } + //Localization for driver-specific stuff. As a component, the standard stuff won't work... Index: MyCameraCentral.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/driver_core/MyCameraCentral.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MyCameraCentral.h 24 Feb 2003 13:04:20 -0000 1.5 --- MyCameraCentral.h 22 Dec 2003 01:23:24 -0000 1.6 *************** *** 56,59 **** --- 56,65 ---- } + //Access to the shared instance of MyCameraCentral + + (MyCameraCentral*) sharedCameraCentral; + + //See if someone has requested (and therefore initialized) MyCameraCentral before + + (BOOL) isCameraCentralExisting; + //Localization services - we may be in an external application so system services won't work dirctly. Make sure you have an an AutoreleasePool + (NSString*) localizedStringFor:(NSString*) str; |
From: <ma...@us...> - 2003-12-22 01:22:07
|
Update of /cvsroot/webcam-osx/macam/ica_specific In directory sc8-pr-cvs1:/tmp/cvs-serv25167 Modified Files: main.m Log Message: Moved to central singleton constructor Index: main.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/ica_specific/main.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** main.m 24 Feb 2003 10:18:24 -0000 1.1 --- main.m 22 Dec 2003 01:22:04 -0000 1.2 *************** *** 402,406 **** EnterMovies(); //Init camera central ! central=[[MyCameraCentral alloc] init]; delegate=[[MyDriverDelegate alloc] init]; [central setDelegate:delegate]; --- 402,406 ---- EnterMovies(); //Init camera central ! central=[MyCameraCentral sharedCameraCentral]; delegate=[[MyDriverDelegate alloc] init]; [central setDelegate:delegate]; |
From: <ma...@us...> - 2003-12-22 01:18:42
|
Update of /cvsroot/webcam-osx/macam/app_specific In directory sc8-pr-cvs1:/tmp/cvs-serv24437 Modified Files: main.m Log Message: Panther Fix - Merry Christmas Index: main.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/app_specific/main.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.m 12 Nov 2002 15:54:19 -0000 1.3 --- main.m 22 Dec 2003 01:18:36 -0000 1.4 *************** *** 21,28 **** #import <Cocoa/Cocoa.h> ! #import <QuickTime/QuickTime.h> int main(int argc, const char *argv[]) { EnterMovies(); return NSApplicationMain(argc, argv); --- 21,31 ---- #import <Cocoa/Cocoa.h> ! #include <Carbon/Carbon.h> ! #include <QuickTime/QuickTime.h> ! #include "QTDummyPanel.h" int main(int argc, const char *argv[]) { + RegisterDummyComponent(); EnterMovies(); return NSApplicationMain(argc, argv); |
From: <ma...@us...> - 2003-12-22 01:17:26
|
Update of /cvsroot/webcam-osx/macam/app_specific In directory sc8-pr-cvs1:/tmp/cvs-serv24209 Modified Files: MyController.m Log Message: Removed obsolete patch Index: MyController.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/app_specific/MyController.m,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** MyController.m 27 Jul 2003 04:55:56 -0000 1.14 --- MyController.m 22 Dec 2003 01:17:23 -0000 1.15 *************** *** 68,79 **** NSString* shortVersion; NSDictionary* dict; ! /* ! ! The following is a workaround for a quite weird thing. If there are classes that were not instantiated before the QuickTime component loads, the app will quit with a strange error message: "objc: thread is already initializing this class!". No crash log, nothing. Just a quit with error code 1. I guess its cause is that these classes have two implementations loaded. And I guess it's a rare bug in Apple's code (might also be mine, I couldn't find anything in the web. Please someone tell me what's going on... ! ! */ ! [[[BayerConverter alloc] init] release]; ! [[[RGBScaler alloc] init] release]; ! //Get our short version string if ([[NSBundle mainBundle] respondsToSelector:@selector(objectForInfoDictionaryKey:)]) { --- 68,72 ---- NSString* shortVersion; NSDictionary* dict; ! //Get our short version string if ([[NSBundle mainBundle] respondsToSelector:@selector(objectForInfoDictionaryKey:)]) { |
From: <tmo...@us...> - 2003-07-27 04:56:00
|
Update of /cvsroot/webcam-osx/macam/utilities In directory sc8-pr-cvs1:/tmp/cvs-serv15577/utilities Modified Files: GlobalDefs.h Log Message: Added controls for black and white mode on Philips cameras, also controls for the LED on Philips ToUCam cameras (might works on vesta's as well Index: GlobalDefs.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/utilities/GlobalDefs.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GlobalDefs.h 27 Jan 2003 17:22:01 -0000 1.4 --- GlobalDefs.h 27 Jul 2003 04:55:57 -0000 1.5 *************** *** 59,62 **** --- 59,67 ---- } CameraError; + typedef enum ColorMode { + ColorModeColor = 1, + ColorModeGray = 2 + } ColorMode; + //Global build settings. Comment unwanted stuff out |
From: <tmo...@us...> - 2003-07-27 04:56:00
|
Update of /cvsroot/webcam-osx/macam/driver_core In directory sc8-pr-cvs1:/tmp/cvs-serv15577/driver_core Modified Files: MyCameraDriver.h MyCameraDriver.m Log Message: Added controls for black and white mode on Philips cameras, also controls for the LED on Philips ToUCam cameras (might works on vesta's as well Index: MyCameraDriver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/driver_core/MyCameraDriver.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MyCameraDriver.h 24 Feb 2003 13:04:01 -0000 1.6 --- MyCameraDriver.h 27 Jul 2003 04:55:56 -0000 1.7 *************** *** 61,64 **** --- 61,66 ---- CameraResolution resolution; WhiteBalanceMode whiteBalanceMode; + BOOL blackWhiteMode; // is color or Black and White (greyscale) + BOOL LEDon; // is the LED on or off (Philips cameras) short fps; short compression; //0 = uncompressed, higher means more compressed *************** *** 166,169 **** --- 168,176 ---- - (void) setAutoGain:(BOOL)v; + //LED ON / OFF + - (BOOL) canSetLed; + - (BOOL) isLedOn; + - (void) setLed:(BOOL)v; + //Horizontal flipping - (BOOL) canSetHFlip; //Horizontal flipping *************** *** 182,185 **** --- 189,198 ---- - (WhiteBalanceMode) whiteBalanceMode; - (void) setWhiteBalanceMode:(WhiteBalanceMode)newMode; + + //Black & White Mode + - (BOOL) canBlackWhiteMode; + - (BOOL) blackWhiteMode; + - (void) setBlackWhiteMode:(BOOL)newMode; + //Resolution and frame rate Index: MyCameraDriver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/driver_core/MyCameraDriver.m,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MyCameraDriver.m 24 Feb 2003 13:04:01 -0000 1.9 --- MyCameraDriver.m 27 Jul 2003 04:55:56 -0000 1.10 *************** *** 69,72 **** --- 69,73 ---- compression=0; whiteBalanceMode=WhiteBalanceLinear; + blackWhiteMode = FALSE; isStarted=NO; isGrabbing=NO; *************** *** 312,315 **** --- 313,355 ---- } } + + + // ============== Color Mode ====================== + + - (BOOL) canBlackWhiteMode { + return NO; + } + + + - (BOOL) blackWhiteMode { + return blackWhiteMode; + } + + - (void) setBlackWhiteMode:(BOOL)newMode { + if ([self canBlackWhiteMode]) { + blackWhiteMode=newMode; + } + } + + + //================== Light Emitting Diode + + - (BOOL) canSetLed { + return NO; + } + + + - (BOOL) isLedOn { + return LEDon; + } + + - (void) setLed:(BOOL)v { + if ([self canSetLed]) { + LEDon=v; + } + } + + + // ========================= - (short) width { //Current image width |
From: <tmo...@us...> - 2003-07-27 04:55:59
|
Update of /cvsroot/webcam-osx/macam/component_specific In directory sc8-pr-cvs1:/tmp/cvs-serv15577/component_specific Modified Files: MyBridge.h MyBridge.m Log Message: Added controls for black and white mode on Philips cameras, also controls for the LED on Philips ToUCam cameras (might works on vesta's as well Index: MyBridge.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/component_specific/MyBridge.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** MyBridge.h 22 May 2002 04:57:14 -0000 1.1.1.1 --- MyBridge.h 27 Jul 2003 04:55:56 -0000 1.2 *************** *** 136,141 **** - (BOOL) canSetWhiteBalanceMode; //If camera can adjust white balance at all - (BOOL) canSetWhiteBalanceModeTo:(WhiteBalanceMode)m; //If the camera supports a specific whiute balance setting ! - (WhiteBalanceMode) whiteBalanceMode; //TRhe current white balance mode - (void) setWhiteBalanceMode:(WhiteBalanceMode)m; //Set the current white balance mode - (short) width; //Returns the current grabbing width in pixels - (short) height; //Returns the current grabbing height in pixels --- 136,150 ---- - (BOOL) canSetWhiteBalanceMode; //If camera can adjust white balance at all - (BOOL) canSetWhiteBalanceModeTo:(WhiteBalanceMode)m; //If the camera supports a specific whiute balance setting ! - (WhiteBalanceMode) whiteBalanceMode; //The current white balance mode - (void) setWhiteBalanceMode:(WhiteBalanceMode)m; //Set the current white balance mode + + - (BOOL) canBlackWhiteMode; //If camera can adjust color/greyscale at all + - (BOOL) blackWhiteMode; //The current color mode + - (void) setBlackWhiteModeMode:(BOOL)m; //Set the current color mode + + - (BOOL) canSetLed; //Can the camera toggle its LED + - (BOOL) isLedOn; //The current LED status + - (void) setLed:(BOOL)v; //Set the LED status + - (short) width; //Returns the current grabbing width in pixels - (short) height; //Returns the current grabbing height in pixels Index: MyBridge.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/component_specific/MyBridge.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** MyBridge.m 22 May 2002 04:57:15 -0000 1.1.1.1 --- MyBridge.m 27 Jul 2003 04:55:56 -0000 1.2 *************** *** 433,436 **** --- 433,475 ---- } + + // ================= Color & Grey Mode + + - (BOOL) canBlackWhiteMode { + if (driver) return [driver canBlackWhiteMode]; + else return NO; + } + + + - (BOOL) blackWhiteMode { + if (driver) + return [driver blackWhiteMode]; + else + return NO; // default to color mode + } + + - (void) setBlackWhiteMode:(BOOL)m { + if (driver) [driver setBlackWhiteMode:m]; + } + + // =================== LED state + + - (BOOL) canSetLed { + if (driver) return [driver canSetLed]; + else return NO; + } + + + - (BOOL) isLedOn { + if (driver) return [driver isLedOn]; + else return FALSE; + } + + - (void) setLed:(BOOL)v { + if (driver) [driver setLed:v]; + } + + // ============================= + - (short) width { if (driver) return [driver width]; |
From: <tmo...@us...> - 2003-07-27 04:55:59
|
Update of /cvsroot/webcam-osx/macam/cameras In directory sc8-pr-cvs1:/tmp/cvs-serv15577/cameras Modified Files: MyKiaraFamilyDriver.h MyKiaraFamilyDriver.m MyPhilipsCameraDriver.h MyPhilipsCameraDriver.m Log Message: Added controls for black and white mode on Philips cameras, also controls for the LED on Philips ToUCam cameras (might works on vesta's as well Index: MyKiaraFamilyDriver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyKiaraFamilyDriver.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MyKiaraFamilyDriver.h 24 Feb 2003 13:05:09 -0000 1.3 --- MyKiaraFamilyDriver.h 27 Jul 2003 04:55:56 -0000 1.4 *************** *** 33,36 **** --- 33,37 ---- - (void) setResolution:(CameraResolution)r fps:(short)fr; //Set a resolution and frame rate. - (CameraResolution) defaultResolutionAndRate:(short*)fps; + - (void) setLed:(BOOL)v; // switch LED on/off Index: MyKiaraFamilyDriver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyKiaraFamilyDriver.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MyKiaraFamilyDriver.m 24 Feb 2003 13:05:09 -0000 1.4 --- MyKiaraFamilyDriver.m 27 Jul 2003 04:55:56 -0000 1.5 *************** *** 41,44 **** --- 41,321 ---- static long numFormats=7; + + /* + Here is a table of sniffed data. I have no idea what this means + + {ResolutionVGA, 5, 192, 1,{0x25,0x7a,0xe8,0x9,0xd4,0x7,0x4,0xb,0x30,0xc0,0x0,0x80}}, + {ResolutionVGA, 10, 447, 1,{0x24,0x7a,0xe8,0xb,0x7d,0x8,0xad,0xa,0x48,0xbf,0x1,0x80}}, + {ResolutionVGA, 15, 590, 1,{0x23,0x7a,0xe8,0xa,0x1c,0x7,0x4c,0xc,0x58,0x4e,0x2,0x80}}, + {ResolutionVGA, 20, 192, 1,{0x22,0x7a,0xe8,0x4,0xd1,0x3,0x69,0x1e,0x38,0xc0,0x0,0x80}}, + {ResolutionVGA, 25, 290, 1,{0x21,0x7a,0xe8,0x6,0x2f,0x4,0xc7,0x19,0x38,0x22,0x1,0x80}}, + {ResolutionCIF, 5, 192, 1,{0x25,0x7a,0xe8,0x9,0xd4,0x7,0x4,0xb,0x30,0xc0,0x0,0x80}}, + {ResolutionCIF, 10, 447, 1,{0x24,0x7a,0xe8,0xb,0x7d,0x8,0xad,0xa,0x48,0xbf,0x1,0x80}}, + {ResolutionCIF, 15, 590, 1,{0x23,0x7a,0xe8,0xa,0x1c,0x7,0x4c,0xc,0x58,0x4e,0x2,0x80}}, + {ResolutionCIF, 20, 192, 1,{0x22,0x7a,0xe8,0x4,0xd1,0x3,0x69,0x1e,0x38,0xc0,0x0,0x80}}, + {ResolutionCIF, 25, 290, 1,{0x21,0x7a,0xe8,0x6,0x2f,0x4,0xc7,0x19,0x38,0x22,0x1,0x80}}, + {ResolutionSIF, 5, 191, 1,{0x5,0xf4,0x50,0x13,0xa9,0x12,0x19,0x5,0x18,0xbf,0x0,0x80}}, + {ResolutionSIF, 10, 192, 1,{0x4,0x7a,0xb0,0x9,0xd4,0x8,0x6c,0xf,0x28,0xc0,0x0,0x80}}, + {ResolutionSIF, 15, 191, 1,{0x3,0x7a,0xe8,0x6,0x8d,0x5,0x25,0x17,0x38,0xbf,0x0,0x80}}, + {ResolutionSIF, 20, 192, 1,{0x2,0x7a,0xe8,0x4,0xd1,0x3,0x69,0x1e,0x38,0xc0,0x0,0x80}}, + {ResolutionSIF, 25, 290, 1,{0x1,0x7a,0xe8,0x6,0x2f,0x4,0xc7,0x19,0x38,0x22,0x1,0x80}}, + {ResolutionSSIF, 5, 191, 1,{0x5,0xf4,0x50,0x13,0xa9,0x12,0x19,0x5,0x18,0xbf,0x0,0x80}}, + {ResolutionSSIF, 10, 192, 1,{0x4,0x7a,0xb0,0x9,0xd4,0x8,0x6c,0xf,0x28,0xc0,0x0,0x80}}, + {ResolutionSSIF, 15, 191, 1,{0x3,0x7a,0xe8,0x6,0x8d,0x5,0x25,0x17,0x38,0xbf,0x0,0x80}}, + {ResolutionSSIF, 20, 192, 1,{0x2,0x7a,0xe8,0x4,0xd1,0x3,0x69,0x1e,0x38,0xc0,0x0,0x80}}, + {ResolutionSSIF, 25, 290, 1,{0x1,0x7a,0xe8,0x6,0x2f,0x4,0xc7,0x19,0x38,0x22,0x1,0x80}}, + {ResolutionQCIF, 5, 191, 1,{0x5,0xf4,0x50,0x13,0xa9,0x12,0x19,0x5,0x18,0xbf,0x0,0x80}}, + {ResolutionQCIF, 10, 192, 1,{0x4,0x7a,0xb0,0x9,0xd4,0x8,0x6c,0xf,0x28,0xc0,0x0,0x80}}, + {ResolutionQCIF, 15, 191, 1,{0x3,0x7a,0xe8,0x6,0x8d,0x5,0x25,0x17,0x38,0xbf,0x0,0x80}}, + {ResolutionQCIF, 20, 192, 1,{0x2,0x7a,0xe8,0x4,0xd1,0x3,0x69,0x1e,0x38,0xc0,0x0,0x80}}, + {ResolutionQCIF, 25, 290, 1,{0x1,0x7a,0xe8,0x6,0x2f,0x4,0xc7,0x19,0x38,0x22,0x1,0x80}}, + {ResolutionQSIF, 5, 146, 1,{0x1d,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x92,0x0,0x80}}, + {ResolutionQSIF, 10, 192, 1,{0x14,0xf4,0x30,0x13,0xa9,0x12,0xe1,0x17,0x8,0xc0,0x0,0x80}}, + {ResolutionQSIF, 15, 192, 1,{0x13,0xf4,0x30,0xd,0x1b,0xc,0x53,0x1e,0x18,0xc0,0x0,0x80}}, + {ResolutionQSIF, 20, 192, 1,{0x12,0xf4,0x50,0x9,0xb3,0x8,0xeb,0x1e,0x18,0xc0,0x0,0x80}}, + {ResolutionQSIF, 25, 193, 1,{0x11,0xf4,0x50,0x8,0x23,0x7,0x5b,0x1e,0x28,0xc1,0x0,0x80}}, + {ResolutionVGA, 5, 291, 2,{0x25,0x7a,0xe8,0xe,0xf9,0xc,0x29,0x7,0x30,0x23,0x1,0x80}}, + {ResolutionVGA, 10, 447, 2,{0x24,0x7a,0xe8,0xb,0x7d,0x8,0xad,0x9,0x48,0xbf,0x1,0x80}}, + {ResolutionVGA, 15, 590, 2,{0x23,0x7a,0xe8,0xa,0x1c,0x7,0x4c,0xb,0x58,0x4e,0x2,0x80}}, + {ResolutionVGA, 20, 292, 2,{0x22,0x7a,0xe8,0x7,0x6c,0x6,0x4,0x14,0x38,0x24,0x1,0x80}}, + {ResolutionVGA, 25, 290, 2,{0x21,0x7a,0xe8,0x6,0x2f,0x4,0xc7,0x19,0x48,0x22,0x1,0x80}}, + {ResolutionCIF, 5, 291, 2,{0x25,0x7a,0xe8,0xe,0xf9,0xc,0x29,0x7,0x30,0x23,0x1,0x80}}, + {ResolutionCIF, 10, 447, 2,{0x24,0x7a,0xe8,0xb,0x7d,0x8,0xad,0x9,0x48,0xbf,0x1,0x80}}, + {ResolutionCIF, 15, 590, 2,{0x23,0x7a,0xe8,0xa,0x1c,0x7,0x4c,0xb,0x58,0x4e,0x2,0x80}}, + {ResolutionCIF, 20, 292, 2,{0x22,0x7a,0xe8,0x7,0x6c,0x6,0x4,0x14,0x38,0x24,0x1,0x80}}, + {ResolutionCIF, 25, 290, 2,{0x21,0x7a,0xe8,0x6,0x2f,0x4,0xc7,0x19,0x48,0x22,0x1,0x80}}, + {ResolutionSIF, 5, 291, 2,{0x5,0xf4,0x30,0x1d,0xf2,0x1c,0x62,0x4,0x10,0x23,0x1,0x80}}, + {ResolutionSIF, 10, 292, 2,{0x4,0xf4,0x70,0xe,0xf9,0xd,0x69,0x9,0x28,0x24,0x1,0x80}}, + {ResolutionSIF, 15, 291, 2,{0x3,0x7a,0xa8,0x9,0xfb,0x8,0x93,0xf,0x38,0x23,0x1,0x80}}, + {ResolutionSIF, 20, 292, 2,{0x2,0x7a,0xe8,0x7,0x6c,0x6,0x4,0x14,0x38,0x24,0x1,0x80}}, + {ResolutionSIF, 25, 290, 2,{0x1,0x7a,0xe8,0x6,0x2f,0x4,0xc7,0x19,0x48,0x22,0x1,0x80}}, + {ResolutionSSIF, 5, 291, 2,{0x5,0xf4,0x30,0x1d,0xf2,0x1c,0x62,0x4,0x10,0x23,0x1,0x80}}, + {ResolutionSSIF, 10, 292, 2,{0x4,0xf4,0x70,0xe,0xf9,0xd,0x69,0x9,0x28,0x24,0x1,0x80}}, + {ResolutionSSIF, 15, 291, 2,{0x3,0x7a,0xa8,0x9,0xfb,0x8,0x93,0xf,0x38,0x23,0x1,0x80}}, + {ResolutionSSIF, 20, 292, 2,{0x2,0x7a,0xe8,0x7,0x6c,0x6,0x4,0x14,0x38,0x24,0x1,0x80}}, + {ResolutionSSIF, 25, 290, 2,{0x1,0x7a,0xe8,0x6,0x2f,0x4,0xc7,0x19,0x48,0x22,0x1,0x80}}, + {ResolutionQCIF, 5, 291, 2,{0x5,0xf4,0x30,0x1d,0xf2,0x1c,0x62,0x4,0x10,0x23,0x1,0x80}}, + {ResolutionQCIF, 10, 292, 2,{0x4,0xf4,0x70,0xe,0xf9,0xd,0x69,0x9,0x28,0x24,0x1,0x80}}, + {ResolutionQCIF, 15, 291, 2,{0x3,0x7a,0xa8,0x9,0xfb,0x8,0x93,0xf,0x38,0x23,0x1,0x80}}, + {ResolutionQCIF, 20, 292, 2,{0x2,0x7a,0xe8,0x7,0x6c,0x6,0x4,0x14,0x38,0x24,0x1,0x80}}, + {ResolutionQCIF, 25, 290, 2,{0x1,0x7a,0xe8,0x6,0x2f,0x4,0xc7,0x19,0x48,0x22,0x1,0x80}}, + {ResolutionQSIF, 5, 146, 2,{0x1d,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x92,0x0,0x80}}, + {ResolutionQSIF, 10, 291, 2,{0x1c,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x23,0x1,0x80}}, + {ResolutionQSIF, 15, 292, 2,{0x13,0xf4,0x30,0x13,0xf7,0x13,0x2f,0x13,0x20,0x24,0x1,0x80}}, + {ResolutionQSIF, 20, 292, 2,{0x12,0xf4,0x30,0xe,0xd8,0xe,0x10,0x19,0x18,0x24,0x1,0x80}}, + {ResolutionQSIF, 25, 292, 2,{0x11,0xf4,0x50,0xc,0x6c,0xb,0xa4,0x1e,0x28,0x24,0x1,0x80}}, + {ResolutionVGA, 5, 448, 3,{0x25,0xf4,0x90,0x17,0xc,0x13,0xec,0x4,0x30,0xc0,0x1,0x80}}, + {ResolutionVGA, 10, 447, 3,{0x24,0x7a,0xe8,0xb,0x7d,0x8,0xad,0x9,0x48,0xbf,0x1,0x80}}, + {ResolutionVGA, 15, 590, 3,{0x23,0x7a,0xe8,0xa,0x1c,0x7,0x4c,0xb,0x58,0x4e,0x2,0x80}}, + {ResolutionVGA, 20, 446, 3,{0x22,0xf4,0x90,0xb,0x5c,0x9,0xcc,0xe,0x38,0xbe,0x1,0x80}}, + {ResolutionVGA, 25, 448, 3,{0x21,0x7a,0xa8,0x9,0x8c,0x8,0x24,0xf,0x48,0xc0,0x1,0x80}}, + {ResolutionCIF, 5, 448, 3,{0x25,0xf4,0x90,0x17,0xc,0x13,0xec,0x4,0x30,0xc0,0x1,0x80}}, + {ResolutionCIF, 10, 447, 3,{0x24,0x7a,0xe8,0xb,0x7d,0x8,0xad,0x9,0x48,0xbf,0x1,0x80}}, + {ResolutionCIF, 15, 590, 3,{0x23,0x7a,0xe8,0xa,0x1c,0x7,0x4c,0xb,0x58,0x4e,0x2,0x80}}, + {ResolutionCIF, 20, 446, 3,{0x22,0xf4,0x90,0xb,0x5c,0x9,0xcc,0xe,0x38,0xbe,0x1,0x80}}, + {ResolutionCIF, 25, 448, 3,{0x21,0x7a,0xa8,0x9,0x8c,0x8,0x24,0xf,0x48,0xc0,0x1,0x80}}, + {ResolutionSIF, 5, 387, 3,{0x5,0xf4,0x30,0x27,0xd8,0x26,0x48,0x3,0x10,0x83,0x1,0x80}}, + {ResolutionSIF, 10, 447, 3,{0x4,0xf4,0x30,0x16,0xfb,0x15,0x6b,0x5,0x28,0xbf,0x1,0x80}}, + {ResolutionSIF, 15, 448, 3,{0x3,0xf4,0x50,0xf,0x52,0xd,0xc2,0x9,0x38,0xc0,0x1,0x80}}, + {ResolutionSIF, 20, 446, 3,{0x2,0xf4,0x90,0xb,0x5c,0x9,0xcc,0xe,0x38,0xbe,0x1,0x80}}, + {ResolutionSIF, 25, 448, 3,{0x1,0x7a,0xa8,0x9,0x8c,0x8,0x24,0xf,0x48,0xc0,0x1,0x80}}, + {ResolutionSSIF, 5, 387, 3,{0x5,0xf4,0x30,0x27,0xd8,0x26,0x48,0x3,0x10,0x83,0x1,0x80}}, + {ResolutionSSIF, 10, 447, 3,{0x4,0xf4,0x30,0x16,0xfb,0x15,0x6b,0x5,0x28,0xbf,0x1,0x80}}, + {ResolutionSSIF, 15, 448, 3,{0x3,0xf4,0x50,0xf,0x52,0xd,0xc2,0x9,0x38,0xc0,0x1,0x80}}, + {ResolutionSSIF, 20, 446, 3,{0x2,0xf4,0x90,0xb,0x5c,0x9,0xcc,0xe,0x38,0xbe,0x1,0x80}}, + {ResolutionSSIF, 25, 448, 3,{0x1,0x7a,0xa8,0x9,0x8c,0x8,0x24,0xf,0x48,0xc0,0x1,0x80}}, + {ResolutionQCIF, 5, 387, 3,{0x5,0xf4,0x30,0x27,0xd8,0x26,0x48,0x3,0x10,0x83,0x1,0x80}}, + {ResolutionQCIF, 10, 447, 3,{0x4,0xf4,0x30,0x16,0xfb,0x15,0x6b,0x5,0x28,0xbf,0x1,0x80}}, + {ResolutionQCIF, 15, 448, 3,{0x3,0xf4,0x50,0xf,0x52,0xd,0xc2,0x9,0x38,0xc0,0x1,0x80}}, + {ResolutionQCIF, 20, 446, 3,{0x2,0xf4,0x90,0xb,0x5c,0x9,0xcc,0xe,0x38,0xbe,0x1,0x80}}, + {ResolutionQCIF, 25, 448, 3,{0x1,0x7a,0xa8,0x9,0x8c,0x8,0x24,0xf,0x48,0xc0,0x1,0x80}}, + {ResolutionQSIF, 5, 146, 3,{0x1d,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x92,0x0,0x80}}, + {ResolutionQSIF, 10, 291, 3,{0x1c,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x23,0x1,0x80}}, + {ResolutionQSIF, 15, 437, 3,{0x1b,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0xb5,0x1,0x80}}, + {ResolutionQSIF, 20, 448, 3,{0x12,0xf4,0x30,0x16,0xc9,0x16,0x1,0xe,0x18,0xc0,0x1,0x80}}, + {ResolutionQSIF, 25, 447, 3,{0x11,0xf4,0x30,0x13,0xb,0x12,0x43,0x14,0x28,0xbf,0x1,0x80}}, + {ResolutionVGA, 5, 592, 4,{0x25,0xf4,0x50,0x1e,0x78,0x1b,0x58,0x3,0x30,0x50,0x2,0x80}}, + {ResolutionVGA, 10, 592, 4,{0x24,0x7a,0xe8,0xf,0x3c,0xc,0x6c,0x6,0x48,0x50,0x2,0x80}}, + {ResolutionVGA, 15, 590, 4,{0x23,0x7a,0xe8,0xa,0x1c,0x7,0x4c,0xb,0x58,0x4e,0x2,0x80}}, + {ResolutionVGA, 20, 591, 4,{0x22,0xf4,0x50,0xf,0xa,0xd,0x7a,0xb,0x38,0x4f,0x2,0x80}}, + {ResolutionVGA, 25, 592, 4,{0x21,0xf4,0x70,0xc,0x96,0xb,0x6,0xb,0x48,0x50,0x2,0x80}}, + {ResolutionCIF, 5, 592, 4,{0x25,0xf4,0x50,0x1e,0x78,0x1b,0x58,0x3,0x30,0x50,0x2,0x80}}, + {ResolutionCIF, 10, 592, 4,{0x24,0x7a,0xe8,0xf,0x3c,0xc,0x6c,0x6,0x48,0x50,0x2,0x80}}, + {ResolutionCIF, 15, 590, 4,{0x23,0x7a,0xe8,0xa,0x1c,0x7,0x4c,0xb,0x58,0x4e,0x2,0x80}}, + {ResolutionCIF, 20, 591, 4,{0x22,0xf4,0x50,0xf,0xa,0xd,0x7a,0xb,0x38,0x4f,0x2,0x80}}, + {ResolutionCIF, 25, 592, 4,{0x21,0xf4,0x70,0xc,0x96,0xb,0x6,0xb,0x48,0x50,0x2,0x80}}, + {ResolutionSIF, 5, 582, 4,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionSIF, 10, 591, 4,{0x4,0xf4,0x30,0x1e,0x67,0x1c,0xd7,0x6,0x28,0x4f,0x2,0x80}}, + {ResolutionSIF, 15, 592, 4,{0x3,0xf4,0x30,0x14,0x44,0x12,0xb4,0x8,0x30,0x50,0x2,0x80}}, + {ResolutionSIF, 20, 591, 4,{0x2,0xf4,0x50,0xf,0xa,0xd,0x7a,0xb,0x38,0x4f,0x2,0x80}}, + {ResolutionSIF, 25, 592, 4,{0x1,0xf4,0x70,0xc,0x96,0xb,0x6,0xb,0x48,0x50,0x2,0x80}}, + {ResolutionSSIF, 5, 582, 4,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionSSIF, 10, 591, 4,{0x4,0xf4,0x30,0x1e,0x67,0x1c,0xd7,0x6,0x28,0x4f,0x2,0x80}}, + {ResolutionSSIF, 15, 592, 4,{0x3,0xf4,0x30,0x14,0x44,0x12,0xb4,0x8,0x30,0x50,0x2,0x80}}, + {ResolutionSSIF, 20, 591, 4,{0x2,0xf4,0x50,0xf,0xa,0xd,0x7a,0xb,0x38,0x4f,0x2,0x80}}, + {ResolutionSSIF, 25, 592, 4,{0x1,0xf4,0x70,0xc,0x96,0xb,0x6,0xb,0x48,0x50,0x2,0x80}}, + {ResolutionQCIF, 5, 582, 4,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionQCIF, 10, 591, 4,{0x4,0xf4,0x30,0x1e,0x67,0x1c,0xd7,0x6,0x28,0x4f,0x2,0x80}}, + {ResolutionQCIF, 15, 592, 4,{0x3,0xf4,0x30,0x14,0x44,0x12,0xb4,0x8,0x30,0x50,0x2,0x80}}, + {ResolutionQCIF, 20, 591, 4,{0x2,0xf4,0x50,0xf,0xa,0xd,0x7a,0xb,0x38,0x4f,0x2,0x80}}, + {ResolutionQCIF, 25, 592, 4,{0x1,0xf4,0x70,0xc,0x96,0xb,0x6,0xb,0x48,0x50,0x2,0x80}}, + {ResolutionQSIF, 5, 146, 4,{0x1d,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x92,0x0,0x80}}, + {ResolutionQSIF, 10, 292, 4,{0x1c,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x24,0x1,0x80}}, + {ResolutionQSIF, 15, 437, 4,{0x1b,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0xb5,0x1,0x80}}, + {ResolutionQSIF, 20, 589, 4,{0x1a,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x4d,0x2,0x80}}, + {ResolutionQSIF, 25, 591, 4,{0x11,0xf4,0x30,0x19,0x2c,0x18,0x64,0xe,0x20,0x4f,0x2,0x80}}, + {ResolutionVGA, 5, 704, 5,{0x25,0xf4,0x50,0x24,0x32,0x21,0x12,0x2,0x30,0xc0,0x2,0x80}}, + {ResolutionVGA, 10, 704, 5,{0x24,0x7a,0xa8,0x12,0x19,0xf,0x49,0x5,0x48,0xc0,0x2,0x80}}, + {ResolutionVGA, 15, 702, 5,{0x23,0x7a,0xe8,0xc,0xf,0x9,0x3f,0x9,0x58,0xbe,0x2,0x80}}, + {ResolutionVGA, 20, 703, 5,{0x22,0xf4,0x50,0x11,0xe7,0x10,0x57,0xb,0x40,0xbf,0x2,0x80}}, + {ResolutionVGA, 25, 703, 5,{0x21,0xf4,0x70,0xe,0xff,0xd,0x6f,0xb,0x40,0xbf,0x2,0x80}}, + {ResolutionCIF, 5, 704, 5,{0x25,0xf4,0x50,0x24,0x32,0x21,0x12,0x2,0x30,0xc0,0x2,0x80}}, + {ResolutionCIF, 10, 704, 5,{0x24,0x7a,0xa8,0x12,0x19,0xf,0x49,0x5,0x48,0xc0,0x2,0x80}}, + {ResolutionCIF, 15, 702, 5,{0x23,0x7a,0xe8,0xc,0xf,0x9,0x3f,0x9,0x58,0xbe,0x2,0x80}}, + {ResolutionCIF, 20, 703, 5,{0x22,0xf4,0x50,0x11,0xe7,0x10,0x57,0xb,0x40,0xbf,0x2,0x80}}, + {ResolutionCIF, 25, 703, 5,{0x21,0xf4,0x70,0xe,0xff,0xd,0x6f,0xb,0x40,0xbf,0x2,0x80}}, + {ResolutionSIF, 5, 582, 5,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionSIF, 10, 702, 5,{0x4,0xf4,0x30,0x24,0x22,0x22,0x92,0x5,0x28,0xbe,0x2,0x80}}, + {ResolutionSIF, 15, 702, 5,{0x3,0xf4,0x30,0x18,0x16,0x16,0x86,0x7,0x38,0xbe,0x2,0x80}}, + {ResolutionSIF, 20, 703, 5,{0x2,0xf4,0x50,0x11,0xe7,0x10,0x57,0xb,0x40,0xbf,0x2,0x80}}, + {ResolutionSIF, 25, 703, 5,{0x1,0xf4,0x70,0xe,0xff,0xd,0x6f,0xb,0x40,0xbf,0x2,0x80}}, + {ResolutionSSIF, 5, 582, 5,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionSSIF, 10, 702, 5,{0x4,0xf4,0x30,0x24,0x22,0x22,0x92,0x5,0x28,0xbe,0x2,0x80}}, + {ResolutionSSIF, 15, 702, 5,{0x3,0xf4,0x30,0x18,0x16,0x16,0x86,0x7,0x38,0xbe,0x2,0x80}}, + {ResolutionSSIF, 20, 703, 5,{0x2,0xf4,0x50,0x11,0xe7,0x10,0x57,0xb,0x40,0xbf,0x2,0x80}}, + {ResolutionSSIF, 25, 703, 5,{0x1,0xf4,0x70,0xe,0xff,0xd,0x6f,0xb,0x40,0xbf,0x2,0x80}}, + {ResolutionQCIF, 5, 582, 5,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionQCIF, 10, 702, 5,{0x4,0xf4,0x30,0x24,0x22,0x22,0x92,0x5,0x28,0xbe,0x2,0x80}}, + {ResolutionQCIF, 15, 702, 5,{0x3,0xf4,0x30,0x18,0x16,0x16,0x86,0x7,0x38,0xbe,0x2,0x80}}, + {ResolutionQCIF, 20, 703, 5,{0x2,0xf4,0x50,0x11,0xe7,0x10,0x57,0xb,0x40,0xbf,0x2,0x80}}, + {ResolutionQCIF, 25, 703, 5,{0x1,0xf4,0x70,0xe,0xff,0xd,0x6f,0xb,0x40,0xbf,0x2,0x80}}, + {ResolutionQSIF, 5, 146, 5,{0x1d,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x92,0x0,0x80}}, + {ResolutionQSIF, 10, 291, 5,{0x1c,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x23,0x1,0x80}}, + {ResolutionQSIF, 15, 437, 5,{0x1b,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0xb5,0x1,0x80}}, + {ResolutionQSIF, 20, 588, 5,{0x1a,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x4c,0x2,0x80}}, + {ResolutionQSIF, 25, 703, 5,{0x19,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0xbf,0x2,0x80}}, + {ResolutionVGA, 5, 773, 6,{0x25,0xf4,0x30,0x27,0xb6,0x24,0x96,0x2,0x30,0x5,0x3,0x80}}, + {ResolutionVGA, 10, 776, 6,{0x24,0xf4,0xb0,0x13,0xfc,0x11,0x2c,0x4,0x48,0x8,0x3,0x80}}, + {ResolutionVGA, 15, 775, 6,{0x23,0x7a,0xe8,0xd,0x48,0xa,0x78,0x8,0x58,0x7,0x3,0x80}}, + {ResolutionVGA, 20, 775, 6,{0x22,0xf4,0x50,0x13,0xba,0x12,0x2a,0xb,0x40,0x7,0x3,0x80}}, + {ResolutionVGA, 25, 776, 6,{0x21,0xf4,0x50,0x10,0x8c,0xe,0xfc,0xc,0x48,0x8,0x3,0x80}}, + {ResolutionCIF, 5, 773, 6,{0x25,0xf4,0x30,0x27,0xb6,0x24,0x96,0x2,0x30,0x5,0x3,0x80}}, + {ResolutionCIF, 10, 776, 6,{0x24,0xf4,0xb0,0x13,0xfc,0x11,0x2c,0x4,0x48,0x8,0x3,0x80}}, + {ResolutionCIF, 15, 775, 6,{0x23,0x7a,0xe8,0xd,0x48,0xa,0x78,0x8,0x58,0x7,0x3,0x80}}, + {ResolutionCIF, 20, 775, 6,{0x22,0xf4,0x50,0x13,0xba,0x12,0x2a,0xb,0x40,0x7,0x3,0x80}}, + {ResolutionCIF, 25, 776, 6,{0x21,0xf4,0x50,0x10,0x8c,0xe,0xfc,0xc,0x48,0x8,0x3,0x80}}, + {ResolutionSIF, 5, 582, 6,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionSIF, 10, 775, 6,{0x4,0xf4,0x30,0x27,0xe8,0x26,0x58,0x5,0x30,0x7,0x3,0x80}}, + {ResolutionSIF, 15, 775, 6,{0x3,0xf4,0x30,0x1a,0x9b,0x19,0xb,0x7,0x40,0x7,0x3,0x80}}, + {ResolutionSIF, 20, 775, 6,{0x2,0xf4,0x50,0x13,0xba,0x12,0x2a,0xb,0x40,0x7,0x3,0x80}}, + {ResolutionSIF, 25, 776, 6,{0x1,0xf4,0x50,0x10,0x8c,0xe,0xfc,0xc,0x48,0x8,0x3,0x80}}, + {ResolutionSSIF, 5, 582, 6,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionSSIF, 10, 775, 6,{0x4,0xf4,0x30,0x27,0xe8,0x26,0x58,0x5,0x30,0x7,0x3,0x80}}, + {ResolutionSSIF, 15, 775, 6,{0x3,0xf4,0x30,0x1a,0x9b,0x19,0xb,0x7,0x40,0x7,0x3,0x80}}, + {ResolutionSSIF, 20, 775, 6,{0x2,0xf4,0x50,0x13,0xba,0x12,0x2a,0xb,0x40,0x7,0x3,0x80}}, + {ResolutionSSIF, 25, 776, 6,{0x1,0xf4,0x50,0x10,0x8c,0xe,0xfc,0xc,0x48,0x8,0x3,0x80}}, + {ResolutionQCIF, 5, 582, 6,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionQCIF, 10, 775, 6,{0x4,0xf4,0x30,0x27,0xe8,0x26,0x58,0x5,0x30,0x7,0x3,0x80}}, + {ResolutionQCIF, 15, 775, 6,{0x3,0xf4,0x30,0x1a,0x9b,0x19,0xb,0x7,0x40,0x7,0x3,0x80}}, + {ResolutionQCIF, 20, 775, 6,{0x2,0xf4,0x50,0x13,0xba,0x12,0x2a,0xb,0x40,0x7,0x3,0x80}}, + {ResolutionQCIF, 25, 776, 6,{0x1,0xf4,0x50,0x10,0x8c,0xe,0xfc,0xc,0x48,0x8,0x3,0x80}}, + {ResolutionQSIF, 5, 146, 6,{0x1d,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x92,0x0,0x80}}, + {ResolutionQSIF, 10, 291, 6,{0x1c,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x23,0x1,0x80}}, + {ResolutionQSIF, 15, 437, 6,{0x1b,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0xb5,0x1,0x80}}, + {ResolutionQSIF, 20, 588, 6,{0x1a,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x4c,0x2,0x80}}, + {ResolutionQSIF, 25, 703, 6,{0x19,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0xbf,0x2,0x80}}, + {ResolutionVGA, 5, 773, 7,{0x25,0xf4,0x30,0x27,0xb6,0x24,0x96,0x2,0x30,0x5,0x3,0x80}}, + {ResolutionVGA, 10, 837, 7,{0x24,0xf4,0x90,0x15,0x8c,0x12,0x6c,0x4,0x48,0x45,0x3,0x80}}, + {ResolutionVGA, 15, 837, 7,{0x23,0x7a,0xe8,0xe,0x5d,0xb,0x8d,0x7,0x58,0x45,0x3,0x80}}, + {ResolutionVGA, 20, 838, 7,{0x22,0xf4,0x30,0x15,0x52,0x13,0xc2,0xb,0x48,0x46,0x3,0x80}}, + {ResolutionVGA, 25, 838, 7,{0x21,0xf4,0x50,0x11,0xdf,0x10,0x4f,0xb,0x48,0x46,0x3,0x80}}, + {ResolutionCIF, 5, 773, 7,{0x25,0xf4,0x30,0x27,0xb6,0x24,0x96,0x2,0x30,0x5,0x3,0x80}}, + {ResolutionCIF, 10, 837, 7,{0x24,0xf4,0x90,0x15,0x8c,0x12,0x6c,0x4,0x48,0x45,0x3,0x80}}, + {ResolutionCIF, 15, 837, 7,{0x23,0x7a,0xe8,0xe,0x5d,0xb,0x8d,0x7,0x58,0x45,0x3,0x80}}, + {ResolutionCIF, 20, 838, 7,{0x22,0xf4,0x30,0x15,0x52,0x13,0xc2,0xb,0x48,0x46,0x3,0x80}}, + {ResolutionCIF, 25, 838, 7,{0x21,0xf4,0x50,0x11,0xdf,0x10,0x4f,0xb,0x48,0x46,0x3,0x80}}, + {ResolutionSIF, 5, 582, 7,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionSIF, 10, 775, 7,{0x4,0xf4,0x30,0x27,0xe8,0x26,0x58,0x5,0x30,0x7,0x3,0x80}}, + {ResolutionSIF, 15, 839, 7,{0x3,0xf4,0x30,0x1c,0xc6,0x1b,0x36,0x6,0x38,0x47,0x3,0x80}}, + {ResolutionSIF, 20, 838, 7,{0x2,0xf4,0x30,0x15,0x52,0x13,0xc2,0xb,0x48,0x46,0x3,0x80}}, + {ResolutionSIF, 25, 838, 7,{0x1,0xf4,0x50,0x11,0xdf,0x10,0x4f,0xb,0x48,0x46,0x3,0x80}}, + {ResolutionSSIF, 5, 582, 7,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionSSIF, 10, 775, 7,{0x4,0xf4,0x30,0x27,0xe8,0x26,0x58,0x5,0x30,0x7,0x3,0x80}}, + {ResolutionSSIF, 15, 839, 7,{0x3,0xf4,0x30,0x1c,0xc6,0x1b,0x36,0x6,0x38,0x47,0x3,0x80}}, + {ResolutionSSIF, 20, 838, 7,{0x2,0xf4,0x30,0x15,0x52,0x13,0xc2,0xb,0x48,0x46,0x3,0x80}}, + {ResolutionSSIF, 25, 838, 7,{0x1,0xf4,0x50,0x11,0xdf,0x10,0x4f,0xb,0x48,0x46,0x3,0x80}}, + {ResolutionQCIF, 5, 582, 7,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionQCIF, 10, 775, 7,{0x4,0xf4,0x30,0x27,0xe8,0x26,0x58,0x5,0x30,0x7,0x3,0x80}}, + {ResolutionQCIF, 15, 839, 7,{0x3,0xf4,0x30,0x1c,0xc6,0x1b,0x36,0x6,0x38,0x47,0x3,0x80}}, + {ResolutionQCIF, 20, 838, 7,{0x2,0xf4,0x30,0x15,0x52,0x13,0xc2,0xb,0x48,0x46,0x3,0x80}}, + {ResolutionQCIF, 25, 838, 7,{0x1,0xf4,0x50,0x11,0xdf,0x10,0x4f,0xb,0x48,0x46,0x3,0x80}}, + {ResolutionQSIF, 5, 146, 7,{0x1d,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x92,0x0,0x80}}, + {ResolutionQSIF, 10, 291, 7,{0x1c,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x23,0x1,0x80}}, + {ResolutionQSIF, 15, 437, 7,{0x1b,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0xb5,0x1,0x80}}, + {ResolutionQSIF, 20, 588, 7,{0x1a,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x4c,0x2,0x80}}, + {ResolutionQSIF, 25, 703, 7,{0x19,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0xbf,0x2,0x80}}, + {ResolutionVGA, 5, 773, 8,{0x25,0xf4,0x30,0x27,0xb6,0x24,0x96,0x2,0x30,0x5,0x3,0x80}}, + {ResolutionVGA, 10, 895, 8,{0x24,0xf4,0x90,0x17,0xc,0x13,0xec,0x3,0x48,0x7f,0x3,0x80}}, + {ResolutionVGA, 15, 895, 8,{0x23,0x7a,0xe8,0xf,0x5d,0xc,0x8d,0x6,0x58,0x7f,0x3,0x80}}, + {ResolutionVGA, 20, 895, 8,{0x22,0xf4,0x30,0x16,0xc9,0x15,0x39,0xb,0x50,0x7f,0x3,0x80}}, + {ResolutionVGA, 25, 896, 8,{0x21,0xf4,0x50,0x13,0x11,0x11,0x81,0xc,0x50,0x80,0x3,0x80}}, + {ResolutionCIF, 5, 773, 8,{0x25,0xf4,0x30,0x27,0xb6,0x24,0x96,0x2,0x30,0x5,0x3,0x80}}, + {ResolutionCIF, 10, 895, 8,{0x24,0xf4,0x90,0x17,0xc,0x13,0xec,0x3,0x48,0x7f,0x3,0x80}}, + {ResolutionCIF, 15, 895, 8,{0x23,0x7a,0xe8,0xf,0x5d,0xc,0x8d,0x6,0x58,0x7f,0x3,0x80}}, + {ResolutionCIF, 20, 895, 8,{0x22,0xf4,0x30,0x16,0xc9,0x15,0x39,0xb,0x50,0x7f,0x3,0x80}}, + {ResolutionCIF, 25, 896, 8,{0x21,0xf4,0x50,0x13,0x11,0x11,0x81,0xc,0x50,0x80,0x3,0x80}}, + {ResolutionSIF, 5, 582, 8,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionSIF, 10, 775, 8,{0x4,0xf4,0x30,0x27,0xe8,0x26,0x58,0x5,0x30,0x7,0x3,0x80}}, + {ResolutionSIF, 15, 895, 8,{0x3,0xf4,0x30,0x1e,0xba,0x1d,0x2a,0x6,0x40,0x7f,0x3,0x80}}, + {ResolutionSIF, 20, 895, 8,{0x2,0xf4,0x30,0x16,0xc9,0x15,0x39,0xb,0x50,0x7f,0x3,0x80}}, + {ResolutionSIF, 25, 896, 8,{0x1,0xf4,0x50,0x13,0x11,0x11,0x81,0xc,0x50,0x80,0x3,0x80}}, + {ResolutionSSIF, 5, 582, 8,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionSSIF, 10, 775, 8,{0x4,0xf4,0x30,0x27,0xe8,0x26,0x58,0x5,0x30,0x7,0x3,0x80}}, + {ResolutionSSIF, 15, 895, 8,{0x3,0xf4,0x30,0x1e,0xba,0x1d,0x2a,0x6,0x40,0x7f,0x3,0x80}}, + {ResolutionSSIF, 20, 895, 8,{0x2,0xf4,0x30,0x16,0xc9,0x15,0x39,0xb,0x50,0x7f,0x3,0x80}}, + {ResolutionSSIF, 25, 896, 8,{0x1,0xf4,0x50,0x13,0x11,0x11,0x81,0xc,0x50,0x80,0x3,0x80}}, + {ResolutionQCIF, 5, 582, 8,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionQCIF, 10, 775, 8,{0x4,0xf4,0x30,0x27,0xe8,0x26,0x58,0x5,0x30,0x7,0x3,0x80}}, + {ResolutionQCIF, 15, 895, 8,{0x3,0xf4,0x30,0x1e,0xba,0x1d,0x2a,0x6,0x40,0x7f,0x3,0x80}}, + {ResolutionQCIF, 20, 895, 8,{0x2,0xf4,0x30,0x16,0xc9,0x15,0x39,0xb,0x50,0x7f,0x3,0x80}}, + {ResolutionQCIF, 25, 896, 8,{0x1,0xf4,0x50,0x13,0x11,0x11,0x81,0xc,0x50,0x80,0x3,0x80}}, + {ResolutionQSIF, 5, 146, 8,{0x1d,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x92,0x0,0x80}}, + {ResolutionQSIF, 10, 292, 8,{0x1c,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x24,0x1,0x80}}, + {ResolutionQSIF, 15, 437, 8,{0x1b,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0xb5,0x1,0x80}}, + {ResolutionQSIF, 20, 589, 8,{0x1a,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x4d,0x2,0x80}}, + {ResolutionQSIF, 25, 703, 8,{0x19,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0xbf,0x2,0x80}}, + {ResolutionVGA, 5, 773, 9,{0x25,0xf4,0x30,0x27,0xb6,0x24,0x96,0x2,0x30,0x5,0x3,0x80}}, + {ResolutionVGA, 10, 956, 9,{0x24,0xf4,0x70,0x18,0x9c,0x15,0x7c,0x3,0x48,0xbc,0x3,0x80}}, + {ResolutionVGA, 15, 957, 9,{0x23,0x7a,0xe8,0x10,0x68,0xd,0x98,0x6,0x58,0xbd,0x3,0x80}}, + {ResolutionVGA, 20, 958, 9,{0x22,0xf4,0x30,0x18,0x6a,0x16,0xda,0xb,0x58,0xbe,0x3,0x80}}, + {ResolutionVGA, 25, 958, 9,{0x21,0xf4,0x30,0x14,0x66,0x12,0xd6,0xb,0x50,0xbe,0x3,0x80}}, + {ResolutionCIF, 5, 773, 9,{0x25,0xf4,0x30,0x27,0xb6,0x24,0x96,0x2,0x30,0x5,0x3,0x80}}, + {ResolutionCIF, 10, 956, 9,{0x24,0xf4,0x70,0x18,0x9c,0x15,0x7c,0x3,0x48,0xbc,0x3,0x80}}, + {ResolutionCIF, 15, 957, 9,{0x23,0x7a,0xe8,0x10,0x68,0xd,0x98,0x6,0x58,0xbd,0x3,0x80}}, + {ResolutionCIF, 20, 958, 9,{0x22,0xf4,0x30,0x18,0x6a,0x16,0xda,0xb,0x58,0xbe,0x3,0x80}}, + {ResolutionCIF, 25, 958, 9,{0x21,0xf4,0x30,0x14,0x66,0x12,0xd6,0xb,0x50,0xbe,0x3,0x80}}, + {ResolutionSIF, 5, 582, 9,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionSIF, 10, 775, 9,{0x4,0xf4,0x30,0x27,0xe8,0x26,0x58,0x5,0x30,0x7,0x3,0x80}}, + {ResolutionSIF, 15, 955, 9,{0x3,0xf4,0x30,0x20,0xcf,0x1f,0x3f,0x6,0x48,0xbb,0x3,0x80}}, + {ResolutionSIF, 20, 958, 9,{0x2,0xf4,0x30,0x18,0x6a,0x16,0xda,0xb,0x58,0xbe,0x3,0x80}}, + {ResolutionSIF, 25, 958, 9,{0x1,0xf4,0x30,0x14,0x66,0x12,0xd6,0xb,0x50,0xbe,0x3,0x80}}, + {ResolutionSSIF, 5, 582, 9,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionSSIF, 10, 775, 9,{0x4,0xf4,0x30,0x27,0xe8,0x26,0x58,0x5,0x30,0x7,0x3,0x80}}, + {ResolutionSSIF, 15, 955, 9,{0x3,0xf4,0x30,0x20,0xcf,0x1f,0x3f,0x6,0x48,0xbb,0x3,0x80}}, + {ResolutionSSIF, 20, 958, 9,{0x2,0xf4,0x30,0x18,0x6a,0x16,0xda,0xb,0x58,0xbe,0x3,0x80}}, + {ResolutionSSIF, 25, 958, 9,{0x1,0xf4,0x30,0x14,0x66,0x12,0xd6,0xb,0x50,0xbe,0x3,0x80}}, + {ResolutionQCIF, 5, 582, 9,{0xd,0xf4,0x30,0x0,0x0,0x0,0x0,0x4,0x0,0x46,0x2,0x80}}, + {ResolutionQCIF, 10, 775, 9,{0x4,0xf4,0x30,0x27,0xe8,0x26,0x58,0x5,0x30,0x7,0x3,0x80}}, + {ResolutionQCIF, 15, 955, 9,{0x3,0xf4,0x30,0x20,0xcf,0x1f,0x3f,0x6,0x48,0xbb,0x3,0x80}}, + {ResolutionQCIF, 20, 958, 9,{0x2,0xf4,0x30,0x18,0x6a,0x16,0xda,0xb,0x58,0xbe,0x3,0x80}}, + {ResolutionQCIF, 25, 958, 9,{0x1,0xf4,0x30,0x14,0x66,0x12,0xd6,0xb,0x50,0xbe,0x3,0x80}}, + {ResolutionQSIF, 5, 146, 9,{0x1d,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x92,0x0,0x80}}, + {ResolutionQSIF, 10, 292, 9,{0x1c,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x24,0x1,0x80}}, + {ResolutionQSIF, 15, 437, 9,{0x1b,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0xb5,0x1,0x80}}, + {ResolutionQSIF, 20, 589, 9,{0x1a,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0x4d,0x2,0x80}}, + {ResolutionQSIF, 25, 703, 9,{0x19,0xf4,0x30,0x0,0x0,0x0,0x0,0x18,0x0,0xbf,0x2,0x80}}, + */ + + @implementation MyKiaraFamilyDriver *************** *** 108,110 **** --- 385,403 ---- return ResolutionSIF; } + + - (BOOL) canSetLed { return YES; } + - (void) setLed:(BOOL)v { + UInt8 b[2]; + UInt16* b_16; + UInt16 c; + if (![self canSetLed]) return; + b_16 = (UInt16*)(&b[0]); + *b_16 = TO_LEDON(v); + c =TO_LEDON(LEDon); + if (*b_16 != c) { + [self usbWriteCmdWithBRequest:GRP_SET_STATUS wValue:SEL_LED wIndex:INTF_CONTROL buf:b len:2]; + } + [super setLed:v]; + } + @end Index: MyPhilipsCameraDriver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyPhilipsCameraDriver.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MyPhilipsCameraDriver.h 24 Feb 2003 13:05:09 -0000 1.3 --- MyPhilipsCameraDriver.h 27 Jul 2003 04:55:56 -0000 1.4 *************** *** 64,67 **** --- 64,69 ---- #define CLAMP_UNIT(a) (CLAMP((a),0.0f,1.0f)) + #define TO_LEDON(a) ((a)?0xFF00:0x00FF) // OxFF00 is LED on 0x00FF is LED off + //Command groups and selectors *************** *** 76,79 **** --- 78,82 ---- #define GRP_SET_CHROMA 0x03 + #define SEL_COLORMODE 0x1500 #define SEL_SATURATION 0x1600 *************** *** 160,163 **** --- 163,168 ---- - (void) setShutter:(float)v; - (void) setAutoGain:(BOOL)v; + - (void) setBlackWhiteMode:(BOOL)newMode; // set to color / black & white + - (WhiteBalanceMode) defaultWhiteBalanceMode; Index: MyPhilipsCameraDriver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyPhilipsCameraDriver.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MyPhilipsCameraDriver.m 24 Feb 2003 13:05:09 -0000 1.4 --- MyPhilipsCameraDriver.m 27 Jul 2003 04:55:56 -0000 1.5 *************** *** 62,65 **** --- 62,66 ---- [self setShutter:0.5f]; [self setAutoGain:YES]; + [self setBlackWhiteMode:FALSE]; // tmolteno return [super startupWithUsbLocationId:usbLocationId]; } *************** *** 147,150 **** --- 148,170 ---- } [super setAutoGain:v]; + } + + + // OxFF is Color 0x00 is Grey + + - (BOOL) canBlackWhiteMode { return YES; } + - (void) setBlackWhiteMode:(BOOL)newMode { + UInt8 b; + if (![self canBlackWhiteMode]) return; + + if (newMode == blackWhiteMode) return; // no change + + if (newMode == NO) // color mode + b = 0xFF; + else + b = 0x00; // black & white mode + + [self usbWriteCmdWithBRequest:GRP_SET_CHROMA wValue:SEL_COLORMODE wIndex:INTF_CONTROL buf:&b len:1]; + [super setBlackWhiteMode:newMode]; } |
From: <tmo...@us...> - 2003-07-27 04:55:59
|
Update of /cvsroot/webcam-osx/macam/app_specific/English.lproj/MainMenu.nib In directory sc8-pr-cvs1:/tmp/cvs-serv15577/app_specific/English.lproj/MainMenu.nib Modified Files: classes.nib info.nib objects.nib Log Message: Added controls for black and white mode on Philips cameras, also controls for the LED on Philips ToUCam cameras (might works on vesta's as well Index: classes.nib =================================================================== RCS file: /cvsroot/webcam-osx/macam/app_specific/English.lproj/MainMenu.nib/classes.nib,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** classes.nib 12 Nov 2002 15:54:07 -0000 1.4 --- classes.nib 27 Jul 2003 04:55:56 -0000 1.5 *************** *** 29,33 **** --- 29,35 ---- { ACTIONS = { + blackwhiteCheckboxChanged = id; brightnessChanged = id; + colorModeChanged = id; compressionChanged = id; contrastChanged = id; *************** *** 44,47 **** --- 46,50 ---- gammaChanged = id; horizontalFlipChanged = id; + ledCheckboxChanged = id; manGainChanged = id; saturationChanged = id; *************** *** 54,57 **** --- 57,61 ---- LANGUAGE = ObjC; OUTLETS = { + blackwhiteCheckbox = id; brightnessSlider = NSSlider; central = MyCameraCentral; *************** *** 64,67 **** --- 68,72 ---- horizontalFlipCheckbox = NSButton; inspectorDrawer = NSDrawer; + ledCheckbox = id; manGainCheckbox = NSButton; previewView = NSImageView; Index: info.nib =================================================================== RCS file: /cvsroot/webcam-osx/macam/app_specific/English.lproj/MainMenu.nib/info.nib,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** info.nib 4 Jan 2003 10:28:34 -0000 1.10 --- info.nib 27 Jul 2003 04:55:56 -0000 1.11 *************** *** 4,28 **** <dict> <key>IBDocumentLocation</key> ! <string>439 320 526 345 0 0 1152 746 </string> <key>IBEditorPositions</key> <dict> <key>29</key> ! <string>467 682 419 44 0 0 1152 746 </string> <key>353</key> ! <string>396 312 360 373 0 0 1152 746 </string> </dict> <key>IBFramework Version</key> <string>291.0</string> - <key>IBLockedObjects</key> - <array> - <integer>353</integer> - </array> <key>IBOpenObjects</key> <array> - <integer>21</integer> <integer>29</integer> </array> <key>IBSystem Version</key> ! <string>6G30</string> </dict> </plist> --- 4,24 ---- <dict> <key>IBDocumentLocation</key> ! <string>79 182 456 371 0 0 1280 1002 </string> <key>IBEditorPositions</key> <dict> <key>29</key> ! <string>69 252 419 44 0 0 1280 1002 </string> <key>353</key> ! <string>208 581 360 373 0 0 1280 1002 </string> </dict> <key>IBFramework Version</key> <string>291.0</string> <key>IBOpenObjects</key> <array> <integer>29</integer> + <integer>353</integer> </array> <key>IBSystem Version</key> ! <string>6L60</string> </dict> </plist> Index: objects.nib =================================================================== RCS file: /cvsroot/webcam-osx/macam/app_specific/English.lproj/MainMenu.nib/objects.nib,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 Binary files /tmp/cvs7dWgU2 and /tmp/cvsmdTurV differ |
From: <tmo...@us...> - 2003-07-27 04:55:59
|
Update of /cvsroot/webcam-osx/macam/app_specific In directory sc8-pr-cvs1:/tmp/cvs-serv15577/app_specific Modified Files: MyController.h MyController.m Log Message: Added controls for black and white mode on Philips cameras, also controls for the LED on Philips ToUCam cameras (might works on vesta's as well Index: MyController.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/app_specific/MyController.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MyController.h 12 Nov 2002 15:54:46 -0000 1.4 --- MyController.h 27 Jul 2003 04:55:56 -0000 1.5 *************** *** 44,47 **** --- 44,48 ---- IBOutlet NSTextField* statusText; IBOutlet NSPopUpButton* whiteBalancePopup; + IBOutlet NSPopUpButton* colorModePopup; IBOutlet NSPopUpButton* sizePopup; IBOutlet NSPopUpButton* fpsPopup; *************** *** 50,53 **** --- 51,57 ---- IBOutlet NSDrawer* settingsDrawer; IBOutlet NSDrawer* inspectorDrawer; + IBOutlet id blackwhiteCheckbox; + IBOutlet id ledCheckbox; + MyCameraInspector* inspector; MyCameraDriver* driver; *************** *** 88,91 **** --- 92,97 ---- - (IBAction)whiteBalanceChanged:(id)sender; - (IBAction)horizontalFlipChanged:(id)sender; + - (IBAction)blackwhiteCheckboxChanged:(id)sender; + - (IBAction)ledCheckboxChanged:(id)sender; //UI: Actions to do Index: MyController.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/app_specific/MyController.m,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** MyController.m 5 Feb 2003 13:27:16 -0000 1.13 --- MyController.m 27 Jul 2003 04:55:56 -0000 1.14 *************** *** 270,273 **** --- 270,283 ---- } + - (IBAction)blackwhiteCheckboxChanged:(id)sender { + BOOL BlackWhite =[blackwhiteCheckbox intValue]; + [driver setBlackWhiteMode:BlackWhite]; + } + + - (IBAction)ledCheckboxChanged:(id)sender { + BOOL ledOn =[ledCheckbox intValue]; + [driver setLed:ledOn]; + } + - (IBAction)horizontalFlipChanged:(id)sender { BOOL flip=[horizontalFlipCheckbox intValue]; *************** *** 559,562 **** --- 569,573 ---- [whiteBalancePopup setEnabled:[driver canSetWhiteBalanceMode]]; [horizontalFlipCheckbox setEnabled:[driver canSetHFlip]]; + [blackwhiteCheckbox setEnabled:[driver canBlackWhiteMode]]; [whiteBalancePopup selectItemAtIndex:[driver whiteBalanceMode]-1]; |
From: <tmo...@us...> - 2003-07-27 04:54:46
|
Update of /cvsroot/webcam-osx/macam/cameras In directory sc8-pr-cvs1:/tmp/cvs-serv15453/cameras Modified Files: JFIFHeaderTemplate.c Log Message: Modified Cocoa.h to Carbon.h to avoid a compile error on Dec 2002 developer tools Index: JFIFHeaderTemplate.c =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/JFIFHeaderTemplate.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JFIFHeaderTemplate.c 24 Oct 2002 18:18:00 -0000 1.1 --- JFIFHeaderTemplate.c 27 Jul 2003 04:54:42 -0000 1.2 *************** *** 1,3 **** ! #import <Cocoa/Cocoa.h> --- 1,3 ---- ! #import <Carbon/Carbon.h> |
From: <hi...@us...> - 2003-03-17 17:19:55
|
Update of /cvsroot/webcam-osx/macam/cameras In directory sc8-pr-cvs1:/tmp/cvs-serv25163 Modified Files: MyOV511Driver.m Log Message: add fps control Index: MyOV511Driver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyOV511Driver.m,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** MyOV511Driver.m 24 Feb 2003 13:05:09 -0000 1.11 --- MyOV511Driver.m 17 Mar 2003 17:19:51 -0000 1.12 *************** *** 32,35 **** --- 32,36 ---- #define OV511_DEBUG #define USE_COMPRESS + //#define VERBOSE #ifdef USE_COMPRESS *************** *** 393,397 **** sensorType == SENS_SAA7111A || sensorType == SENS_SAA7111A_WITH_FI1236MK2) && rate<=10) return YES; ! return YES; break; case ResolutionCIF: --- 394,399 ---- sensorType == SENS_SAA7111A || sensorType == SENS_SAA7111A_WITH_FI1236MK2) && rate<=10) return YES; ! else if (sensorType == SENS_OV6620 && rate<=10) return YES; ! return NO; break; case ResolutionCIF: *************** *** 611,615 **** // SIF ! [self i2cWrite:OV7610_REG_SYN_CLK val:0x01]; [self i2cWrite:OV7610_REG_COMA val:0x04]; [self i2cWrite:OV7610_REG_COMC val:0x24]; --- 613,623 ---- // SIF ! // [self i2cWrite:OV7610_REG_SYN_CLK val:0x01]; ! if([self fps] <= 5) ! [self i2cWrite:OV7610_REG_SYN_CLK val:0x02]; ! else if([self fps] <= 10) ! [self i2cWrite:OV7610_REG_SYN_CLK val:0x01]; ! else ! [self i2cWrite:OV7610_REG_SYN_CLK val:0x00]; [self i2cWrite:OV7610_REG_COMA val:0x04]; [self i2cWrite:OV7610_REG_COMC val:0x24]; *************** *** 620,624 **** // This code from Linux driver [self i2cWrite:0x12 val:0x80]; /* reset */ ! [self i2cWrite:0x11 val:0x01]; [self i2cWrite:0x03 val:0x60]; [self i2cWrite:0x05 val:0x7f]; /* For when autoadjust is off */ --- 628,640 ---- // This code from Linux driver [self i2cWrite:0x12 val:0x80]; /* reset */ ! // [self i2cWrite:0x11 val:0x01]; ! if([self fps] <= 5) ! [self i2cWrite:0x11 val:0x06]; ! else if([self fps] <= 10) ! [self i2cWrite:0x11 val:0x02]; ! else if([self fps] <= 15) ! [self i2cWrite:0x11 val:0x01]; ! else ! [self i2cWrite:0x11 val:0x00]; [self i2cWrite:0x03 val:0x60]; [self i2cWrite:0x05 val:0x7f]; /* For when autoadjust is off */ *************** *** 719,723 **** if(resolution == ResolutionVGA && (sensorType == SENS_OV7610 || sensorType == SENS_OV7620)) { ! [self i2cWrite:OV7610_REG_SYN_CLK val:0x06]; [self i2cWrite:OV7610_REG_HE val:0x3a + ([self width]>>2)]; [self i2cWrite:OV7610_REG_VE val:5 + ([self height]>>1)]; --- 735,745 ---- if(resolution == ResolutionVGA && (sensorType == SENS_OV7610 || sensorType == SENS_OV7620)) { ! // [self i2cWrite:OV7610_REG_SYN_CLK val:0x06]; ! if([self fps] <= 5) ! [self i2cWrite:OV7610_REG_SYN_CLK val:0x07]; ! else if([self fps] <= 10) ! [self i2cWrite:OV7610_REG_SYN_CLK val:0x06]; ! else ! [self i2cWrite:OV7610_REG_SYN_CLK val:0x05]; [self i2cWrite:OV7610_REG_HE val:0x3a + ([self width]>>2)]; [self i2cWrite:OV7610_REG_VE val:5 + ([self height]>>1)]; |
From: <ma...@us...> - 2003-02-24 15:21:58
|
Update of /cvsroot/webcam-osx/macam/macam.pbproj In directory sc8-pr-cvs1:/tmp/cvs-serv2654 Modified Files: project.pbxproj Log Message: New target: ICA camera plugin Index: project.pbxproj =================================================================== RCS file: /cvsroot/webcam-osx/macam/macam.pbproj/project.pbxproj,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** project.pbxproj 30 Jan 2003 17:36:34 -0000 1.20 --- project.pbxproj 24 Feb 2003 15:21:54 -0000 1.21 *************** *** 47,50 **** --- 47,51 ---- 17587328FF379C6511CA2CBB, F538BD2201E5D23F0166DE0F, + 39663A570402FCF000435B6F, ); isa = PBXGroup; *************** *** 74,77 **** --- 75,79 ---- 29B97326FDCFA39411CA2CEA, F538BD2301E5D23F0166DE0F, + 396639D80402FCF000435B6F, 39AE92CB03C5131B0066D062, ); *************** *** 85,88 **** --- 87,91 ---- F5F79A910212038E01E152CA, F55DD839021311680166DE0F, + 39663A620402FEAC00435B6F, F55DD83F021311680166DE0F, 29B97323FDCFA39411CA2CEA, *************** *** 101,104 **** --- 104,108 ---- F538BD1D01E5D0440166DE0F, F538BD1B01E5D03A0166DE0F, + 39FE215504030E7E00BAABE7, ); isa = PBXGroup; *************** *** 436,439 **** --- 440,1272 ---- }; }; + 3950233F040A55A70066D062 = { + isa = PBXFileReference; + path = plugin.icns; + refType = 4; + }; + 39502340040A55A70066D062 = { + fileRef = 3950233F040A55A70066D062; + isa = PBXBuildFile; + settings = { + }; + }; + 395E9AD704044198007E00C6 = { + fileRef = F538BD1B01E5D03A0166DE0F; + isa = PBXBuildFile; + settings = { + }; + }; + 396639D80402FCF000435B6F = { + buildPhases = ( + 396639D90402FCF000435B6F, + 39663A080402FCF000435B6F, + 39663A220402FCF000435B6F, + 39663A520402FCF000435B6F, + ); + buildSettings = { + DEBUGGING_SYMBOLS = NO; + FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\""; + HEADER_SEARCH_PATHS = ""; + INSTALL_PATH = "$(HOME)/Applications"; + LIBRARY_SEARCH_PATHS = ""; + OPTIMIZATION_CFLAGS = "-O2"; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = macamDSC; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; + WRAPPER_EXTENSION = app; + }; + dependencies = ( + ); + isa = PBXApplicationTarget; + name = "ica module"; + productInstallPath = "$(HOME)/Applications"; + productName = wc; + productReference = 39663A570402FCF000435B6F; + productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> + <!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\"> + <plist version=\"1.0\"> + <dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleDocumentTypes</key> + <array/> + <key>CFBundleExecutable</key> + <string>macamDSC</string> + <key>CFBundleGetInfoString</key> + <string>macam 0.8 © 2003 the macam project (http://webcam-osx.sourceforge.net)</string> + <key>CFBundleHelpBookFolder</key> + <string>WebcamHelp</string> + <key>CFBundleHelpBookName</key> + <string>Webcam Help</string> + <key>CFBundleIconFile</key> + <string>plugin.icns</string> + <key>CFBundleIdentifier</key> + <string>net.sourceforge.webcam-osx.macamDSC</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>macamDSC</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>0.8</string> + <key>CFBundleSignature</key> + <string>wC?!</string> + <key>CFBundleVersion</key> + <string>0.8</string> + <key>NSMainNibFile</key> + <string>MainMenu</string> + <key>NSPrincipalClass</key> + <string>NSApplication</string> + <key>NSUIElement</key> + <string>1</string> + <key>devices</key> + <array> + <dict> + <key>product</key> + <string>0x0202</string> + <key>vendor</key> + <string>0x0553</string> + </dict> + <dict> + <key>product</key> + <string>0x504B</string> + <key>vendor</key> + <string>0x04FC</string> + </dict> + <dict> + <key>product</key> + <string>0x504A</string> + <key>vendor</key> + <string>0x04FC</string> + </dict> + </array> + </dict> + </plist> + "; + }; + 396639D90402FCF000435B6F = { + buildActionMask = 2147483647; + files = ( + 396639DA0402FCF000435B6F, + 396639DB0402FCF000435B6F, + 396639DC0402FCF000435B6F, + 396639DD0402FCF000435B6F, + 396639DE0402FCF000435B6F, + 396639DF0402FCF000435B6F, + 396639E00402FCF000435B6F, + 396639E10402FCF000435B6F, + 396639E20402FCF000435B6F, + 396639E30402FCF000435B6F, + 396639E40402FCF000435B6F, + 396639E50402FCF000435B6F, + 396639E60402FCF000435B6F, + 396639E80402FCF000435B6F, + 396639E90402FCF000435B6F, + 396639EC0402FCF000435B6F, + 396639EE0402FCF000435B6F, + 396639EF0402FCF000435B6F, + 396639F00402FCF000435B6F, + 396639F10402FCF000435B6F, + 396639F20402FCF000435B6F, + 396639F30402FCF000435B6F, + 396639F40402FCF000435B6F, + 396639F50402FCF000435B6F, + 396639F60402FCF000435B6F, + 396639F90402FCF000435B6F, + 396639FA0402FCF000435B6F, + 396639FB0402FCF000435B6F, + 396639FC0402FCF000435B6F, + 396639FD0402FCF000435B6F, + 39663A030402FCF000435B6F, + 39663A040402FCF000435B6F, + 39663A050402FCF000435B6F, + 39663A060402FCF000435B6F, + 39663A070402FCF000435B6F, + 39FE214A04030BB800BAABE7, + ); + isa = PBXHeadersBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 396639DA0402FCF000435B6F = { + fileRef = F5F79A920212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 396639DB0402FCF000435B6F = { + fileRef = F5F79A940212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 396639DC0402FCF000435B6F = { + fileRef = F5F79A960212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 396639DD0402FCF000435B6F = { + fileRef = F5F79A980212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 396639DE0402FCF000435B6F = { + fileRef = F5F79A9A0212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 396639DF0402FCF000435B6F = { + fileRef = F5F79A810212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 396639E00402FCF000435B6F = { + fileRef = F5F79A830212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 396639E10402FCF000435B6F = { + fileRef = F5F79A850212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 396639E20402FCF000435B6F = { + fileRef = F5F79A870212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 396639E30402FCF000435B6F = { + fileRef = F55DD8210213113F0166DE0F; + isa = PBXBuildFile; + settings = { + }; + }; + 396639E40402FCF000435B6F = { + fileRef = F55DD8230213113F0166DE0F; + isa = PBXBuildFile; + settings = { + }; + }; + 396639E50402FCF000435B6F = { + fileRef = F55DD8250213113F0166DE0F; + isa = PBXBuildFile; + settings = { + }; + }; + 396639E60402FCF000435B6F = { + fileRef = F55DD8270213113F0166DE0F; + isa = PBXBuildFile; + settings = { + }; + }; + 396639E80402FCF000435B6F = { + fileRef = F589EB0E02268A6901D99A1F; + isa = PBXBuildFile; + settings = { + }; + }; + 396639E90402FCF000435B6F = { + fileRef = F58530E10229AAB601479C37; + isa = PBXBuildFile; + settings = { + }; + }; + 396639EC0402FCF000435B6F = { + fileRef = F511081E0241794801599652; + isa = PBXBuildFile; + settings = { + }; + }; + 396639EE0402FCF000435B6F = { + fileRef = F55A58C102572BFE014CA2B1; + isa = PBXBuildFile; + settings = { + }; + }; + 396639EF0402FCF000435B6F = { + fileRef = F55A58C302572BFE014CA2B1; + isa = PBXBuildFile; + settings = { + }; + }; + 396639F00402FCF000435B6F = { + fileRef = F5376F35026C66D30166DE1F; + isa = PBXBuildFile; + settings = { + }; + }; + 396639F10402FCF000435B6F = { + fileRef = F533EEB70271ACF80166DE1F; + isa = PBXBuildFile; + settings = { + }; + }; + 396639F20402FCF000435B6F = { + fileRef = F533EEC20271B72D0166DE1F; + isa = PBXBuildFile; + settings = { + }; + }; + 396639F30402FCF000435B6F = { + fileRef = F53480CC027240FB013AF9AD; + isa = PBXBuildFile; + settings = { + }; + }; + 396639F40402FCF000435B6F = { + fileRef = F5A153160274D3D501C56AC3; + isa = PBXBuildFile; + settings = { + }; + }; + 396639F50402FCF000435B6F = { + fileRef = F5FC0F1D02834E82015925D2; + isa = PBXBuildFile; + settings = { + }; + }; + 396639F60402FCF000435B6F = { + fileRef = F5FC0F23028351A7015925D2; + isa = PBXBuildFile; + settings = { + }; + }; + 396639F90402FCF000435B6F = { + fileRef = F5F4373E02D278D6018D4F8C; + isa = PBXBuildFile; + settings = { + }; + }; + 396639FA0402FCF000435B6F = { + fileRef = F5F4374E02D52947018D4F8C; + isa = PBXBuildFile; + settings = { + }; + }; + 396639FB0402FCF000435B6F = { + fileRef = F5C5790603049095010B006D; + isa = PBXBuildFile; + settings = { + }; + }; + 396639FC0402FCF000435B6F = { + fileRef = F5BB387E0342871601E62307; + isa = PBXBuildFile; + settings = { + }; + }; + 396639FD0402FCF000435B6F = { + fileRef = F5EDFAD6036876210166D062; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A030402FCF000435B6F = { + fileRef = F53F6637039ACC3F01C3DF00; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A040402FCF000435B6F = { + fileRef = F5A5077403BBC69501A78977; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A050402FCF000435B6F = { + fileRef = 39185ABA03C8B5570066DE75; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A060402FCF000435B6F = { + fileRef = 3973A6F303CDF44E0066D062; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A070402FCF000435B6F = { + fileRef = 39CBD65003DC0D79000F7EFC; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A080402FCF000435B6F = { + buildActionMask = 2147483647; + files = ( + 39663A0A0402FCF000435B6F, + 39663A0B0402FCF000435B6F, + 39663A0C0402FCF000435B6F, + 39663A0D0402FCF000435B6F, + 39663A0E0402FCF000435B6F, + 39663A0F0402FCF000435B6F, + 39663A100402FCF000435B6F, + 39663A130402FCF000435B6F, + 39663A150402FCF000435B6F, + 39663A160402FCF000435B6F, + 39663A190402FCF000435B6F, + 39663A1A0402FCF000435B6F, + 39663A1B0402FCF000435B6F, + 39663A1C0402FCF000435B6F, + 39663A1D0402FCF000435B6F, + 39663A1E0402FCF000435B6F, + 39663A200402FCF000435B6F, + 39663A210402FCF000435B6F, + 39663A6A0403091700435B6F, + 39502340040A55A70066D062, + ); + isa = PBXResourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 39663A0A0402FCF000435B6F = { + fileRef = F500FB6D022FB1BD01369AA6; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A0B0402FCF000435B6F = { + fileRef = F500FB6E022FB1BD01369AA6; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A0C0402FCF000435B6F = { + fileRef = F500FB6F022FB1BD01369AA6; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A0D0402FCF000435B6F = { + fileRef = F500FB70022FB1BD01369AA6; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A0E0402FCF000435B6F = { + fileRef = F500FB71022FB1BD01369AA6; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A0F0402FCF000435B6F = { + fileRef = F500FB72022FB1BD01369AA6; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A100402FCF000435B6F = { + fileRef = F500FB73022FB1BD01369AA6; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A130402FCF000435B6F = { + fileRef = F5285DAA0248103E01AEB99D; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A150402FCF000435B6F = { + fileRef = F52D2ED4025A9425016EC628; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A160402FCF000435B6F = { + fileRef = F52D2ED5025A9425016EC628; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A190402FCF000435B6F = { + fileRef = F57D11B6C5B26FF6010B00CC; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A1A0402FCF000435B6F = { + fileRef = F57D11B7C5B26FF6010B00CC; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A1B0402FCF000435B6F = { + fileRef = F57D11B8C5B26FF6010B00CC; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A1C0402FCF000435B6F = { + fileRef = F57D11BDC5B26FF6010B00CC; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A1D0402FCF000435B6F = { + fileRef = F57D11B5C5B26FF6010B00CC; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A1E0402FCF000435B6F = { + fileRef = F5794DDF0285B922010B00CC; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A200402FCF000435B6F = { + fileRef = F589724A0374636B01159FE2; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A210402FCF000435B6F = { + fileRef = F5B1CC460375DAF501159FE2; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A220402FCF000435B6F = { + buildActionMask = 2147483647; + files = ( + 39663A230402FCF000435B6F, + 39663A240402FCF000435B6F, + 39663A250402FCF000435B6F, + 39663A260402FCF000435B6F, + 39663A270402FCF000435B6F, + 39663A280402FCF000435B6F, + 39663A290402FCF000435B6F, + 39663A2A0402FCF000435B6F, + 39663A2B0402FCF000435B6F, + 39663A2C0402FCF000435B6F, + 39663A2F0402FCF000435B6F, + 39663A300402FCF000435B6F, + 39663A330402FCF000435B6F, + 39663A350402FCF000435B6F, + 39663A360402FCF000435B6F, + 39663A370402FCF000435B6F, + 39663A380402FCF000435B6F, + 39663A390402FCF000435B6F, + 39663A3A0402FCF000435B6F, + 39663A3B0402FCF000435B6F, + 39663A3C0402FCF000435B6F, + 39663A3D0402FCF000435B6F, + 39663A3E0402FCF000435B6F, + 39663A410402FCF000435B6F, + 39663A420402FCF000435B6F, + 39663A430402FCF000435B6F, + 39663A440402FCF000435B6F, + 39663A450402FCF000435B6F, + 39663A4B0402FCF000435B6F, + 39663A4C0402FCF000435B6F, + 39663A4D0402FCF000435B6F, + 39663A4E0402FCF000435B6F, + 39663A4F0402FCF000435B6F, + 39663A500402FCF000435B6F, + 39663A510402FCF000435B6F, + 39663A680403023400435B6F, + ); + isa = PBXSourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 39663A230402FCF000435B6F = { + fileRef = F5F79A930212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A240402FCF000435B6F = { + fileRef = F5F79A950212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A250402FCF000435B6F = { + fileRef = F5F79A990212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A260402FCF000435B6F = { + fileRef = F5F79A820212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A270402FCF000435B6F = { + fileRef = F5F79A840212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A280402FCF000435B6F = { + fileRef = F5F79A860212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A290402FCF000435B6F = { + fileRef = F5F79A880212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A2A0402FCF000435B6F = { + fileRef = F55DD8240213113F0166DE0F; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A2B0402FCF000435B6F = { + fileRef = F55DD8260213113F0166DE0F; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A2C0402FCF000435B6F = { + fileRef = F55DD8280213113F0166DE0F; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A2F0402FCF000435B6F = { + fileRef = F589EB0F02268A6901D99A1F; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A300402FCF000435B6F = { + fileRef = F58530E20229AAB601479C37; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A330402FCF000435B6F = { + fileRef = F511081D0241794801599652; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A350402FCF000435B6F = { + fileRef = F5B9568C0250D31A0166DE1F; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A360402FCF000435B6F = { + fileRef = F55A58C202572BFE014CA2B1; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A370402FCF000435B6F = { + fileRef = F55A58C402572BFE014CA2B1; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A380402FCF000435B6F = { + fileRef = F5376F36026C66D30166DE1F; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A390402FCF000435B6F = { + fileRef = F533EEB90271ACF80166DE1F; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A3A0402FCF000435B6F = { + fileRef = F533EEC30271B72D0166DE1F; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A3B0402FCF000435B6F = { + fileRef = F53480CD027240FB013AF9AD; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A3C0402FCF000435B6F = { + fileRef = F5A153170274D3D501C56AC3; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A3D0402FCF000435B6F = { + fileRef = F5FC0F1E02834E82015925D2; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A3E0402FCF000435B6F = { + fileRef = F5FC0F24028351A7015925D2; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A410402FCF000435B6F = { + fileRef = F5F4373C02D278D6018D4F8C; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A420402FCF000435B6F = { + fileRef = F5F4374C02D52947018D4F8C; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A430402FCF000435B6F = { + fileRef = F5C5790703049095010B006D; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A440402FCF000435B6F = { + fileRef = F5EF7FFB0364C3BD01E9B502; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A450402FCF000435B6F = { + fileRef = F5EDFAD5036876210166D062; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A4B0402FCF000435B6F = { + fileRef = F53F6636039ACC3F01C3DF00; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A4C0402FCF000435B6F = { + fileRef = F5A5077303BBC69501A78977; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A4D0402FCF000435B6F = { + fileRef = 39185ABB03C8B5570066DE75; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A4E0402FCF000435B6F = { + fileRef = F5F79A970212038E01E152CA; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A4F0402FCF000435B6F = { + fileRef = 3973A6F203CDF44E0066D062; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A500402FCF000435B6F = { + fileRef = 397B163C03CED9B900153FEE; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A510402FCF000435B6F = { + fileRef = 39CBD64F03DC0D79000F7EFC; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A520402FCF000435B6F = { + buildActionMask = 2147483647; + files = ( + 39663A530402FCF000435B6F, + 39663A540402FCF000435B6F, + 39663A550402FCF000435B6F, + 39663A560402FCF000435B6F, + 39FE215604030E7E00BAABE7, + 395E9AD704044198007E00C6, + ); + isa = PBXFrameworksBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 39663A530402FCF000435B6F = { + fileRef = 1058C7A1FEA54F0111CA2CBB; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A540402FCF000435B6F = { + fileRef = F5AA417601DA8EF70157C38C; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A550402FCF000435B6F = { + fileRef = F5AA417801DA8F350157C38C; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A560402FCF000435B6F = { + fileRef = F538BD1D01E5D0440166DE0F; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A570402FCF000435B6F = { + isa = PBXApplicationReference; + path = macamDSC.app; + refType = 3; + }; + 39663A5A0402FD1400435B6F = { + isa = PBXTargetDependency; + target = 396639D80402FCF000435B6F; + }; + 39663A620402FEAC00435B6F = { + children = ( + 39FE214904030BB800BAABE7, + 39663A670403023400435B6F, + 39663A690403091700435B6F, + 3950233F040A55A70066D062, + ); + isa = PBXGroup; + path = ica_specific; + refType = 4; + }; + 39663A670403023400435B6F = { + fileEncoding = 30; + isa = PBXFileReference; + path = main.m; + refType = 4; + }; + 39663A680403023400435B6F = { + fileRef = 39663A670403023400435B6F; + isa = PBXBuildFile; + settings = { + }; + }; + 39663A690403091700435B6F = { + isa = PBXFileReference; + path = MainMenu.nib; + refType = 4; + }; + 39663A6A0403091700435B6F = { + fileRef = 39663A690403091700435B6F; + isa = PBXBuildFile; + settings = { + }; + }; 3973A6F203CDF44E0066D062 = { fileEncoding = 30; *************** *** 504,507 **** --- 1337,1341 ---- 39AE92CD03C513490066D062, 39AE92CC03C513420066D062, + 39663A5A0402FD1400435B6F, ); isa = PBXAggregateTarget; *************** *** 549,552 **** --- 1383,1410 ---- 39CBD65403DC0D79000F7EFC = { fileRef = 39CBD65003DC0D79000F7EFC; + isa = PBXBuildFile; + settings = { + }; + }; + 39FE214904030BB800BAABE7 = { + fileEncoding = 30; + isa = PBXFileReference; + path = ICD_CameraCalls.h; + refType = 4; + }; + 39FE214A04030BB800BAABE7 = { + fileRef = 39FE214904030BB800BAABE7; + isa = PBXBuildFile; + settings = { + }; + }; + 39FE215504030E7E00BAABE7 = { + isa = PBXFrameworkReference; + name = ICACameraPriv.framework; + path = /System/Library/PrivateFrameworks/ICACameraPriv.framework; + refType = 0; + }; + 39FE215604030E7E00BAABE7 = { + fileRef = 39FE215504030E7E00BAABE7; isa = PBXBuildFile; settings = { |
From: <ma...@us...> - 2003-02-24 13:05:21
|
Update of /cvsroot/webcam-osx/macam/driver_core In directory sc8-pr-cvs1:/tmp/cvs-serv7178 Modified Files: MyDummyCameraDriver.h MyDummyCameraDriver.m Log Message: changed API from [startupWithUsbDeviceRef:] to [startupWithLocationID:] Index: MyDummyCameraDriver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/driver_core/MyDummyCameraDriver.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** MyDummyCameraDriver.h 22 May 2002 04:57:17 -0000 1.1.1.1 --- MyDummyCameraDriver.h 24 Feb 2003 13:05:18 -0000 1.2 *************** *** 35,39 **** - (id) initWithError:(CameraError)err central:(MyCameraCentral*)c; - (id) initWithCentral:(MyCameraCentral*)c; //same as above with CameraErrorOK ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef; //Camera introspection --- 35,39 ---- - (id) initWithError:(CameraError)err central:(MyCameraCentral*)c; - (id) initWithCentral:(MyCameraCentral*)c; //same as above with CameraErrorOK ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId; //Camera introspection Index: MyDummyCameraDriver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/driver_core/MyDummyCameraDriver.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** MyDummyCameraDriver.m 22 May 2002 04:57:17 -0000 1.1.1.1 --- MyDummyCameraDriver.m 24 Feb 2003 13:05:18 -0000 1.2 *************** *** 44,49 **** } ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef { ! return [super startupWithUsbDeviceRef:usbDeviceRef]; } --- 44,49 ---- } ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId { ! return [super startupWithUsbLocationId:usbLocationId]; } |
Update of /cvsroot/webcam-osx/macam/cameras In directory sc8-pr-cvs1:/tmp/cvs-serv7033 Modified Files: MySTV680Driver.h MySTV680Driver.m MySPCA500Driver.m MyQCExpressADriver.h MyQCWebDriver.m MyCPIACameraDriver.m MyKiaraFlippedDriver.h MyQCWebDriver.h MyQCExpressADriver.m MySPCA500Driver.h MyTimonFamilyDriver.m MySonix2028Driver.h MyQCProBeigeDriver.h MyKiaraFamilyDriver.h MyQCExpressBDriver.m MyPhilipsCameraDriver.h MySonix2028Driver.m MyQCProBeigeDriver.m MyKiaraFamilyDriver.m MyKiaraFlippedDriver.m MyPhilipsCameraDriver.m MyQCExpressBDriver.h MyOV511Driver.h MyVicamDriver.m MySE401Driver.m MyVicamDriver.h MyTimonFamilyDriver.h MySE401Driver.h MyOV511Driver.m MyCPIACameraDriver.h Log Message: changed API from [startupWithUsbDeviceRef:] to [startupWithLocationID:] Index: MySTV680Driver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MySTV680Driver.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MySTV680Driver.h 30 Dec 2002 17:49:27 -0000 1.3 --- MySTV680Driver.h 24 Feb 2003 13:05:08 -0000 1.4 *************** *** 62,66 **** - (id) initWithCentral:(id)c; ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef; - (void) dealloc; --- 62,66 ---- - (id) initWithCentral:(id)c; ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId; - (void) dealloc; *************** *** 94,98 **** - (long) numberOfStoredMediaObjects; - (NSDictionary*) getStoredMediaObject:(long)idx; ! - (void) eraseStoredMedia; @end --- 94,99 ---- - (long) numberOfStoredMediaObjects; - (NSDictionary*) getStoredMediaObject:(long)idx; ! - (BOOL) canDeleteAll; ! - (CameraError) deleteAll; @end Index: MySTV680Driver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MySTV680Driver.m,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MySTV680Driver.m 30 Dec 2002 20:07:49 -0000 1.5 --- MySTV680Driver.m 24 Feb 2003 13:05:08 -0000 1.6 *************** *** 47,54 **** } ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef { CameraError err; UInt8 cameraInfo[16]; ! err=[self usbConnectToCam:usbDeviceRef]; //setup connection to camera if (err!=CameraErrorOK) return err; --- 47,54 ---- } ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId { CameraError err; UInt8 cameraInfo[16]; ! err=[self usbConnectToCam:usbLocationId configIdx:0]; //setup connection to camera if (err!=CameraErrorOK) return err; *************** *** 64,68 **** [self setSharpness:0.5]; ! return [super startupWithUsbDeviceRef:usbDeviceRef]; } --- 64,68 ---- [self setSharpness:0.5]; ! return [super startupWithUsbLocationId:usbLocationId]; } *************** *** 186,190 **** UInt8 originalPhotoResolution; CameraError ret=CameraErrorOK; ! [self eraseStoredMedia];//Erase images. They are lost anyway and doing so, we get correct stream info videoBulkReadsPending=0; emptyChunks=NULL; --- 186,190 ---- UInt8 originalPhotoResolution; CameraError ret=CameraErrorOK; ! [self deleteAll];//Erase images. They are lost anyway and doing so, we get correct stream info videoBulkReadsPending=0; emptyChunks=NULL; *************** *** 594,600 **** } ! - (void) eraseStoredMedia { /* I don't know how to do this directly - so the approach is to setup streaming and stop immediately. This will also erase all stored images. */ UInt16 val=0; switch (resolution) { case ResolutionCIF: val=0x0000; break; --- 594,605 ---- } ! - (BOOL) canDeleteAll { ! return YES; ! } ! ! - (CameraError) deleteAll { /* I don't know how to do this directly - so the approach is to setup streaming and stop immediately. This will also erase all stored images. */ UInt16 val=0; + CameraError err=CameraErrorOK; switch (resolution) { case ResolutionCIF: val=0x0000; break; *************** *** 604,614 **** default: #ifdef VERBOSE ! NSLog(@"eraseStoredMedia: Invalid resolution!"); #endif ! return; break; } ! [self usbWriteCmdWithBRequest:SET_STREAMING_MODE wValue:val wIndex:0 buf:NULL len:0]; ! [self usbWriteCmdWithBRequest:SET_CAMERA_IDLE wValue:0 wIndex:0 buf:NULL len:0]; } --- 609,626 ---- default: #ifdef VERBOSE ! NSLog(@"deleteAll: Invalid resolution!"); #endif ! err=CameraErrorInternal; break; } ! if (err==CameraErrorOK) { ! if (![self usbWriteCmdWithBRequest:SET_STREAMING_MODE wValue:val wIndex:0 buf:NULL len:0]) { ! err=CameraErrorUSBProblem; ! } ! if (![self usbWriteCmdWithBRequest:SET_CAMERA_IDLE wValue:0 wIndex:0 buf:NULL len:0]) { ! err=CameraErrorUSBProblem; ! } ! } ! return err; } Index: MySPCA500Driver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MySPCA500Driver.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MySPCA500Driver.m 16 Jan 2003 18:18:42 -0000 1.3 --- MySPCA500Driver.m 24 Feb 2003 13:05:08 -0000 1.4 *************** *** 78,84 **** ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef { CameraError err; ! err=[self usbConnectToCam:usbDeviceRef]; fps=5; resolution=ResolutionVGA; --- 78,84 ---- ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId { CameraError err; ! err=[self usbConnectToCam:usbLocationId configIdx:0]; fps=5; resolution=ResolutionVGA; *************** *** 131,135 **** (**pccamImgDesc).clutID=-1; } ! if (err==CameraErrorOK) err=[super startupWithUsbDeviceRef:usbDeviceRef]; if (err==CameraErrorOK) err=[self openDSCInterface]; --- 131,135 ---- (**pccamImgDesc).clutID=-1; } ! if (err==CameraErrorOK) err=[super startupWithUsbLocationId:usbLocationId]; if (err==CameraErrorOK) err=[self openDSCInterface]; *************** *** 702,711 **** if (!storedFileInfo) return 0; return [storedFileInfo count]; - } - - - (void) eraseStoredMedia { - #ifdef VERBOSE - NSLog(@"MySPCA500Driver: eraseStoredMedia not implemented"); - #endif } --- 702,705 ---- Index: MyQCExpressADriver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCExpressADriver.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MyQCExpressADriver.h 23 Feb 2003 19:07:59 -0000 1.6 --- MyQCExpressADriver.h 24 Feb 2003 13:05:08 -0000 1.7 *************** *** 87,91 **** + (NSString*) cameraName; ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef; - (void) dealloc; --- 87,91 ---- + (NSString*) cameraName; ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId; - (void) dealloc; Index: MyQCWebDriver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCWebDriver.m,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MyQCWebDriver.m 30 Dec 2002 20:07:05 -0000 1.5 --- MyQCWebDriver.m 24 Feb 2003 13:05:08 -0000 1.6 *************** *** 35,42 **** } ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef { CameraError err; ! err=[super startupWithUsbDeviceRef:usbDeviceRef]; extraBytesInLine=4; --- 35,42 ---- } ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId { CameraError err; ! err=[super startupWithUsbLocationId:usbLocationId]; extraBytesInLine=4; Index: MyCPIACameraDriver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyCPIACameraDriver.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MyCPIACameraDriver.m 30 Dec 2002 20:06:38 -0000 1.3 --- MyCPIACameraDriver.m 24 Feb 2003 13:05:08 -0000 1.4 *************** *** 102,107 **** + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"CPiA-based camera"]; } ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef { ! CameraError err=[self usbConnectToCam:usbDeviceRef]; //setup connection to camera if (err!=CameraErrorOK) return err; --- 102,107 ---- + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"CPiA-based camera"]; } ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId { ! CameraError err=[self usbConnectToCam:usbLocationId configIdx:0]; //setup connection to camera if (err!=CameraErrorOK) return err; *************** *** 115,119 **** [self setCompression:0]; memset(&grabContext,0,sizeof(CPIAGrabContext)); ! return [super startupWithUsbDeviceRef:usbDeviceRef]; } --- 115,119 ---- [self setCompression:0]; memset(&grabContext,0,sizeof(CPIAGrabContext)); ! return [super startupWithUsbLocationId:usbLocationId]; } Index: MyKiaraFlippedDriver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyKiaraFlippedDriver.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MyKiaraFlippedDriver.h 20 Jan 2003 16:20:21 -0000 1.1 --- MyKiaraFlippedDriver.h 24 Feb 2003 13:05:08 -0000 1.2 *************** *** 28,32 **** + (NSArray*) cameraUsbDescriptions; ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef; --- 28,32 ---- + (NSArray*) cameraUsbDescriptions; ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId; Index: MyQCWebDriver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCWebDriver.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MyQCWebDriver.h 26 Jul 2002 12:06:50 -0000 1.4 --- MyQCWebDriver.h 24 Feb 2003 13:05:08 -0000 1.5 *************** *** 40,44 **** - (BOOL) supportsResolution:(CameraResolution)r fps:(short)fr; //Does this combination work? ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef; - (void) shutdown; --- 40,44 ---- - (BOOL) supportsResolution:(CameraResolution)r fps:(short)fr; //Does this combination work? ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId; - (void) shutdown; Index: MyQCExpressADriver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCExpressADriver.m,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MyQCExpressADriver.m 23 Feb 2003 19:07:59 -0000 1.9 --- MyQCExpressADriver.m 24 Feb 2003 13:05:08 -0000 1.10 *************** *** 54,59 **** + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"QuickCam Express"]; } ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef { ! CameraError err=[self usbConnectToCam:usbDeviceRef]; if (err!=CameraErrorOK) return err; memset(&grabContext,0,sizeof(STV600GrabContext)); --- 54,59 ---- + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"QuickCam Express"]; } ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId { ! CameraError err=[self usbConnectToCam:usbLocationId configIdx:0]; if (err!=CameraErrorOK) return err; memset(&grabContext,0,sizeof(STV600GrabContext)); *************** *** 70,74 **** [self setAutoGain:YES]; extraBytesInLine=0; ! return [super startupWithUsbDeviceRef:usbDeviceRef]; } --- 70,74 ---- [self setAutoGain:YES]; extraBytesInLine=0; ! return [super startupWithUsbLocationId:usbLocationId]; } Index: MySPCA500Driver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MySPCA500Driver.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MySPCA500Driver.h 16 Jan 2003 15:41:57 -0000 1.2 --- MySPCA500Driver.h 24 Feb 2003 13:05:08 -0000 1.3 *************** *** 75,79 **** + (NSString*) cameraName; ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef; - (void) shutdown; --- 75,79 ---- + (NSString*) cameraName; ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId; - (void) shutdown; *************** *** 95,99 **** - (long) numberOfStoredMediaObjects; - (NSDictionary*) getStoredMediaObject:(long)idx; - - (void) eraseStoredMedia; --- 95,98 ---- Index: MyTimonFamilyDriver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyTimonFamilyDriver.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MyTimonFamilyDriver.m 20 Jan 2003 16:20:58 -0000 1.2 --- MyTimonFamilyDriver.m 24 Feb 2003 13:05:09 -0000 1.3 *************** *** 77,82 **** } ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef { ! return [super startupWithUsbDeviceRef:usbDeviceRef]; } --- 77,82 ---- } ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId { ! return [super startupWithUsbLocationId:usbLocationId]; } Index: MySonix2028Driver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MySonix2028Driver.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MySonix2028Driver.h 30 Jan 2003 11:30:09 -0000 1.7 --- MySonix2028Driver.h 24 Feb 2003 13:05:09 -0000 1.8 *************** *** 88,92 **** + (NSString*) cameraName; ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef; - (void) dealloc; --- 88,92 ---- + (NSString*) cameraName; ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId; - (void) dealloc; Index: MyQCProBeigeDriver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCProBeigeDriver.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MyQCProBeigeDriver.h 9 Jan 2003 15:18:52 -0000 1.1 --- MyQCProBeigeDriver.h 24 Feb 2003 13:05:09 -0000 1.2 *************** *** 58,62 **** - (id) initWithCentral:(id)c; ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef; - (void) dealloc; --- 58,62 ---- - (id) initWithCentral:(id)c; ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId; - (void) dealloc; Index: MyKiaraFamilyDriver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyKiaraFamilyDriver.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MyKiaraFamilyDriver.h 20 Jan 2003 16:21:40 -0000 1.2 --- MyKiaraFamilyDriver.h 24 Feb 2003 13:05:09 -0000 1.3 *************** *** 28,32 **** + (NSArray*) cameraUsbDescriptions; ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef; - (BOOL) supportsResolution:(CameraResolution)r fps:(short)fr; //Returns if this combination is supported --- 28,32 ---- + (NSArray*) cameraUsbDescriptions; ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId; - (BOOL) supportsResolution:(CameraResolution)r fps:(short)fr; //Returns if this combination is supported Index: MyQCExpressBDriver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCExpressBDriver.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MyQCExpressBDriver.m 23 Feb 2003 19:07:59 -0000 1.4 --- MyQCExpressBDriver.m 24 Feb 2003 13:05:09 -0000 1.5 *************** *** 31,38 **** + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"QuickCam Express"]; } ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef { CameraError err; ! err=[super startupWithUsbDeviceRef:usbDeviceRef]; if (err==CameraErrorOK) { /*Start stv600 emulation (or whatever it is). Without it, image data is shifted by one byte which is 0x01 for the first image and 0x00 for the following ones */ --- 31,38 ---- + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"QuickCam Express"]; } ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId { CameraError err; ! err=[super startupWithUsbLocationId:usbLocationId]; if (err==CameraErrorOK) { /*Start stv600 emulation (or whatever it is). Without it, image data is shifted by one byte which is 0x01 for the first image and 0x00 for the following ones */ Index: MyPhilipsCameraDriver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyPhilipsCameraDriver.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MyPhilipsCameraDriver.h 20 Jan 2003 16:22:38 -0000 1.2 --- MyPhilipsCameraDriver.h 24 Feb 2003 13:05:09 -0000 1.3 *************** *** 144,148 **** //start/stop ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef; - (void) dealloc; --- 144,148 ---- //start/stop ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId; - (void) dealloc; Index: MySonix2028Driver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MySonix2028Driver.m,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** MySonix2028Driver.m 30 Jan 2003 11:30:48 -0000 1.14 --- MySonix2028Driver.m 24 Feb 2003 13:05:09 -0000 1.15 *************** *** 132,137 **** + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"AEL Auracam DC-31UC"]; } ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef { ! CameraError err=[self usbConnectToCam:usbDeviceRef]; //setup connection to camera if (err!=CameraErrorOK) return err; --- 132,137 ---- + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"AEL Auracam DC-31UC"]; } ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId { ! CameraError err=[self usbConnectToCam:usbLocationId configIdx:0]; //setup connection to camera if (err!=CameraErrorOK) return err; *************** *** 152,156 **** [super setGain:0.5f]; [self setCompression:0]; ! return [super startupWithUsbDeviceRef:usbDeviceRef]; } --- 152,156 ---- [super setGain:0.5f]; [self setCompression:0]; ! return [super startupWithUsbLocationId:usbLocationId]; } Index: MyQCProBeigeDriver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCProBeigeDriver.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MyQCProBeigeDriver.m 16 Jan 2003 15:38:57 -0000 1.2 --- MyQCProBeigeDriver.m 24 Feb 2003 13:05:09 -0000 1.3 *************** *** 66,74 **** } ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef { CameraError err; //setup connection to camera ! err=[self usbConnectToCam:usbDeviceRef]; if (err!=CameraErrorOK) return err; --- 66,74 ---- } ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId { CameraError err; //setup connection to camera ! err=[self usbConnectToCam:usbLocationId configIdx:0]; if (err!=CameraErrorOK) return err; *************** *** 86,90 **** //Do the remaining, usual connection stuff ! err=[super startupWithUsbDeviceRef:usbDeviceRef]; if (err!=CameraErrorOK) return err; --- 86,90 ---- //Do the remaining, usual connection stuff ! err=[super startupWithUsbLocationId:usbLocationId]; if (err!=CameraErrorOK) return err; Index: MyKiaraFamilyDriver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyKiaraFamilyDriver.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MyKiaraFamilyDriver.m 30 Jan 2003 23:04:10 -0000 1.3 --- MyKiaraFamilyDriver.m 24 Feb 2003 13:05:09 -0000 1.4 *************** *** 63,68 **** } ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef { ! CameraError err=[super startupWithUsbDeviceRef:usbDeviceRef]; if (!err) { chunkHeader=8; --- 63,68 ---- } ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId { ! CameraError err=[super startupWithUsbLocationId:usbLocationId]; if (!err) { chunkHeader=8; Index: MyKiaraFlippedDriver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyKiaraFlippedDriver.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MyKiaraFlippedDriver.m 20 Jan 2003 16:20:20 -0000 1.1 --- MyKiaraFlippedDriver.m 24 Feb 2003 13:05:09 -0000 1.2 *************** *** 41,46 **** ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef { ! CameraError err=[super startupWithUsbDeviceRef:usbDeviceRef]; camHFlip=YES; return err; --- 41,46 ---- ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId { ! CameraError err=[super startupWithUsbLocationId:usbLocationId]; camHFlip=YES; return err; Index: MyPhilipsCameraDriver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyPhilipsCameraDriver.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MyPhilipsCameraDriver.m 30 Dec 2002 20:07:13 -0000 1.3 --- MyPhilipsCameraDriver.m 24 Feb 2003 13:05:09 -0000 1.4 *************** *** 46,51 **** + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"abstract Philips generic camera"]; } ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef { ! CameraError err=[self usbConnectToCam:usbDeviceRef]; //setup connection to camera if (err!=CameraErrorOK) return err; --- 46,51 ---- + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"abstract Philips generic camera"]; } ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId { ! CameraError err=[self usbConnectToCam:usbLocationId configIdx:0]; //setup connection to camera if (err!=CameraErrorOK) return err; *************** *** 62,66 **** [self setShutter:0.5f]; [self setAutoGain:YES]; ! return [super startupWithUsbDeviceRef:usbDeviceRef]; } --- 62,66 ---- [self setShutter:0.5f]; [self setAutoGain:YES]; ! return [super startupWithUsbLocationId:usbLocationId]; } Index: MyQCExpressBDriver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCExpressBDriver.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MyQCExpressBDriver.h 1 Jul 2002 16:06:14 -0000 1.2 --- MyQCExpressBDriver.h 24 Feb 2003 13:05:09 -0000 1.3 *************** *** 37,41 **** + (NSString*) cameraName; ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef; - (void) shutdown; --- 37,41 ---- + (NSString*) cameraName; ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId; - (void) shutdown; Index: MyOV511Driver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyOV511Driver.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MyOV511Driver.h 2 Feb 2003 13:26:09 -0000 1.7 --- MyOV511Driver.h 24 Feb 2003 13:05:09 -0000 1.8 *************** *** 258,262 **** //start/stop ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef; - (void) dealloc; --- 258,262 ---- //start/stop ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId; - (void) dealloc; Index: MyVicamDriver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyVicamDriver.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MyVicamDriver.m 30 Dec 2002 20:06:24 -0000 1.3 --- MyVicamDriver.m 24 Feb 2003 13:05:09 -0000 1.4 *************** *** 381,389 **** } ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef { CameraError err; ! err = [self usbConnectToCam:usbDeviceRef]; controlChange = YES; --- 381,389 ---- } ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId { CameraError err; ! err = [self usbConnectToCam:usbLocationId configIdx:0]; controlChange = YES; *************** *** 406,410 **** [self usbIntfWriteCmdWithBRequest:0x55 wValue:3 wIndex:0 buf:0 len:0]; ! return [super startupWithUsbDeviceRef:usbDeviceRef]; } --- 406,410 ---- [self usbIntfWriteCmdWithBRequest:0x55 wValue:3 wIndex:0 buf:0 len:0]; ! return [super startupWithUsbLocationId:usbLocationId]; } Index: MySE401Driver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MySE401Driver.m,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MySE401Driver.m 2 Jan 2003 18:25:14 -0000 1.5 --- MySE401Driver.m 24 Feb 2003 13:05:09 -0000 1.6 *************** *** 109,113 **** } ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef { CameraError err; UInt8 buf[64]; --- 109,113 ---- } ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId { CameraError err; UInt8 buf[64]; *************** *** 118,122 **** //setup connection to camera ! err=[self usbConnectToCam:usbDeviceRef]; if (err!=CameraErrorOK) return err; --- 118,122 ---- //setup connection to camera ! err=[self usbConnectToCam:usbLocationId configIdx:0]; if (err!=CameraErrorOK) return err; *************** *** 164,168 **** //Do the remaining, usual connection stuff ! err=[super startupWithUsbDeviceRef:usbDeviceRef]; if (err!=CameraErrorOK) return err; --- 164,168 ---- //Do the remaining, usual connection stuff ! err=[super startupWithUsbLocationId:usbLocationId]; if (err!=CameraErrorOK) return err; *************** *** 696,732 **** while ((shouldBeGrabbing)&&([fullChunks count]>0)) { //decode all full chunks we have currChunk=[self getOldestFullChunkBuffer]; ! [imageBufferLock lock]; //Get image data ! lastImageBuffer=nextImageBuffer; ! lastImageBufferBPP=nextImageBufferBPP; ! lastImageBufferRowBytes=nextImageBufferRowBytes; ! bufferSet=nextImageBufferSet; ! nextImageBufferSet=NO; ! if (bufferSet) { ! imgData=[currChunk mutableBytes]; ! if (streamIsCompressed) { //Decode JangGu-compressed Stream ! [self decompressJangGuFrom:imgData ! to:lastImageBuffer ! rowBytes:lastImageBufferRowBytes ! bpp:lastImageBufferBPP ! flip:!hFlip]; ! } else { //Decode raw Bayer stream ! [bayerConverter convertFromSrc:imgData+width ! toDest:lastImageBuffer ! srcRowBytes:width ! dstRowBytes:lastImageBufferRowBytes ! dstBPP:lastImageBufferBPP flip:!hFlip]; } ! [imageBufferLock unlock]; ! [self mergeImageReady]; ! if (autoGain) [self doAutoExposure]; ! } else { ! [imageBufferLock unlock]; } - [emptyChunkLock lock]; //recycle our chunk - it's empty again - [emptyChunks addObject:currChunk]; - [currChunk release]; - currChunk=NULL; - [emptyChunkLock unlock]; } } --- 696,731 ---- while ((shouldBeGrabbing)&&([fullChunks count]>0)) { //decode all full chunks we have currChunk=[self getOldestFullChunkBuffer]; ! if (currChunk) { ! [imageBufferLock lock]; //Get image data ! lastImageBuffer=nextImageBuffer; ! lastImageBufferBPP=nextImageBufferBPP; ! lastImageBufferRowBytes=nextImageBufferRowBytes; ! bufferSet=nextImageBufferSet; ! nextImageBufferSet=NO; ! if (bufferSet) { ! imgData=[currChunk mutableBytes]; ! if (streamIsCompressed) { //Decode JangGu-compressed Stream ! [self decompressJangGuFrom:imgData ! to:lastImageBuffer ! rowBytes:lastImageBufferRowBytes ! bpp:lastImageBufferBPP flip:!hFlip]; + } else { //Decode raw Bayer stream + [bayerConverter convertFromSrc:imgData+width + toDest:lastImageBuffer + srcRowBytes:width + dstRowBytes:lastImageBufferRowBytes + dstBPP:lastImageBufferBPP + flip:!hFlip]; + } + [imageBufferLock unlock]; + [self mergeImageReady]; + if (autoGain) [self doAutoExposure]; + } else { + [imageBufferLock unlock]; } ! [self disposeChunkBuffer:currChunk]; //recycle our chunk - it's empty again ! currChunk=NULL; } } } Index: MyVicamDriver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyVicamDriver.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MyVicamDriver.h 8 Jul 2002 22:32:01 -0000 1.1 --- MyVicamDriver.h 24 Feb 2003 13:05:09 -0000 1.2 *************** *** 91,95 **** //Start/stop - (id) initWithCentral:(MyCameraCentral*)c; ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef; - (void) dealloc; --- 91,95 ---- //Start/stop - (id) initWithCentral:(MyCameraCentral*)c; ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId; - (void) dealloc; Index: MyTimonFamilyDriver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyTimonFamilyDriver.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MyTimonFamilyDriver.h 20 Jan 2003 16:20:58 -0000 1.2 --- MyTimonFamilyDriver.h 24 Feb 2003 13:05:09 -0000 1.3 *************** *** 32,36 **** } + (NSArray*) cameraUsbDescriptions; ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef; - (BOOL) canSetSaturation; //Override to disable - (BOOL) supportsResolution:(CameraResolution)r fps:(short)fr; //Returns if this combination is supported --- 32,36 ---- } + (NSArray*) cameraUsbDescriptions; ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId; - (BOOL) canSetSaturation; //Override to disable - (BOOL) supportsResolution:(CameraResolution)r fps:(short)fr; //Returns if this combination is supported Index: MySE401Driver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MySE401Driver.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MySE401Driver.h 2 Jan 2003 18:08:09 -0000 1.3 --- MySE401Driver.h 24 Feb 2003 13:05:09 -0000 1.4 *************** *** 71,75 **** - (id) initWithCentral:(id)c; ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef; - (void) dealloc; --- 71,75 ---- - (id) initWithCentral:(id)c; ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId; - (void) dealloc; Index: MyOV511Driver.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyOV511Driver.m,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MyOV511Driver.m 2 Feb 2003 13:26:09 -0000 1.10 --- MyOV511Driver.m 24 Feb 2003 13:05:09 -0000 1.11 *************** *** 130,137 **** static unsigned char uvQuanTable511[] = OV511_UVQUANTABLE; ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef { UInt8 buf[16], cid; long i; ! CameraError err=[self usbConnectToCam:usbDeviceRef]; //setup connection to camera if (err!=CameraErrorOK) return err; --- 130,137 ---- static unsigned char uvQuanTable511[] = OV511_UVQUANTABLE; ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId { UInt8 buf[16], cid; long i; ! CameraError err=[self usbConnectToCam:usbLocationId configIdx:0]; //setup connection to camera if (err!=CameraErrorOK) return err; *************** *** 260,264 **** // [self setAutoGain:YES]; ! return [super startupWithUsbDeviceRef:usbDeviceRef]; } --- 260,264 ---- // [self setAutoGain:YES]; ! return [super startupWithUsbLocationId:usbLocationId]; } Index: MyCPIACameraDriver.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/cameras/MyCPIACameraDriver.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** MyCPIACameraDriver.h 22 May 2002 04:57:11 -0000 1.1.1.1 --- MyCPIACameraDriver.h 24 Feb 2003 13:05:09 -0000 1.2 *************** *** 91,95 **** + (NSString*) cameraName; ! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef; - (void) dealloc; --- 91,95 ---- + (NSString*) cameraName; ! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId; - (void) dealloc; |
From: <ma...@us...> - 2003-02-24 13:04:24
|
Update of /cvsroot/webcam-osx/macam/driver_core In directory sc8-pr-cvs1:/tmp/cvs-serv6731 Modified Files: MyCameraCentral.h MyCameraCentral.m Log Message: added locationID functionality Index: MyCameraCentral.h =================================================================== RCS file: /cvsroot/webcam-osx/macam/driver_core/MyCameraCentral.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MyCameraCentral.h 30 Jan 2003 11:31:48 -0000 1.4 --- MyCameraCentral.h 24 Feb 2003 13:04:20 -0000 1.5 *************** *** 84,87 **** --- 84,88 ---- - (short) indexOfCamera:(MyCameraDriver*)driver; - (unsigned long) idOfCameraWithIndex:(short)idx; + - (unsigned long) idOfCameraWithLocationID:(UInt32)locID; - (CameraError) useCameraWithID:(unsigned long)cid to:(MyCameraDriver**)outCam acceptDummy:(BOOL)acceptDummy; - (MyCameraDriver*) useDummyForError:(CameraError)err; Index: MyCameraCentral.m =================================================================== RCS file: /cvsroot/webcam-osx/macam/driver_core/MyCameraCentral.m,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** MyCameraCentral.m 30 Jan 2003 11:31:48 -0000 1.18 --- MyCameraCentral.m 24 Feb 2003 13:04:20 -0000 1.19 *************** *** 60,63 **** --- 60,65 ---- - (void) setPrefs:(id)prefs forKey:(NSString*)key; - (void) registerCameraDriver:(Class)driver; + - (CameraError) locationIdOfUSBDeviceRef:(io_service_t)usbDeviceRef to:(UInt32*)outVal; + @end *************** *** 316,319 **** --- 318,329 ---- } + - (unsigned long) idOfCameraWithLocationID:(UInt32)locID { + short i; + for (i=0;i<[cameras count];i++) { + if ([[cameras objectAtIndex:i] locationID]==locID) return [[cameras objectAtIndex:i] cid]; + } + return 0; + } + - (CameraError) useCameraWithID:(unsigned long)cid to:(MyCameraDriver**)outCam acceptDummy:(BOOL)acceptDummy { long l; *************** *** 346,355 **** if (!err) { [cam setDelegate:delegate]; ! err=[cam startupWithUsbDeviceRef:[dev usbDeviceRef]]; if (err!=CameraErrorOK) { [cam release]; cam=NULL; } ! } if (err&&acceptDummy) { //We have an error and the sender wants a dummy in case of an error cam=[self useDummyForError:err]; --- 356,365 ---- if (!err) { [cam setDelegate:delegate]; ! err=[cam startupWithUsbLocationId:[dev locationID]]; if (err!=CameraErrorOK) { [cam release]; cam=NULL; } ! } if (err&&acceptDummy) { //We have an error and the sender wants a dummy in case of an error cam=[self useDummyForError:err]; *************** *** 367,371 **** if (driver) { [driver setDelegate:delegate]; ! [driver startupWithUsbDeviceRef:NULL]; } return driver; --- 377,381 ---- if (driver) { [driver setDelegate:delegate]; ! [driver startupWithUsbLocationId:0]; } return driver; *************** *** 516,526 **** } - typedef struct MyPrivateData { - io_service_t usbDeviceRef; //A reference to our device in case we want to open it - io_object_t notification; //A reference to our notification we want when we are unplugged - CFStringRef deviceName; //The name of the device (unused) - - } MyPrivateData; - void DeviceRemoved( void *refCon,io_service_t service,natural_t messageType,void *messageArgument ) { MyCameraInfo* dev=(MyCameraInfo*)refCon; --- 526,529 ---- *************** *** 556,560 **** //Release the usb stuff ret = IOObjectRelease([dev notification]); //we don't need the usb notification any more - ret = IOObjectRelease([dev usbDeviceRef]); //we don't need the device reference any more //Initiate the driver shutdown. if ([dev driver]!=NULL) { --- 559,562 ---- *************** *** 577,580 **** --- 579,584 ---- io_object_t notification; while (usbDeviceRef = IOIteratorNext(iterator)) { + UInt32 locID; + //Setup our data object we use to track the device while it is plugged dev=[type copy]; *************** *** 585,589 **** continue; } - [dev setUsbDeviceRef:usbDeviceRef]; //Request notification if the device is unplugged --- 589,592 ---- *************** *** 601,606 **** --- 604,618 ---- continue; } + //Try to find our USB location ID + if ([self locationIdOfUSBDeviceRef:usbDeviceRef to:&locID]!=CameraErrorOK) { + #ifdef VERBOSE + NSLog(@"failed to get location id"); + #endif + [dev release]; + continue; + } //Remember the notification (we have to release it later) [dev setNotification:notification]; + [dev setLocationID:locID]; //Put the new entry to the list of available cameras *************** *** 688,691 **** --- 700,751 ---- } + - (CameraError) locationIdOfUSBDeviceRef:(io_service_t)usbDeviceRef to:(UInt32*)outVal { + UInt32 locID=0; + kern_return_t kernelErr; + SInt32 score; + IOCFPlugInInterface **plugin=NULL; + CameraError err=CameraErrorOK; + HRESULT res; + IOUSBDeviceInterface** dev=NULL; + + kernelErr = IOCreatePlugInInterfaceForService(usbDeviceRef, kIOUSBDeviceUserClientTypeID, kIOCFPlugInInterfaceID, &plugin, &score); + + if ((kernelErr!=kIOReturnSuccess)||(!plugin)) { + #ifdef VERBOSE + NSLog(@"MyCameraCentral: IOCreatePlugInInterfaceForService; Could not get plugin"); + #endif + return CameraErrorUSBProblem; + } + if (!err) { + res=(*plugin)->QueryInterface(plugin,CFUUIDGetUUIDBytes(kIOUSBDeviceInterfaceID),(LPVOID*)(&dev)); + (*plugin)->Release(plugin); + plugin=NULL; + if ((res)||(!dev)) { + #ifdef VERBOSE + NSLog(@"MyCameraCentral: IOCreatePlugInInterfaceForService; Could not get device interface"); + #endif + err=CameraErrorUSBProblem; + } + } + if (!err) { + kernelErr = (*dev)->GetLocationID(dev,&locID); + (*dev)->Release(dev); + if (kernelErr!=KERN_SUCCESS) { + #ifdef VERBOSE + NSLog(@"MyCameraCentral: IOCreatePlugInInterfaceForService; Could not get Location ID"); + #endif + err=CameraErrorUSBProblem; + } + } + if (outVal) { + if (!err) *outVal=locID; + else *outVal=0; + } + return err; + } + + + + @end |