Changeset 1828 for trunk/platform/sx40hs/lib.c

Timestamp:

04/25/12 01:20:34 (13 months ago)

Author:

philmoz

Message:

Update to viewport functions and code using them to handle the G1X viewport system.
This is now more flexible by allowing viewport buffer offsets to be seperate from the viewport display offsets, it can handle stitch mode properly. This is also needed for reyalp's new live view system.

File:

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

trunk/platform/sx40hs/lib.c

@@ -74 +74 @@
 void *vid_get_viewport_live_fb()
 {
+    if (MODE_IS_VIDEO(mode_get()) || (movie_status==VIDEO_RECORD_IN_PROGRESS))
+        return viewport_buffers[0];     // Video only seems to use the first viewport buffer.
+
     // Hopefully return the most recently used viewport buffer so that motion detect, histogram, zebra and edge overly are using current image data
     return viewport_buffers[(active_viewport_buffer-1)&3];
@@ -90 +93 @@
 int vid_get_viewport_width()
 {
-        // viewport width table for each image size
-        // 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1
-        static long vp_w[5] = { 360, 360, 360, 272 };
-        return vp_w[shooting_get_prop(PROPCASE_ASPECT_RATIO)];
+    if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode
+    {
+        return 180;
+    }
+    else
+    {
+            // viewport width table for each image size
+            // 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1
+            static long vp_w[5] = { 360, 360, 360, 272 };
+            return vp_w[shooting_get_prop(PROPCASE_ASPECT_RATIO)];
+    }
 }
 
 int vid_get_viewport_xoffset()
 {
-        // viewport width offset table for each image size
-        // 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1
-        static long vp_w[5] = { 0, 0, 0, 44 };                          // should all be even values for edge overlay
-        return vp_w[shooting_get_prop(PROPCASE_ASPECT_RATIO)];
+    if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode
+    {
+        return 0;
+    }
+    else
+    {
+            // viewport width offset table for each image size
+            // 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1
+            static long vp_w[5] = { 0, 0, 0, 44 };                              // should all be even values for edge overlay
+            return vp_w[shooting_get_prop(PROPCASE_ASPECT_RATIO)];
+    }
+}
+
+int vid_get_viewport_display_xoffset()
+{
+    if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode
+    {
+        if (shooting_get_prop(PROPCASE_STITCH_DIRECTION) == 0)      // Direction check
+            if (shooting_get_prop(PROPCASE_STITCH_SEQUENCE) == 0)   // Shot already taken?
+                return 40;
+            else
+                return 140;
+        else
+            if (shooting_get_prop(PROPCASE_STITCH_SEQUENCE) == 0)   // Shot already taken?
+                return 140;
+            else
+                return 40;
+    }
+    else
+    {
+        return vid_get_viewport_xoffset();
+    }
 }
 
 long vid_get_viewport_height()
 {
-        // viewport height table for each image size
-        // 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1
-        static long vp_h[5] = { 240, 180, 214, 240 };
-        return vp_h[shooting_get_prop(PROPCASE_ASPECT_RATIO)];
+    if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode
+    {
+        return 120;
+    }
+    else
+    {
+            // viewport height table for each image size
+            // 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1
+            static long vp_h[5] = { 240, 180, 214, 240 };
+            return vp_h[shooting_get_prop(PROPCASE_ASPECT_RATIO)];
+    }
 }
 
 int vid_get_viewport_yoffset()
 {
-        // viewport height offset table for each image size
-        // 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1
-        static long vp_h[5] = { 0, 30, 13, 0 };
-        return vp_h[shooting_get_prop(PROPCASE_ASPECT_RATIO)];
+    if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode
+    {
+        return 0;
+    }
+    else
+    {
+            // viewport height offset table for each image size
+            // 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1
+            static long vp_h[5] = { 0, 30, 13, 0 };
+            return vp_h[shooting_get_prop(PROPCASE_ASPECT_RATIO)];
+    }
+}
+
+int vid_get_viewport_display_yoffset()
+{
+    if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode
+    {
+        return 72;
+    }
+    else
+    {
+        return vid_get_viewport_yoffset();
+    }
 }
 
 // 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(); }
+int vid_get_viewport_display_xoffset_proper()   { return vid_get_viewport_display_xoffset() * 2; }
 int vid_get_viewport_width_proper()             { return vid_get_viewport_width() * 2; }
 int vid_get_viewport_height_proper()            { return vid_get_viewport_height(); }