Changeset 1499 for trunk/platform/ixus310_elph500hs/lib.c

Timestamp:

12/22/11 21:20:18 (17 months ago)

Author:

philmoz

Message:

Rework of viewport handling to cater for cameras with 480 pixel high viewports (default is 240). Previous solution pretended that the viewport was double width. This patch replaces it with a vertical scale factor instead. Added some comments on the viewport functions in platform.h.

File:

• trunk/platform/ixus310_elph500hs/lib.c (modified) (2 diffs)

trunk/platform/ixus310_elph500hs/lib.c

@@ -85 +85 @@
 long vid_get_bitmap_buffer_height() { return 270; }
 
-int vid_get_viewport_buffer_width() { return 960; }     // IXUS 310 - wide screen LCD (viewport is actually 480 high, CHDK not set up for this so we skip every 2nd row)
+// Physical width of viewport row in bytes
+int vid_get_viewport_byte_width() {
+        return 960 * 6 / 4;     // IXUS 310 - wide screen LCD is 960 pixels wide, each group of 4 pixels uses 6 bytes (UYVYYY)
+}
+
+// Y multiplier for cameras with 480 pixel high viewports (CHDK code assumes 240)
+int vid_get_viewport_yscale() {
+        return 2;               // IXUS 310 viewport is 480 pixels high
+}
 
 int vid_get_viewport_width()
@@ -104 +112 @@
 
 long vid_get_viewport_height(){ return 240; }
-
-// viewport image offset - used when image size != viewport size (zebra, histogram, motion detect & edge overlay)
-// returns the byte offset into the viewport buffer where the image pixels start (to skip any black borders)
-int vid_get_viewport_image_offset() {
-        return vid_get_viewport_xoffset() * 3;
-}
-
-// viewport image offset - used when image size != viewport size (zebra, histogram, motion detect & edge overlay)
-// returns the byte offset to skip at the end of a viewport buffer row to get to the next row.
-int vid_get_viewport_row_offset() {
-        return (vid_get_viewport_buffer_width() - vid_get_viewport_width()) * 3;
-}
 
 // Functions for PTP Live View system