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

Timestamp:

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

Author:

philmoz

Message:

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

Location:

trunk

Files:

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

trunk/platform/a640/platform_camera.h

@@ -1 @@
-// Camera - A640 - platform_camera.h
+// Camera - a640 - platform_camera.h
 
-// This file contains the various settings values specific to the A640 camera.
+// This file contains the various settings values specific to the a640 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                 1
+    #define CAM_PROPSET                     1
 
-    #define CAM_RAW_ROWPIX              3736   // for 10 MP
-    #define CAM_RAW_ROWS                2772   // for 10 MP
-    
-    #define CAM_SWIVEL_SCREEN           1
-    #define CAM_MULTIPART               1
+    #define CAM_RAW_ROWPIX                  3736    // for 10 MP
+    #define CAM_RAW_ROWS                    2772    // for 10 MP
+
+    #define CAM_SWIVEL_SCREEN               1
+    #define CAM_MULTIPART                   1
     #undef  CAM_CAN_SD_OVER_NOT_IN_MF
     #undef  CAM_HAS_IS
-    #define CAM_CAN_MUTE_MICROPHONE     1
+    #define CAM_CAN_MUTE_MICROPHONE         1
     #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
-    #define CAM_EV_IN_VIDEO             1
+    #define CAM_EV_IN_VIDEO                 1
 
     #define CAM_DNG_LENS_INFO               { 73,10, 292,10, 28,10, 41,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                               \
-      13124,  10000, -5329, 10000, -1390, 10000,           \
-      -3602,  10000, 11658, 10000,  1944, 10000,           \
-      -1612,  10000,  2863, 10000,  4885, 10000
-    
-    #define cam_CalibrationIlluminant1 17 // Standard light A
+    #define CAM_COLORMATRIX1                         \
+      13124, 10000,   -5329, 10000,   -1390, 10000,  \
+      -3602, 10000,   11658, 10000,    1944, 10000,  \
+      -1612, 10000,    2863, 10000,    4885, 10000
+
+    #define cam_CalibrationIlluminant1      17      // Standard light A
     // cropping
-    #define CAM_JPEG_WIDTH  3648
-    #define CAM_JPEG_HEIGHT 2736
-    #define CAM_ACTIVE_AREA_X1 14
-    #define CAM_ACTIVE_AREA_Y1 8
-    #define CAM_ACTIVE_AREA_X2 3682
-    #define CAM_ACTIVE_AREA_Y2 2764
+    #define CAM_JPEG_WIDTH                  3648
+    #define CAM_JPEG_HEIGHT                 2736
+    #define CAM_ACTIVE_AREA_X1              14
+    #define CAM_ACTIVE_AREA_Y1              8
+    #define CAM_ACTIVE_AREA_X2              3682
+    #define CAM_ACTIVE_AREA_Y2              2764
     // camera name
-    #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
-    #define DNG_EXT_FROM ".DPS"
+    #define PARAM_CAMERA_NAME               4       // parameter number for GetParameterData
+    #define DNG_EXT_FROM                    ".DPS"
         
 //      #define REMOTE_SYNC_STATUS_LED  0xC0xxyyyy              // specifies an LED that turns on while camera waits for USB remote to sync