Changeset 1364 for trunk/platform/ixus200_sd980/platform_camera.h

Timestamp:

10/14/11 23:07:26 (20 months ago)

Author:

philmoz

Message:

Cleanup redundant entries from platform_camera.h files.

File:

• trunk/platform/ixus200_sd980/platform_camera.h (modified) (2 diffs)

trunk/platform/ixus200_sd980/platform_camera.h

@@ -67 +67 @@
     #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
@@ -77 +73 @@
     #define  CAM_SHOW_OSD_IN_SHOOT_MENU  1
 
-    //nandoide sept-2009
     #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))   //correction x*screen_buffer_width/screen_width = x*960/480 = x*2/1
-
-    #undef ASPECT_GRID_XCORRECTION
-    #define ASPECT_GRID_XCORRECTION(x)  (x)        //grids are designed on a 360x240 basis and screen is 360x240
-    #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 20
 
-    //games mappings
-        // renamed GAMES_SCREEN_WIDTH / GAMES_SCREEN_HEIGHT
-   #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 (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
-
-   //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).
+    //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).
         
         #define CAM_ZEBRA_ASPECT_ADJUST 1