Changeset 1871

Timestamp:

05/28/12 21:42:36 (13 months ago)

Author:

reyalp

Message:

express live view data in terms of margins rather than "logical" screen - note structures changed, requires corresponding update to client

Location:

branches/reyalp-ptp-live/core

Files:

• live_view.c (modified) (1 diff)
• live_view.h (modified) (1 diff)

branches/reyalp-ptp-live/core/live_view.c

@@ -13 +13 @@
     lv.version_minor = LIVE_VIEW_VERSION_MINOR;
 
-    lv.lcd_aspect_ratio    = vid_get_aspect_ratio();
-
-    lv.vp.logical_width = vid_get_viewport_fullscreen_width();
-    lv.vp.logical_height = vid_get_viewport_fullscreen_height();
+    lv.lcd_aspect_ratio = vid_get_aspect_ratio();
 
     lv.vp.buffer_width = vid_get_viewport_buffer_width_proper();
-
-    // TODO
-    lv.vp.buffer_logical_xoffset = vid_get_viewport_display_xoffset_proper();
-    lv.vp.buffer_logical_yoffset = vid_get_viewport_display_yoffset_proper();
 
     lv.vp.visible_width = vid_get_viewport_width_proper();
     lv.vp.visible_height = vid_get_viewport_height_proper();
 
-    lv.bm.logical_width = ASPECT_XCORRECTION(camera_screen.width);
-    lv.bm.logical_height = camera_screen.height;
+    lv.vp.margin_left = vid_get_viewport_display_xoffset_proper();
+    lv.vp.margin_top = vid_get_viewport_display_yoffset_proper();
+
+    // TODO returning margins from lib.c might be better
+    // can end up with negative if size and offset sources don't update at exactly the same time
+    lv.vp.margin_right = vid_get_viewport_fullscreen_width() - lv.vp.visible_width - lv.vp.margin_left;
+    lv.vp.margin_bot = vid_get_viewport_fullscreen_height() - lv.vp.visible_height - lv.vp.margin_top;
 
     lv.bm.buffer_width = camera_screen.buffer_width;
 
-    lv.bm.buffer_logical_xoffset = 0;
-    lv.bm.buffer_logical_yoffset = 0;
+    lv.bm.margin_left = 0;
+    lv.bm.margin_top = 0;
+    lv.bm.margin_right = 0;
+    lv.bm.margin_bot = 0;
 
-    lv.bm.visible_width = lv.bm.logical_width;
-    lv.bm.visible_height = lv.bm.logical_height;
+    lv.bm.visible_width = ASPECT_XCORRECTION(camera_screen.width);
+    lv.bm.visible_height = camera_screen.height;
 
     lv.palette_type = vid_get_palette_type();

branches/reyalp-ptp-live/core/live_view.h

@@ -17 +17 @@
 
 typedef struct {
+    int data_start; // offset of data from start of live view header
     /*
-    logical screen
-    descibes how big the buffer would be in pixels, if it exactly filled the physical screen
-    may be larger or smaller than the buffer data, due to letter boxing or unused data
-    using lcd_aspect_ratio, you can create a correct representation of the screen
-    */
-    int logical_width;  
-    int logical_height;
-    /*
-    buffer - describes the actual data sent
-    data size is always buffer_width*buffer_height*(buffer bpp implied by type)
-    offsets represent the position of the data on the logical screen,
-       > 0 for sub images (16:9 on a 4:3 screen, stitch window, etc)
+    buffer width in pixels
+    data size is always buffer_width*visible_height*(buffer bpp implied by type)
     */
     int buffer_width;
-
-    int buffer_logical_xoffset;
-    int buffer_logical_yoffset;
-
     /*
-    visible - describes data within the buffer which contains image data to be displayed
-    offsets are relative to buffer
-    width must be <= logical_width - buffer_logical_xoffset and width + xoffset must be <= buffer_width 
+    visible size in pixels
+    describes data within the buffer which contains image data to be displayed
+    any offsets within buffer data are added before sending, so the top left
+    pixel is always the first first byte of data.
+    width must always be <= buffer_width
+    if buffer_width is > width, the additional data should be skipped
+    visible_height also defines the number of data rows
     */
     int visible_width;
     int visible_height;
 
-    int data_start;    // offset of data
+    /*
+    margins
+    pixels offsets needed to replicate display position on cameras screen
+    not used for any buffer offsets
+    */
+    int margin_left;
+    int margin_top;
+
+    int margin_right;
+    int margin_bot;
 } lv_framebuffer_desc;