Changeset 752 for trunk/core/gui_osd.c

Timestamp:

04/24/09 20:43:35 (4 years ago)

Author:

reyalp

Message:

zebra for variable aspect cams (currently SX1). From pev69 in ​http://chdk.setepontos.com/index.php/topic,3410.msg32518.html#msg32518

File:

• trunk/core/gui_osd.c (modified) (4 diffs)

trunk/core/gui_osd.c

@@ -225 +225 @@
 // returns 1 if zebra should be drawn
 static int gui_osd_zebra_init(int show) {
+        unsigned i;
+
     if(show) { 
         if (!buf) {
@@ -247 +249 @@
                                 gui_osd_zebra_free();
                         }
+#if CAM_HAS_VARIABLE_ASPECT
+                        else // in variable aspect, the borders would never be cleared
+                                memset(buf,0,screen_buffer_size);
+#endif
         }
     }
@@ -355 +361 @@
     };
         
+    unsigned bWide = 1; // if wide (16:9) or standard (4:3) aspect ratio (but 1 in cameras that only have 4:3)
+    unsigned aspOffset = 0; // offset to add to x-coord (or buffer address) when drawing zebra
+
+#if CAM_HAS_VARIABLE_ASPECT
+    if (shooting_get_prop(PROPCASE_ASPECT_RATIO) == 0) // standard requires x-shift to overlay drawing
+    {
+        bWide = 0;
+        //aspOffset = (screen_width - (screen_width * 12 / 16)) / 2; // = actual calculation, simplified below
+        aspOffset = screen_width / 8; // half of the difference in width between equal height 16:9 and 4:3 screens, = black bar width
+    }
+#endif
+        
     if (!gui_osd_zebra_init(show))
         return 0;
@@ -425 +443 @@
         over = 255-conf.zebra_over;
             if (conf.zebra_multichannel) {step_x=2; step_v=6;} else {step_x=1; step_v=3;}
-            for (s=0, y=1, v=0; y<=viewport_height; ++y) {
+            s = aspOffset;
+            for (y=1, v=0; y<=viewport_height; ++y) {
                 for (x=0; x<screen_width; x+=step_x, s+=step_x, v+=step_v) {
                     register int yy, uu, vv;
                     int sel;
+                                                                                
+                    if (!bWide && (x + aspOffset >= screen_width - aspOffset)) continue; // do not draw "outside screen" 
+                                                                                
                     yy = img_buf[v+1];
                     if (conf.zebra_multichannel) {