Changeset 1007 for trunk/include/camera.h

Timestamp:

12/31/10 04:42:33 (2 years ago)

Author:

reyalP

Message:

changes to support sx30 and g12 from philmoz in ​http://chdk.setepontos.com/index.php?topic=650.105

File:

• trunk/include/camera.h (modified) (4 diffs)

trunk/include/camera.h

@@ -52 +52 @@
 
     #define ZOOM_OVERRIDE               0   // Shall zoom-override be used? default 0 becoz not implemented right now
-    #undef  DNG_SUPPORT                 
-    #undef  CAM_REAR_CURTAIN                // Camera do not have front/rear curtain flash sync in menu
+
+        #undef  DNG_SUPPORT                                             // Camera supports DNG format for saving of RAW images
+        #undef  DNG_DOUBLE_BUF                                  // Camera has two RAW buffers that can be used to optimise DNG creation
+    
+        #undef  CAM_REAR_CURTAIN                // Camera do not have front/rear curtain flash sync in menu
     #undef  CAM_BRACKETING                // Cameras that have bracketing (focus & ev) in original firmware already, most likely s- & g-series (propcase for digic III not found yet!)
     #undef  CAM_EXT_TV_RANGE             // CHDK can make exposure time longer than 64s
@@ -73 +76 @@
     //zebra adjust buffer height: show use at sx200is: needed for save memory space
     #define ZEBRA_HMARGIN0  0
+
+        // Viewport memory buffer is wider than viewport (G12)
+        #undef CAM_VIEWPORT_BUFFER_WIDTH_FIX    // Set to 1 if viewport memory buffer width is not the same as the viewport width
 
     //aspect corrections
@@ -95 +101 @@
                                                                         // also used by some cameras with normal bitmap layouts for memory saving ?
         #undef CAM_ZEBRA_NOBUF // zebra draws directly on bitmap buffer. Requires above as well
+
+        #undef CAM_DATE_FOLDER_NAMING   // set if camera uses date based folder naming and get_target_dir_name is implemented
 //----------------------------------------------------------
 // Overridden values for each camera
@@ -3075 +3083 @@
 //----------------------------------------------------------
 
