Changeset 1656 for trunk/platform/ixus70_sd1000/platform_camera.h

Timestamp:

02/10/12 09:43:38 (16 months ago)

Author:

philmoz

Message:

Merged revision(s) 1652 from branches/release-1_0:

Location:

trunk

Files:

• . (modified) (1 prop)
• platform/ixus70_sd1000/platform_camera.h (modified) (2 diffs)

trunk/platform/ixus70_sd1000/platform_camera.h

@@ -1 @@
-// Camera - IXUS70_SD1000 - platform_camera.h
+// Camera - ixus70_sd1000 - platform_camera.h
 
-// This file contains the various settings values specific to the IXUS70_SD1000 camera.
+// This file contains the various settings values specific to the ixus70_sd1000 camera.
 // This file is referenced via the 'include/camera.h' file and should not be loaded directly.
 
@@ -21 +21 @@
 // don't override them again in here.
 
-    #define CAM_PROPSET                 2
+    #define CAM_PROPSET                     2
 
-    #define CAM_RAW_ROWPIX              3152   // for 7 MP
-    #define CAM_RAW_ROWS                2340   // for 7 MP
+    #define CAM_RAW_ROWPIX                  3152    // for 7 MP
+    #define CAM_RAW_ROWS                    2340    // for 7 MP
 
     #undef  CAM_USE_ZOOM_FOR_MF
     #undef  CAM_HAS_ERASE_BUTTON
     #undef  CAM_HAS_IRIS_DIAPHRAGM
-    #define CAM_HAS_ND_FILTER           1
+    #define CAM_HAS_ND_FILTER               1
     #undef  CAM_HAS_MANUAL_FOCUS
     #undef  CAM_HAS_USER_TV_MODES
-    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
+    #define CAM_SHOW_OSD_IN_SHOOT_MENU      1
     #undef  CAM_HAS_IS
     #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
-    #define CAM_MULTIPART               1
+
+    #define CAM_MULTIPART                   1
 
     #define CAM_DNG_LENS_INFO               { 58,10, 174,10, 28,10, 49,10 } // See comments in camera.h
     // pattern
-    #define cam_CFAPattern 0x02010100 // Red  Green  Green  Blue
+    #define cam_CFAPattern                  0x02010100 // Red  Green  Green  Blue
     // color
-    #define CAM_COLORMATRIX1                                \
-      652674,  1000000, -172074, 1000000, -107575, 1000000, \
-      -139063, 1000000, 594517,  1000000,  60252,  1000000, \
-       -9088,  1000000, 82013,   1000000,  238048, 1000000
-    
-    #define cam_CalibrationIlluminant1 1 // Daylight
+    #define CAM_COLORMATRIX1                              \
+     652674, 1000000, -172074, 1000000, -107575, 1000000, \
+    -139063, 1000000,  594517, 1000000,   60252, 1000000, \
+      -9088, 1000000,   82013, 1000000,  238048, 1000000
+
+    #define cam_CalibrationIlluminant1      1       // Daylight
     // cropping
-    #define CAM_JPEG_WIDTH  3072
-    #define CAM_JPEG_HEIGHT 2304
-    #define CAM_ACTIVE_AREA_X1 38
-    #define CAM_ACTIVE_AREA_Y1 14
-    #define CAM_ACTIVE_AREA_X2 3146
-    #define CAM_ACTIVE_AREA_Y2 2338
+    #define CAM_JPEG_WIDTH                  3072
+    #define CAM_JPEG_HEIGHT                 2304
+    #define CAM_ACTIVE_AREA_X1              38
+    #define CAM_ACTIVE_AREA_Y1              14
+    #define CAM_ACTIVE_AREA_X2              3146
+    #define CAM_ACTIVE_AREA_Y2              2338
     // camera name
-    #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
+    #define PARAM_CAMERA_NAME               4       // parameter number for GetParameterData
 
-    #define DNG_EXT_FROM ".DPS"
+    #define DNG_EXT_FROM                    ".DPS"
 
-    #define CAM_EXT_TV_RANGE            1
+    #define CAM_EXT_TV_RANGE                1
         
         #define REMOTE_SYNC_STATUS_LED  0xc02200C4              // specifies an LED that turns on while camera waits for USB remote to sync