Changeset 1316 for trunk/platform/g12/lib.c

Timestamp:

09/05/11 09:34:01 (21 months ago)

Author:

philmoz

Message:

PTP 'Live View' extensions.
Based on mweerden's original work - ​https://github.com/mweerden/CHDKPTPRemote/tree/remote-preview
Tested on G12, SX30, SX130IS and IXUS310.
Sample .Net client code - ​http://chdk.setepontos.com/index.php?topic=4338.msg72684#msg72684
Pre-compiled sample client - ​http://chdk.setepontos.com/index.php?topic=4338.msg72684#msg72684
Sample client is in the early stages and still needs work.

File:

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

trunk/platform/g12/lib.c

@@ -70 +70 @@
 long vid_get_bitmap_buffer_height() { return 270; }
 
-int vid_get_viewport_buffer_width() { return 720; }     // G12 - buffer is twice as wide as viewport
+int vid_get_viewport_buffer_width() { return 720; }     // G12 - viewport is actually 480 high, CHDK not set up for this so we skip every 2nd row
 
 int vid_get_viewport_width()
@@ -115 +115 @@
         return (vid_get_viewport_buffer_width() - vid_get_viewport_width()) * 3;
 }
+
+// Functions for PTP Live View system
+
+int vid_get_viewport_xoffset_proper()           { return vid_get_viewport_xoffset() * 2; }
+int vid_get_viewport_yoffset_proper()           { return vid_get_viewport_yoffset() * 2; }
+int vid_get_viewport_width_proper()             { return vid_get_viewport_width() * 2; }
+int vid_get_viewport_height_proper()            { return vid_get_viewport_height() * 2; }
+int vid_get_viewport_max_height()               { return 480; }
+int vid_get_palette_type()                      { return 3; }
+int vid_get_palette_size()                      { return 256 * 4; }
+
+void *vid_get_bitmap_active_buffer()
+{
+    extern int active_bitmap_buffer;
+    extern char* bitmap_buffer[];
+    return bitmap_buffer[active_bitmap_buffer];
+}
+
+void *vid_get_bitmap_active_palette()
+{
+    extern int active_palette_buffer;
+    extern char* palette_buffer[];
+    return (palette_buffer[active_palette_buffer]+8);
+}