+#elif defined (CAMERA_sx30)
+        #define CAM_PROPSET                                     4
+        #define CAM_DRYOS                                       1
+        #define CAM_DRYOS_2_3_R39                       1
+
+        #define CAM_RAW_ROWPIX                          4464
+        #define CAM_RAW_ROWS                            3276
+
+        #define CAM_SWIVEL_SCREEN                       1
+        #define CAM_ADJUSTABLE_ALT_BUTTON       1
+        #undef  CAM_CAN_SD_OVER_NOT_IN_MF
+        #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
+        #define CAM_HAS_VIDEO_BUTTON            1
+        #define CAM_VIDEO_QUALITY_ONLY          1
+        #define CAM_BRACKETING                          1
+        #undef  CAM_VIDEO_CONTROL
+        #define CAM_MULTIPART                           1
+        #define CAM_HAS_JOGDIAL                         1
+        #undef  CAM_USE_ZOOM_FOR_MF
+        #undef  CAM_UNCACHED_BIT                        // shut up compiler
+        #define CAM_UNCACHED_BIT                        0x40000000
+
+        #define DNG_SUPPORT                                     1
+        #define DNG_DOUBLE_BUF                          1
+        // pattern
+        #define cam_CFAPattern 0x01000201 // Green  Blue  Red  Green
+        // color
+
+        // TODO - Still needs work 
+        #define cam_CalibrationIlluminant1      1 // Daylight
+
+        #define CAM_COLORMATRIX1                               \
+          1301431, 1000000,  -469837, 1000000, -102652, 1000000, \
+          -200195, 1000000,   961551, 1000000,  238645, 1000000, \
+           -16441, 1000000,   142319, 1000000,  375979, 1000000
+
+        // cropping
+        #define CAM_JPEG_WIDTH                          4368 //4320
+        #define CAM_JPEG_HEIGHT                         3254 //3240
+        #define CAM_ACTIVE_AREA_X1                      24
+        #define CAM_ACTIVE_AREA_Y1                      10
+        #define CAM_ACTIVE_AREA_X2                      (4464-72)
+        #define CAM_ACTIVE_AREA_Y2                      (3276-12)
+        // camera name
+        #define PARAM_CAMERA_NAME                       4 // parameter number for GetParameterData
+        #undef  CAM_SENSOR_BITS_PER_PIXEL
+        #undef  CAM_WHITE_LEVEL
+        #undef  CAM_BLACK_LEVEL
+        #define CAM_SENSOR_BITS_PER_PIXEL       12
+        #define CAM_WHITE_LEVEL                         ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1)
+        #define CAM_BLACK_LEVEL                         127
+
+        #define CAM_EXT_TV_RANGE                        1
+        #define CAM_QUALITY_OVERRIDE            1
+
+        // copied from the SX200 which has the same video buffer size
+        #undef CAM_USES_ASPECT_CORRECTION
+        #undef CAM_USES_ASPECT_YCORRECTION
+        #define CAM_USES_ASPECT_CORRECTION              1  //camera uses the modified graphics primitives to map screens an viewports to buffers more sized 
+        #define CAM_USES_ASPECT_YCORRECTION             0  //only uses mappings on x coordinate
+
+        #undef ASPECT_XCORRECTION
+        #define ASPECT_XCORRECTION(x)  ( ( ((x)<<3) + (x) )  >>2 )  //correction x*screen_buffer_width/screen_width = x*720/320 = x*9/4 = (x<<3 + x)>>2
+
+        #undef ASPECT_GRID_XCORRECTION
+        #define ASPECT_GRID_XCORRECTION(x)  ( ((x)<<3)/9  )  //grids are designed on a 360x240 basis and screen is 320x240, we need x*320/360=x*8/9
+        #undef ASPECT_GRID_YCORRECTION
+    #define ASPECT_GRID_YCORRECTION(y)  ( (y) )  //y correction for grids  made on a 360x240 As the buffer is 720x240 we have no correction here.
+
+        #undef ASPECT_VIEWPORT_XCORRECTION 
+        #define ASPECT_VIEWPORT_XCORRECTION(x) ASPECT_GRID_XCORRECTION(x) //viewport is 360x240 and screen 320x240, we need x*320/360=x*8/9, equal than grids, used by edgeoverlay
+        #undef ASPECT_VIEWPORT_YCORRECTION 
+        #define ASPECT_VIEWPORT_YCORRECTION(y) ( (y) )
+
+        #undef ASPECT_GAMES_XCORRECTION
+        // 720/360=2 same aspect than grids and viewport but another approach: there is a lot of corrections to do in game's code, and we decide to paint directly on display buffer wirh another resolution
+        // used by gui.c that configures the draw environment (trhough new draw_gui function) depending on gui_mode: we have then 360x240 for games (but deformed output:circles are not circles) and 320x240 for
+        // other modes in perfect aspect ratio 4/3: slightly better visualization: file menus more readable, ...
+        #define ASPECT_GAMES_XCORRECTION(x)   ( ((x)<<1) )
+        #undef ASPECT_GAMES_YCORRECTION
+        #define ASPECT_GAMES_YCORRECTION(y)   ( (y) )  //none
+
+        //games mappings
+        #undef GAMES_SCREEN_WIDTH
+        #undef GAMES_SCREEN_HEIGHT
+        #define GAMES_SCREEN_WIDTH              360
+        #define GAMES_SCREEN_HEIGHT             240
+
+    #define CAM_ZEBRA_ASPECT_ADJUST 1
+    #define CAM_ZEBRA_NOBUF 1
+
+        #undef CAM_BITMAP_PALETTE
+        #define CAM_BITMAP_PALETTE              7
+
+   //zebra letterbox for saving memory
+   #undef ZEBRA_HMARGIN0
+   #define ZEBRA_HMARGIN0  30 //this 30 rows are not used by the display buffer is 720x240 effective, no 960x270, i.e. (270-240) reduction in widht possible but not done (more difficult to manage it and slower).
+  
+   #undef EDGE_HMARGIN
+   #define EDGE_HMARGIN 2
+   #undef CAM_CHDK_PTP
+   //#define CAM_CHDK_PTP 1
+        
+        #define CAM_DATE_FOLDER_NAMING  1
+
+//----------------------------------------------------------
+#elif defined (CAMERA_g12)
+    #define CAM_PROPSET                 4
+    #define CAM_DRYOS                   1
+    #define CAM_DRYOS_2_3_R39                   1
+
+    #define CAM_RAW_ROWPIX              3744
+    #define CAM_RAW_ROWS                2784
+
+        #define CAM_SWIVEL_SCREEN                       1
+        //#define CAM_ADJUSTABLE_ALT_BUTTON     1
+
+    #undef  CAM_EMUL_KEYPRESS_DURATION
+    #define CAM_EMUL_KEYPRESS_DURATION  10
+    #undef CAM_MENU_BORDERWIDTH
+    #define CAM_MENU_BORDERWIDTH        10
+    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
+    #define CAM_MULTIPART               1
+    #define CAM_HAS_JOGDIAL             1
+        #undef  CAM_USE_ZOOM_FOR_MF
+    #undef  CAM_CONSOLE_LOG_ENABLED         // Development: internal camera stdout -> A/stdout.txt
+    #define CAM_BRACKETING              1
+        #undef  CAM_VIDEO_CONTROL
+        #define CAM_VIDEO_QUALITY_ONLY          1
+    #define CAM_EXT_TV_RANGE            1
+        #define CAM_QUALITY_OVERRIDE 1
+    #undef OPT_CURVES
+    #undef CAM_UNCACHED_BIT
+    #define CAM_UNCACHED_BIT            0x40000000  // S90 @FF8875FC(via ExMem.FreeCacheable)
+        #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
+
+    // camera name
+    #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
+    #undef  CAM_SENSOR_BITS_PER_PIXEL
+    #define CAM_SENSOR_BITS_PER_PIXEL   12
+    #undef  CAM_WHITE_LEVEL
+    #define CAM_WHITE_LEVEL             ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1)
+    #undef  CAM_BLACK_LEVEL
+    #define CAM_BLACK_LEVEL             127
+
+    #undef CAM_BITMAP_PALETTE
+    #define CAM_BITMAP_PALETTE    7
+
+    #undef CAM_USES_ASPECT_CORRECTION
+    #define CAM_USES_ASPECT_CORRECTION  1  //camera uses the modified graphics primitives to map screens an viewports to buffers more sized
+    #undef CAM_USES_ASPECT_YCORRECTION
+    #define CAM_USES_ASPECT_YCORRECTION  0  //only uses mappings on x coordinate
+
+    #undef ASPECT_XCORRECTION
+        #define ASPECT_XCORRECTION(x)  ( ( ((x)<<3) + (x) )  >>2 )
+
+    #undef ASPECT_GRID_XCORRECTION
+    #define ASPECT_GRID_XCORRECTION(x)  ( ((x)<<3)/9  )  //grids are designed on a 360x240 basis and screen is 320x240, we need x*320/360=x*8/9
+    #undef ASPECT_GRID_YCORRECTION
+    #define ASPECT_GRID_YCORRECTION(y)  ( (y) )       //y correction for grids  made on a 360x240 As the buffer is 720x240 we have no correction here.
+
+    #undef ASPECT_VIEWPORT_XCORRECTION
+    #define ASPECT_VIEWPORT_XCORRECTION(x) ASPECT_GRID_XCORRECTION(x) //viewport is 360x240 and screen 320x240, we need x*320/360=x*8/9, equal than grids, used by edgeoverlay
+    #undef ASPECT_VIEWPORT_YCORRECTION
+    #define ASPECT_VIEWPORT_YCORRECTION(y) (y)
+
+    #undef EDGE_HMARGIN
+    #define EDGE_HMARGIN 2
+
+    #define DNG_SUPPORT         1
+        #define DNG_DOUBLE_BUF  1
+    // pattern
+    #define cam_CFAPattern 0x02010100 // Red  Green  Green  Blue
+    // color
+    //need fixing *****************************************************
+    #define CAM_COLORMATRIX1                               \
+      14134, 1000000, -5576, 1000000, -1527, 1000000, \
+     -1991,  1000000, 10719,  1000000, 1273,   1000000, \
+      -1158,   1000000, 1929,   1000000, 3581,  1000000
+    #define cam_CalibrationIlluminant1 17 // Standard Light A
+
+    // cropping
+    #define CAM_JPEG_WIDTH  3684
+    #define CAM_JPEG_HEIGHT 2760
+    #define CAM_ACTIVE_AREA_X1 52
+    #define CAM_ACTIVE_AREA_Y1 12
+    #define CAM_ACTIVE_AREA_X2 (CAM_RAW_ROWPIX-8)
+    #define CAM_ACTIVE_AREA_Y2 (CAM_RAW_ROWS-12)
+
+        #undef ASPECT_GAMES_XCORRECTION
+        #define ASPECT_GAMES_XCORRECTION(x)   ( ((x)<<1) )
+        #undef ASPECT_GAMES_YCORRECTION
+        #define ASPECT_GAMES_YCORRECTION(y)   ( (y) )  //none
+
+    //games mappings
+        #undef GAMES_SCREEN_WIDTH
+        #define GAMES_SCREEN_WIDTH 360
+        #undef GAMES_SCREEN_HEIGHT
+        #define GAMES_SCREEN_HEIGHT 240
+
+        #define CAM_ZEBRA_ASPECT_ADJUST 1
+
+        #define CAM_VIEWPORT_BUFFER_WIDTH_FIX   1
+        
+        #define CAM_DATE_FOLDER_NAMING  1
+//----------------------------------------------------------
+
 
 #else