Changeset 934

Timestamp:

09/05/10 02:14:58 (3 years ago)

Author:

reyalp

Message:

osd/aspect correction for SD990. Note: old grids made for SD990 will no longer work, but standard ones will.

Location:

trunk

Files:

• include/camera.h (modified) (2 diffs)
• platform/ixus980_sd990/notes.txt (modified) (1 diff)
• platform/ixus980_sd990/sub/100e/lib.c (modified) (1 diff)
• platform/ixus980_sd990/sub/101b/lib.c (modified) (1 diff)

trunk/include/camera.h

@@ -1884 +1884 @@
     #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData sd990: OK
 
+    // copied from DavidBs D10 stuff
+    #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)<<1) )
+
+    // Note color palette affects grids!
+    #undef ASPECT_GRID_XCORRECTION
+    #define ASPECT_GRID_XCORRECTION(x)   ( (x) )
+
+    #undef ASPECT_GRID_YCORRECTION
+    #define ASPECT_GRID_YCORRECTION(y)  ( (y) )
+
+    #undef ASPECT_VIEWPORT_XCORRECTION 
+    #define ASPECT_VIEWPORT_XCORRECTION(x) ASPECT_GRID_XCORRECTION(x)
+    #undef ASPECT_VIEWPORT_YCORRECTION 
+    #define ASPECT_VIEWPORT_YCORRECTION(y) ( (y) )
+
+    // Note color palette affects games!
+        //games mappings
+        #undef GAMES_SCREEN_WIDTH
+        #undef GAMES_SCREEN_HEIGHT
+        #define GAMES_SCREEN_WIDTH              360
+        #define GAMES_SCREEN_HEIGHT             240
+        #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 (through 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
+
 //    #define DNG_EXT_FROM ".CR2"
 //----------------------------------------------------------
@@ -2577 +2612 @@
    #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
+   // used by gui.c that configures the draw environment (through 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) )  

trunk/platform/ixus980_sd990/notes.txt

@@ -32 +32 @@
 - Pressing the shutter quickly with overrides enabled may result in incorrect white
   balance. It may also cause issues if the flash is automatically triggered.
-- Due to the higher resolution of the bit, many parts of the CHDK display appear small.

trunk/platform/ixus980_sd990/sub/100e/lib.c

@@ -67 +67 @@
 long vid_get_bitmap_screen_width()
 {
-    return 720;
+//    return 720;
+    return 360; // real is 720, lie for aspect correction
 }
 

trunk/platform/ixus980_sd990/sub/101b/lib.c

@@ -53 +53 @@
 long vid_get_bitmap_screen_width()
 {
-    return 720;
+//    return 720;
+    return 360; // real is 720, lie for aspect correction
 }