Changeset 931 for trunk

Timestamp:

09/02/10 21:21:27 (3 years ago)

Author:

fe50

Message:

* Rear curtain option enabled for A710, tested by kms,  http://chdk.setepontos.com/index.php/topic,650.msg54434.html#msg54434

* Optimazions & fixes by ultimA, from  http://chdk.setepontos.com/index.php/topic,650.msg54493.html#msg54493 :

• Optimizations to edge overlay
• Make edge overlay more "multitask-friendly"
• Detect a full shutter press during edge calculations too
• Wrap pano-modes in edge menu & change icons (by msl)
• Backport fixes from #928 SX20 1.02d to 1.02b
• Add experimental PTP support to SX20 1.02d (based on mweerden's PTP proposal 20/07/2010)
• Center edge overlay horizontally
• Make the overlay's horizontal area larger (+6 pixels)

* The SX20 1.02b is now enabled (in the main makefile) for the autobuild server

Location:

trunk

Files:

• Makefile (modified) (5 diffs)
• core/bitvector.c (modified) (5 diffs)
• core/bitvector.h (modified) (2 diffs)
• core/edgeoverlay.c (modified) (28 diffs)
• core/gui.c (modified) (2 diffs)
• include/camera.h (modified) (1 diff)
• platform/sx20/sub/102b/boot.c (modified) (3 diffs)
• platform/sx20/sub/102b/capt_seq.c (modified) (3 diffs)
• platform/sx20/sub/102b/stubs_auto.S (modified) (1 diff)
• platform/sx20/sub/102d/boot.c (modified) (1 diff)
• platform/sx20/sub/102d/stubs_entry_2.S (modified) (1 diff)

trunk/Makefile

@@ -235 +235 @@
         $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101a NO_INC_BUILD=1 firzipsub
         $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101c NO_INC_BUILD=1 firzipsub
-        #$(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102b NO_INC_BUILD=1 firzipsub
+        $(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102b NO_INC_BUILD=1 firzipsub
         $(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102d NO_INC_BUILD=1 firzipsub
         $(MAKE) -s --no-print-directory PLATFORM=ixus85_sd770 PLATFORMSUB=100a NO_INC_BUILD=1 firzipsub
@@ -275 +275 @@
         mv $(topdir)bin/$(VER)-s90-101c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-s90-101c-$(BUILD_NUMBER)_BETA.zip
         mv $(topdir)bin/$(VER)-ixus100_sd780-100c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus100_sd780-100c-$(BUILD_NUMBER)_BETA.zip
-        #mv $(topdir)bin/$(VER)-sx20-102b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx20-102b-$(BUILD_NUMBER)_BETA.zip
-        mv $(topdir)bin/$(VER)-sx20-102d-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx20-102d-$(BUILD_NUMBER)_BETA.zip
+        mv $(topdir)bin/$(VER)-sx20-102b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx20-102b-$(BUILD_NUMBER).zip
+        mv $(topdir)bin/$(VER)-sx20-102d-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx20-102d-$(BUILD_NUMBER).zip
         mv $(topdir)bin/$(VER)-ixus85_sd770-100a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus85_sd770-100a-$(BUILD_NUMBER)_BETA.zip
         #mv $(topdir)bin/$(VER)-ixus95_sd1200-100c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus95_sd1200-100c-$(BUILD_NUMBER)_BETA.zip
@@ -385 +385 @@
         $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101a NO_INC_BUILD=1 firzipsubcomplete
         $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101c NO_INC_BUILD=1 firzipsubcomplete
-        #$(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102b NO_INC_BUILD=1 firzipsubcomplete
+        $(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102b NO_INC_BUILD=1 firzipsubcomplete
         $(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102d NO_INC_BUILD=1 firzipsubcomplete
         $(MAKE) -s --no-print-directory PLATFORM=ixus85_sd770 PLATFORMSUB=100a NO_INC_BUILD=1 firzipsubcomplete
@@ -458 +458 @@
         mv $(topdir)bin/s90-101c-$(BUILD_NUMBER)-full.zip $(topdir)bin/s90-101c-$(BUILD_NUMBER)-full_BETA.zip
         mv $(topdir)bin/s90-101c-$(BUILD_NUMBER).zip $(topdir)bin/s90-101c-$(BUILD_NUMBER)_BETA.zip
-        #mv $(topdir)bin/sx20-102b-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx20-102b-$(BUILD_NUMBER)-full_BETA.zip
-        #mv $(topdir)bin/sx20-102b-$(BUILD_NUMBER).zip $(topdir)bin/sx20-102b-$(BUILD_NUMBER)_BETA.zip
-        mv $(topdir)bin/sx20-102d-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx20-102d-$(BUILD_NUMBER)-full_BETA.zip
-        mv $(topdir)bin/sx20-102d-$(BUILD_NUMBER).zip $(topdir)bin/sx20-102d-$(BUILD_NUMBER)_BETA.zip
+        mv $(topdir)bin/sx20-102b-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx20-102b-$(BUILD_NUMBER)-full.zip
+        mv $(topdir)bin/sx20-102b-$(BUILD_NUMBER).zip $(topdir)bin/sx20-102b-$(BUILD_NUMBER).zip
+        mv $(topdir)bin/sx20-102d-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx20-102d-$(BUILD_NUMBER)-full.zip
+        mv $(topdir)bin/sx20-102d-$(BUILD_NUMBER).zip $(topdir)bin/sx20-102d-$(BUILD_NUMBER).zip
         mv $(topdir)bin/ixus85_sd770-100a-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus85_sd770-100a-$(BUILD_NUMBER)-full_BETA.zip
         mv $(topdir)bin/ixus85_sd770-100a-$(BUILD_NUMBER).zip $(topdir)bin/ixus85_sd770-100a-$(BUILD_NUMBER)_BETA.zip
@@ -569 +569 @@
         $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101a NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101c NO_INC_BUILD=1 clean
-        #$(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102b NO_INC_BUILD=1 clean
+        $(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102b NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102d NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=ixus85_sd770 PLATFORMSUB=100a NO_INC_BUILD=1 clean

trunk/core/bitvector.c

@@ -23 +23 @@
 
 // Utility function. Use bv_set instead.
-static inline void bv_setbit(bit_vector_t* bm, int pos, int val)
+static inline void bv_setbit(const bit_vector_t* bm, int pos, int val)
 {
     int bp = pos - ((pos >> 3) << 3);
@@ -30 +30 @@
     else
         bm->ptr[pos >> 3] |=  (1 << bp);
-
-// Following ASM code is bad. It crashes the camera, but why?
-// It'd be very nice to replace this function with an inline
-// assembly macro in the future (the same for bv_getbit()).
-// The compiler seems to generate suboptimal ASM for me,
-// but this is performance critical code.
-//
-//    char t = bm->ptr[pos >> 3];
-//    asm volatile (
-//                 ".syntax unified\n"
-//                 "MOV     %[pos], %[pos], lsr #3\n"           // r1 = pos >> 3
-//                 "SUB     %[pos], %[pos], %[pos], lsl #3\n"        // pos -= pos<<3
-//                 "MOV     r2, #1\n"                    // r2 = 1
-//                 "MOV     r2, r2, lsl %[pos]\n"         // r2 <<= pos
-//                 "CMP     %[val], #0\n"                    // val == 0
-//                 "ITE     EQ\n"                             // if
-//                 "BICEQ     %[t], %[t], r2\n"        // &= ~(1 << bp)
-//                 "ORRNE     %[t], %[t], r2\n"      // |=  (1 << bp)
-//                 ".syntax divided"
-//                 : [t]"+r"(t)
-//                 : [val]"r"(val), [pos]"r"(pos)
-//                 : "r2", "cc"
-//                 );
-//    bm->ptr[pos >> 3] = t;
-
 }
 
 // Utility function. Use bv_get instead.
-static inline int bv_getbit(bit_vector_t* bm, int pos)
+static inline int bv_getbit(const bit_vector_t* bm, int pos)
 {
     // Note: bv_get() and other code rely on this
@@ -66 +41 @@
 
     int bp = pos - ((pos >> 3) << 3);
-    return ((bm->ptr[pos >> 3] & (1 << bp)) > 0) ? 1 : 0;
+    return (bm->ptr[pos >> 3] & (1 << bp)) >> bp;
 }
 
-void bv_set(bit_vector_t* bm, int pos, int val)
+void bv_set(const bit_vector_t* bm, int pos, int val)
 {
-    int i;
+    int i = bm->nBits - 1;
     int bitpos = pos * bm->nBits;
-    for (i = 0; i < bm->nBits; ++i)
+    do
     {
         bv_setbit(bm, bitpos + i, val & (1<<i));
-    }
+    }while(--i >= 0);
 }
 
 // Same as bv_set, but sets val to two consecutive elements
 // instead of just one.
-void bv_set2(bit_vector_t* bm, int pos, int val)
+void bv_set2(const bit_vector_t* bm, int pos, int val)
 {
     int i;
@@ -95 +70 @@
 // Same as bv_set, but sets val to four consecutive elements
 // instead of just one.
-void bv_set4(bit_vector_t* bm, int pos, int val)
+void bv_set4(const bit_vector_t* bm, int pos, int val)
 {
     int i;
@@ -109 +84 @@
 }
 
-int bv_get(bit_vector_t* bm, int pos)
+int bv_get(const bit_vector_t* bm, int pos)
 {
-    int i;
     int ret = 0;
+    int i = bm->nBits - 1;
     int bitpos = pos * bm->nBits;
-    for (i = 0; i < bm->nBits; ++i)
+    do
     {
         ret |= (bv_getbit(bm, bitpos + i) << i);
-    }
+    }while(--i >= 0);
 
     return ret;

trunk/core/bitvector.h

@@ -5 +5 @@
 {
     int nBits;
-    char* ptr;
+    unsigned char* ptr;
     int ptrLen;
     int nElem;
@@ -11 +11 @@
 
 bit_vector_t* bv_create(int len, int nbits);
-void bv_set(bit_vector_t* bm, int pos, int val);
-void bv_set2(bit_vector_t* bm, int pos, int val);
-void bv_set4(bit_vector_t* bm, int pos, int val);
-int bv_get(bit_vector_t* bm, int pos);
+void bv_set(const bit_vector_t* bm, int pos, int val);
+void bv_set2(const bit_vector_t* bm, int pos, int val);
+void bv_set4(const bit_vector_t* bm, int pos, int val);
+int bv_get(const bit_vector_t* bm, int pos) __attribute__((pure));
 void bv_free(bit_vector_t* bm);
 

trunk/core/edgeoverlay.c

@@ -6 +6 @@
 #include "gui_draw.h"
 #include "bitvector.h"
- 
+
 // the way we save edge overlays on their own...
 #define EDGE_FILE_PREFIX "EDG_"
 #define EDGE_FILE_FORMAT EDGE_FILE_PREFIX "%04d.edg"
- 
+#define EDGE_SLICES     2
+
 typedef enum _edge_fsm_state
 {
@@ -16 +17 @@
     EDGE_FROZEN
 } edge_fsm_state_t;
- 
+
 static edge_fsm_state_t fsm_state = EDGE_LIVE;
 static bit_vector_t* edgebuf = NULL;
 static int xoffset = 0, yoffset = 0;
- 
+static unsigned char* smbuf = NULL;
+
+static int slice = 0;       // the current slice of the frame we are calculating/drawing
+static int slice_height;    // the height of a single slice
+
 static int viewport_size;   // whole viewport size in bytes ??
 static int viewport_width;      // screenwidth * 3, width in bytes of one viewport line ??
@@ -27 +32 @@
 static int viewportw; //nandoide , width of viewport (not necessarily equal to width of screen)
 #endif
-  
+
 static void get_viewport_size()
 {
     // since screen_height is used in the drawing downwards, we should use it
     // here too to calculate the buffer we need...
- 
+
 #if CAM_USES_ASPECT_CORRECTION//nandoide sept-2009 get the viewport dimensions, not the screen dimensions, on sx200is they aren't the same.
     viewport_height = vid_get_viewport_height()-EDGE_HMARGIN*2; //don't trace bottom lines
     viewportw = vid_get_viewport_width();
     viewport_width = viewportw * 3;
-    viewport_size = viewport_height * viewport_width;
 #else
     viewport_height = screen_height;//vid_get_viewport_height();
     viewport_width = screen_width * 3;
-    viewport_size = viewport_height * screen_width * 3;
 #endif
-}
- 
+
+    viewport_size = viewport_height * viewport_width;
+    slice_height = viewport_height / EDGE_SLICES;
+
+}
+
 static void ensure_allocate_imagebuffer()
 {
@@ -50 +57 @@
     {
         edgebuf = bv_create(viewport_size, 1);
-    }
-}
- 
+        if (edgebuf != NULL)
+            memset(edgebuf->ptr, 0, edgebuf->ptrLen);
+    }
+    if (conf.edge_overlay_filter && (smbuf == NULL))
+    {
+        smbuf = (unsigned char*)malloc(viewport_width*3);
+        if (smbuf != NULL)
+            memset(smbuf, 0, viewport_width*3);
+        else
+        {
+            // Disable filtering if we do not have enough memory for it
+            conf.edge_overlay_filter = 0;
+        }
+    }
+}
+
 static void reset_edge_overlay()
 {
+    if (smbuf != NULL)
+    {
+        free(smbuf);
+        smbuf = NULL;
+    }
+
     bv_free(edgebuf);
     edgebuf = NULL;
     fsm_state = EDGE_LIVE;
-}
- 
+    slice = 0;
+}
+
 static int is_buffer_ready()
 {
@@ -66 +93 @@
     return 1;
 }
- 
+
 // scans a filename for the number of the edge detection file it contains
 static int get_edge_file_num(const char* fn)
@@ -89 +116 @@
     return num;
 }
-  
+
 // saves the actual active overlay data to a file.
 void save_edge_overlay(void)
 {
- 
+
     char fn[64];
     char msg[64];
@@ -104 +131 @@
     static struct utimbuf t;
     // nothing to save? then dont save
- 
+
     if( !is_buffer_ready() )
     {
@@ -110 +137 @@
         return;
     }
- 
+
     zoom = shooting_get_zoom();
- 
+
     // first figure out the most appropriate filename to use
     d = opendir(EDGE_SAVE_DIR);
@@ -119 +146 @@
         return;
     }
- 
+
     while( (de = readdir(d)) )
     {
@@ -146 +173 @@
     closedir(d);
 }
- 
+
 // load the edge overlay from a file
 void load_edge_overlay(const char* fn)
 {
     FILE *fd;
-    int ret,ret2;
     int zoom;
- 
+
     get_viewport_size();
     ensure_allocate_imagebuffer( );
@@ -159 +185 @@
     if( fd != NULL )
     {
-        ret = fread(edgebuf->ptr,edgebuf->ptrLen,1,fd);
-        ret2 = fread (&zoom,sizeof(zoom),1,fd);
+        int ret = fread(edgebuf->ptr,edgebuf->ptrLen,1,fd);
+        int ret2 = fread (&zoom,sizeof(zoom),1,fd);
         fclose(fd);
         if( (ret == 1) && (ret2 == 1) )
@@ -172 +198 @@
     }
 }
- 
-static void average_filter_row(const unsigned char* ptrh1,  // previous row
-                               const unsigned char* ptrh2,  // current row
-                               const unsigned char* ptrh3,  // next row
-                               unsigned char* smptr )       // write results here
+
+static void average_filter_row(const unsigned char*  ptrh1,  // previous row
+                               const unsigned char*  ptrh2,  // current row
+                               const unsigned char*  ptrh3,  // next row
+                               unsigned char*  smptr )       // write results here
 {
     int x;
 #if CAM_USES_ASPECT_CORRECTION
-    for (x=12; x<(viewportw - 4) * 3; x+=6)
+    const int x_max = (viewportw - 2) * 3;
 #else
-    for (x=12; x<(screen_width - 4) * 3; x+=6)
+    const int x_max = (screen_width - 2) * 3;
 #endif
+
+    for (x=6; x<x_max; x+=6)
     {
         *(smptr + x + 1) = (*(ptrh1 + x - 1) +
                             *(ptrh1 + x + 1) +
                             *(ptrh1 + x + 3) +
- 
+
                             *(ptrh2 + x - 1) +
                             *(ptrh2 + x + 1) +
                             *(ptrh2 + x + 3) +
- 
+
                             *(ptrh3 + x - 1) +
                             *(ptrh3 + x + 1) +
-                            *(ptrh3 + x + 3)) / 9;
- 
+                            *(ptrh3 + x + 3)) / 9u;
+
         *(smptr + x + 3) = (*(ptrh1 + x + 1) +
                             *(ptrh1 + x + 3) +
                             *(ptrh1 + x + 4) +
- 
+
                             *(ptrh2 + x + 1) +
                             *(ptrh2 + x + 3) +
                             *(ptrh2 + x + 4) +
- 
+
                             *(ptrh3 + x + 1) +
                             *(ptrh3 + x + 3) +
-                            *(ptrh3 + x + 4)) / 9;
- 
+                            *(ptrh3 + x + 4)) / 9u;
+
         *(smptr + x + 4) = (*(ptrh1 + x + 3) +
                             *(ptrh1 + x + 4) +
                             *(ptrh1 + x + 5) +
- 
+
                             *(ptrh2 + x + 3) +
                             *(ptrh2 + x + 4) +
                             *(ptrh2 + x + 5) +
- 
+
                             *(ptrh3 + x + 3) +
                             *(ptrh3 + x + 4) +
-                            *(ptrh3 + x + 5)) / 9;
- 
+                            *(ptrh3 + x + 5)) / 9u;
+
         *(smptr + x + 5) = (*(ptrh1 + x + 4) +
                             *(ptrh1 + x + 5) +
                             *(ptrh1 + x + 7) +
- 
+
                             *(ptrh2 + x + 4) +
                             *(ptrh2 + x + 5) +
                             *(ptrh2 + x + 7) +
- 
+
                             *(ptrh3 + x + 4) +
                             *(ptrh3 + x + 5) +
-                            *(ptrh3 + x + 7)) / 9;
-    }
-}
- 
+                            *(ptrh3 + x + 7)) / 9u;
+    }
+}
+
 // Sobel edge detector
-static void calc_edge_overlay()
-{
+static int calc_edge_overlay()
+{
+    int shutter_fullpress = kbd_is_key_pressed(KEY_SHOOT_FULL);
+
     const int bPlayMode = (mode_get() & MODE_MASK) == MODE_PLAY;
     const unsigned char* img = bPlayMode ? vid_get_viewport_fb_d() :  vid_get_viewport_fb();
-    const unsigned char * ptrh1 = NULL;    // previous pixel line
-    const unsigned char * ptrh2 = NULL;    // current pixel line
-    const unsigned char * ptrh3 = NULL;    // next pixel line
-    unsigned char* smbuf = NULL;
-    unsigned char * smptr = NULL;    // pointer to line in smbuf
-    int x, y;
+    const unsigned char*  ptrh1 = NULL;    // previous pixel line
+    const unsigned char*  ptrh2 = NULL;    // current pixel line
+    const unsigned char*  ptrh3 = NULL;    // next pixel line
+    unsigned char*  smptr = NULL;    // pointer to line in smbuf
+    int x, y, xdiv3;
     int conv1, conv2;
-    
-    const int y_min = EDGE_HMARGIN;
-    const int y_max = EDGE_HMARGIN + viewport_height;
+
+    const int y_min = EDGE_HMARGIN+ slice   *slice_height;
+    const int y_max = EDGE_HMARGIN+(slice+1)*slice_height;
     const int x_min = 6;
 #if CAM_USES_ASPECT_CORRECTION
-    const int x_max = (viewportw - 4) * 3;
+    const int x_max = (viewportw - 2) * 3;
 #else
-    const int x_max = (screen_width - 4) * 3;
+    const int x_max = (screen_width - 2) * 3;
 #endif
 
-    xoffset =0;
-    yoffset =0;
- 
+    const int vp_width = viewport_width;
+
+    xoffset = 0;
+    yoffset = 0;
+
     // Reserve buffers
     ensure_allocate_imagebuffer();
-    if( !is_buffer_ready() ) return;
- 
-    // Clear all edges, if any
-    memset(edgebuf->ptr, 0, edgebuf->ptrLen);
- 
-    // In every 6 bytes four pixels are described in the
+    if( !is_buffer_ready() ) return 0;
+
+    // In every 6 bytes the Y of four pixels are described in the
     // viewport (UYVYYY format). For edge detection we only
     // consider the second in the current and the first
     // in the next pixel.
- 
- 
+
+    // Clear all edges in the current slice
+    int compressed_slice = edgebuf->ptrLen / EDGE_SLICES;
+    memset(edgebuf->ptr + slice*compressed_slice, 0, compressed_slice);
+
     if (conf.edge_overlay_filter)
     {
-        smbuf = (unsigned char*)malloc(viewport_width*3);
-        memset(smbuf, 0, viewport_width*3);
-        if (smbuf==NULL)
-            return;
- 
         // Prefill smbuf with three lines of avergae-filtered data.
         // This looks much more complex then it actually is.
@@ -287 +313 @@
         for (y = -1; y <= 1; ++y)
         {
-            ptrh1 = img + (EDGE_HMARGIN+y-1) * viewport_width;
-            ptrh2 = img + (EDGE_HMARGIN+y  ) * viewport_width;
-            ptrh3 = img + (EDGE_HMARGIN+y+1) * viewport_width;
-            smptr = smbuf + (y+1) * viewport_width;
- 
+            shutter_fullpress |= kbd_is_key_pressed(KEY_SHOOT_FULL);
+
+            ptrh1 = img + (y_min+y-1) * vp_width;
+            ptrh2 = img + (y_min+y  ) * vp_width;
+            ptrh3 = img + (y_min+y+1) * vp_width;
+            smptr = smbuf + (y+1) * vp_width;
+
             average_filter_row(ptrh1, ptrh2, ptrh3, smptr);
         }
     }
- 
+
     for (y = y_min; y < y_max; ++y)
     {
+        shutter_fullpress |= kbd_is_key_pressed(KEY_SHOOT_FULL);
+
         if (conf.edge_overlay_filter)
         {
@@ -305 +335 @@
             // By storing only three lines of smoothed picture
             // in memory, we save memory.
- 
+
             // Shift
-            memcpy(smbuf+viewport_width*0, smbuf+viewport_width*1, viewport_width);
-            memcpy(smbuf+viewport_width*1, smbuf+viewport_width*2, viewport_width);
- 
+            memcpy(smbuf+vp_width*0, smbuf+vp_width*1, vp_width);
+            memcpy(smbuf+vp_width*1, smbuf+vp_width*2, vp_width);
+
             // Filter new line
-            ptrh1 = img +  y * viewport_width;
-            ptrh2 = img + (y+1)    * viewport_width;
-            ptrh3 = img + (y+2) * viewport_width;
-            smptr = smbuf + 2 * viewport_width;
+            ptrh1 = img +  y * vp_width;
+            ptrh2 = img + (y+1) * vp_width;
+            ptrh3 = img + (y+2) * vp_width;
+            smptr = smbuf + 2   * vp_width;
             average_filter_row(ptrh1, ptrh2, ptrh3, smptr);
- 
-            ptrh1 = smbuf + 0 * viewport_width;
-            ptrh2 = smbuf + 1 * viewport_width;
-            ptrh3 = smbuf + 2 * viewport_width;
+
+            ptrh1 = smbuf + 0 * vp_width;
+            ptrh2 = smbuf + 1 * vp_width;
+            ptrh3 = smbuf + 2 * vp_width;
         }
         else
         {
-            ptrh1 = img + (y-1) * viewport_width;
-            ptrh2 = img +  y    * viewport_width;
-            ptrh3 = img + (y+1) * viewport_width;
-        }
- 
+            ptrh1 = img + (y-1) * vp_width;
+            ptrh2 = img +  y    * vp_width;
+            ptrh3 = img + (y+1) * vp_width;
+        }
+
         // Now we do sobel on the current line
- 
-        for (x = x_min; x < x_max; x += 6)
+
+        for (x = x_min, xdiv3 = x_min/3; x < x_max; x += 6, xdiv3 += 2)
         {
             // convolve vert (second Y)
             conv1 = *(ptrh1 + x + 1) * ( 1) +
                     *(ptrh1 + x + 4) * (-1) +
- 
+
                     *(ptrh2 + x + 1) * ( 2) +
                     *(ptrh2 + x + 4) * (-2) +
- 
+
                     *(ptrh3 + x + 1) * ( 1) +
                     *(ptrh3 + x + 4) * (-1);
             if  (conv1 < 0)     // abs()
                 conv1 = -conv1;
- 
+
             // convolve vert (first Y of next pixel)
             conv2 = *(ptrh1 + x + 1) * ( 1) +
                     *(ptrh1 + x + 3) * ( 2) +
                     *(ptrh1 + x + 4) * ( 1) +
- 
+
                     *(ptrh3 + x + 1) * (-1) +
                     *(ptrh3 + x + 3) * (-2) +
@@ -354 +384 @@
             if  (conv2 < 0)     // abs()
                 conv2 = -conv2;
- 
+
             if (conv1 + conv2 > conf.edge_overlay_thresh)
             {
-                bv_set(edgebuf, (y-EDGE_HMARGIN)*viewport_width + x/3, 1);
+                bv_set(edgebuf, (y-EDGE_HMARGIN)*vp_width + xdiv3, 1);
             }
- 
+
             // Do it once again for the next 'pixel'
- 
+
             // convolve vert (second Y)
             conv1 = *(ptrh1 + x + 5) * ( 1) +
                     *(ptrh1 + x + 9) * (-1) +
- 
+
                     *(ptrh2 + x + 5) * ( 2) +
                     *(ptrh2 + x + 9) * (-2) +
- 
+
                     *(ptrh3 + x + 5) * ( 1) +
                     *(ptrh3 + x + 9) * (-1);
             if  (conv1 < 0)     // abs()
                 conv1 = -conv1;
- 
+
             // convolve vert (first Y of next pixel)
             conv2 = *(ptrh1 + x + 5) * ( 1) +
                     *(ptrh1 + x + 7) * ( 2) +
                     *(ptrh1 + x + 9) * ( 1) +
- 
+
                     *(ptrh3 + x + 5) * (-1) +
                     *(ptrh3 + x + 7) * (-2) +
@@ -384 +414 @@
             if  (conv2 < 0)     // abs()
                 conv2 = -conv2;
- 
+
             if (conv1 + conv2 > conf.edge_overlay_thresh)
             {
-                bv_set(edgebuf, (y-EDGE_HMARGIN)*viewport_width + x/3+1, 1);
+                bv_set(edgebuf, (y-EDGE_HMARGIN)*vp_width + xdiv3+1, 1);
             }
         }   // for x
     }   // for y
- 
-    if (smbuf != NULL)
-    {
-        free(smbuf);
-        smbuf = NULL;
-    }
- 
-//  For an even more improved edge overlay, enabling the following lines will 
+
+
+//  For an even more improved edge overlay, enabling the following lines will
 //  post-filter the results of the edge detection, removing false edge 'dots'
 //  from the display. However, the speed hit is large. In the developer's opinion
-//  this code is not needed, but if you want that additional quality and do not 
+//  this code is not needed, but if you want that additional quality and do not
 //  care so much about performance, you can enable it.
-// 
+//
 //    if (conf.edge_overlay_filter)
 //    {
@@ -418 +443 @@
 //            for (y = 1; y < viewport_height-1; ++y)
 //            {
+//                shutter_fullpress |= kbd_is_key_pressed(KEY_SHOOT_FULL);
+//
 //#if CAM_USES_ASPECT_CORRECTION
 //                for (x=12; x<(viewportw - 4); ++x)
@@ -458 +485 @@
 //        }   // NULL-check
 //    }   // if filtering
- 
-}
- 
-static void draw_edge_overlay()
-{
+
+    return shutter_fullpress;
+}
+
+static int draw_edge_overlay()
+{
+    int shutter_fullpress = kbd_is_key_pressed(KEY_SHOOT_FULL);
+
     int x, y;
     int x_off, y_off;
- 
+
+    const color cl = conf.edge_overlay_color;
+    const int y_slice_min = EDGE_HMARGIN+ slice   *slice_height;
+    const int y_slice_max = EDGE_HMARGIN+(slice+1)*slice_height;
     const int y_min = EDGE_HMARGIN;
     const int y_max = EDGE_HMARGIN+viewport_height;
-    const int x_min = 6;
+    const int x_min = 2;
 #if CAM_USES_ASPECT_CORRECTION
-    const int x_max = (viewportw - 4);
+    const int x_max = (viewportw - 2);
 #else
-    const int x_max = (screen_width - 4);
+    const int x_max = (screen_width - 2);
 #endif
 
-    if( !is_buffer_ready() ) return;
- 
-    for (y = y_min; y < y_max; ++y)
+    if( !is_buffer_ready() ) return 0;
+
+    for (y = y_slice_min; y < y_slice_max; ++y)
     {
         y_off = y + yoffset;
- 
-        if ((y_off > y_min) && (y_off < y_max)) // do not draw outside of allowed area
-        {
+        
+        shutter_fullpress |= kbd_is_key_pressed(KEY_SHOOT_FULL);
+
+        if ((unsigned)(y_off-y_min) < (y_max-y_min)) // is the same as ((y_off > y_min) && (y_off < y_max)) // do not draw outside of allowed area
+        {
+            const int y_edgebuf = (y-y_min) * viewport_width;
+
             for (x = x_min; x < x_max; ++x)
             {
                 x_off = x + xoffset;
- 
-                if ((x_off > x_min) && (x_off < x_max)) // do not draw outside of allowed area
+
+                if ((unsigned)(x_off-x_min) < (x_max-x_min)) // is the same as  ((x_off > x_min) && (x_off < x_max)) // do not draw outside of allowed area
                 {
                     // Draw a pixel to the screen wherever we detected an edge.
                     // If there is no edge based on the newest data, but there is one painted on the screen
                     // from previous calls, delete it from the screen.
-                    if (bv_get(edgebuf, (y-y_min)*viewport_width + x))
-                        draw_pixel(ASPECT_VIEWPORT_XCORRECTION(x_off), y_off, conf.edge_overlay_color );
-                    else if (draw_get_pixel(ASPECT_VIEWPORT_XCORRECTION(x_off), y_off) == conf.edge_overlay_color)
-                        draw_pixel(ASPECT_VIEWPORT_XCORRECTION(x_off), y_off, 0 );
+                    const int aspect_correct_x_off = ASPECT_VIEWPORT_XCORRECTION(x_off);
+                    const int bEdge = bv_get(edgebuf, y_edgebuf + x);
+                    const int bDraw = bEdge || (draw_get_pixel(aspect_correct_x_off, y_off) == conf.edge_overlay_color);
+                    const color cl = bEdge ? conf.edge_overlay_color : 0;
+                    if (bEdge || bDraw)
+                        draw_pixel(aspect_correct_x_off, y_off, cl);
+                    
                 }
             }   // for x
         }
     }   // for y
- 
- 
+
+
     // Drawing the overlay is over.
     // But as a finishing touch we clear up garbage on the screen
     // by clearing those parts that the overlay has left.
- 
+
     if (xoffset != 0)
     {
         // Cleans up leftover from horizontal motion
- 
+
         const int x_min_c = (xoffset < 0) ? x_max + xoffset : x_min;
         const int x_max_c = (xoffset > 0) ? x_min + xoffset : x_max;
- 
+
         for (y = y_min; y < y_max; ++y)
         {
             for (x = x_min_c; x < x_max_c; ++x)
             {
-                if (draw_get_pixel(ASPECT_VIEWPORT_XCORRECTION(x), y) == conf.edge_overlay_color)  // if there is an edge drawn on the screen but there is no edge there based on the newest data, delete it from the screen
-                    draw_pixel(ASPECT_VIEWPORT_XCORRECTION(x), y, 0 );
+                const int aspect_correct_x = ASPECT_VIEWPORT_XCORRECTION(x);
+                if (draw_get_pixel(aspect_correct_x, y) == cl)  // if there is an edge drawn on the screen but there is no edge there based on the newest data, delete it from the screen
+                    draw_pixel(aspect_correct_x, y, 0 );
             }
         }
     }
- 
+
     if (yoffset != 0)
     {
         // Cleans up leftover from vertical motion
- 
+
         const int y_min_c = (yoffset < 0) ? y_max + yoffset : y_min;
         const int y_max_c = (yoffset > 0) ? y_min + yoffset : y_max;
- 
+
         for (y = y_min_c; y < y_max_c; ++y)
         {
             for (x = x_min; x < x_max; ++x)
             {
-                if (draw_get_pixel(ASPECT_VIEWPORT_XCORRECTION(x), y) == conf.edge_overlay_color)  // if there is an edge drawn on the screen but there is no edge there based on the newest data, delete it from the screen
-                    draw_pixel(ASPECT_VIEWPORT_XCORRECTION(x), y, 0 );
+                const int aspect_correct_x = ASPECT_VIEWPORT_XCORRECTION(x);
+                if (draw_get_pixel(aspect_correct_x, y) == cl)  // if there is an edge drawn on the screen but there is no edge there based on the newest data, delete it from the screen
+                    draw_pixel(aspect_correct_x, y, 0 );
             }
         }
     }
+
+    return shutter_fullpress;
 }
 
@@ -545 +589 @@
     const int y_max = viewport_height;
 #if CAM_USES_ASPECT_CORRECTION
-    const int x_max = (viewportw - 4);
+    const int x_max = (viewportw - 2);
 #else
-    const int x_max = (screen_width - 4);
+    const int x_max = (screen_width - 2);
 #endif
 
@@ -575 +619 @@
     }
 }
- 
- 
+
+
 // Main edge overlay function.
 // It works by detecting edges using the Sobel operator
@@ -586 +630 @@
 void edge_overlay()
 {
+
     // Was the shutter fully pressed the last time we ran?
     // We use this to make sure that the user has released
@@ -592 +637 @@
     // per press.
     static int bFullPress_prev = 0;
- 
+
     // Have we already started taking pictures in panorama mode?
     // We use this variable to be able to detect if panorama
     // mode has been turned off.
     static int bPanoInProgress = 0;
- 
+
     // Precalculate some values to make the rest of the
     // code easier to read.
+    int bFullPress = kbd_is_key_pressed(KEY_SHOOT_FULL);
     const int bHalfPress = kbd_is_key_pressed(KEY_SHOOT_HALF);
-    const int bFullPress = kbd_is_key_pressed(KEY_SHOOT_FULL);
     const int bPlayMode = (mode_get() & MODE_MASK) == MODE_PLAY;
     const int bPanoramaMode = (conf.edge_overlay_pano != 0);
@@ -612 +657 @@
                                 ( bPlayMode && bDisplayInPlay)  // or we are in play-mode with the right settings
                             );
- 
+
     if (bPanoInProgress && !bPanoramaMode)
     {
@@ -621 +666 @@
         bPanoInProgress = 0;
     }
- 
+
     get_viewport_size();
 
@@ -633 +678 @@
         // In this state we assume no edge overlay in memory,
         // but we are ready to create one if the user presses wishes so.
- 
-        if (bFullPress && !bFullPress_prev && bGuiModeNone)
-        {
-            calc_edge_overlay();
+
+        int bRealtimeUpdate = bCanDisplay && (bGuiModeAlt || bGuiModeNone);
+        if (bRealtimeUpdate)
+        {
+            // We try to detect button presses during the lengthy
+            // calculations.
+            bFullPress |= calc_edge_overlay();
+            bFullPress |= draw_edge_overlay();
+        }
+
+        int bSwitch2Frozen = bFullPress && !bFullPress_prev && bGuiModeNone;
+        if (bSwitch2Frozen)
+        {
+            // Switch to Frozen mode
+
+            // Make sure we have one whole consistent frame
+            for (slice = 0; slice < EDGE_SLICES; ++slice)
+                calc_edge_overlay();
+
             set_offset_from_overlap();
             fsm_state = EDGE_FROZEN;
-            
             bPanoInProgress = bPanoramaMode;
         }
-        else if (bCanDisplay && (bGuiModeAlt || bGuiModeNone))
-        {
-            calc_edge_overlay();
-            draw_edge_overlay();
-        }
-        else
+
+        if (!bRealtimeUpdate && !bSwitch2Frozen)
         {
             // Nothing happens. So do nothing.
             // Or rather, we could clean up if we are that bored.
-            bv_free(edgebuf);
-            edgebuf = NULL;
-        }
- 
+            reset_edge_overlay();
+        }
         break;
     }
@@ -661 +714 @@
         // We have a stored edge overlay in memory and we display
         // it on screen in 'frozen' mode.
- 
+
         // Move edge overlay around.
         if (gui_get_mode() == GUI_MODE_ALT)
@@ -674 +727 @@
                 yoffset -=YINC;
         }
- 
+
+        if (bCanDisplay && (bGuiModeAlt || bGuiModeNone))
+        {
+            // We try to detect button presses during the lengthy
+            // calculations.
+            bFullPress |= draw_edge_overlay();
+            draw_string(0, 0, "Frozen", conf.osd_color);
+        }
+
         // In event of a FullPress, we either capture a new
         // overlay and stay frozen, OR we go back to live mode.
         if (bFullPress && !bFullPress_prev && bGuiModeNone)
         {
+            // Possible mode switch
             if (bPanoramaMode)
             {
-                calc_edge_overlay();
+                // Make sure we have one whole consistent frame
+                for (slice = 0; slice < EDGE_SLICES; ++slice)
+                    calc_edge_overlay();
+
                 set_offset_from_overlap();
                 bPanoInProgress = 1;
@@ -688 +753 @@
                 fsm_state = EDGE_LIVE;
         }
-        else if (bCanDisplay && (bGuiModeAlt || bGuiModeNone))
-        {
-            draw_edge_overlay();
-            draw_string(0, 0, "Frozen", conf.osd_color);
-        }
- 
+
         break;
     }   // case
     }   // switch
- 
+
+
     bFullPress_prev = bFullPress;
+
+    if (++slice >= EDGE_SLICES)
+        slice = 0;
+
 }   // function
- 
- 
- 
- 

trunk/core/gui.c

@@ -638 +638 @@
     {0x5c,LANG_MENU_EDGE_OVERLAY_ENABLE,     MENUITEM_BOOL,          &conf.edge_overlay_enable },
     {0x5c,LANG_MENU_EDGE_FILTER,     MENUITEM_BOOL,          &conf.edge_overlay_filter },
-    {0x5c,LANG_MENU_EDGE_PANO,     MENUITEM_ENUM,          (int*)gui_edge_pano_enum },
-    {0x7f,LANG_MENU_EDGE_PANO_OVERLAP,   MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.edge_overlay_pano_overlap, MENU_MINMAX(0, 100)},
+    {0x5f,LANG_MENU_EDGE_PANO,     MENUITEM_ENUM,          (int*)gui_edge_pano_enum },
+    {0x5e,LANG_MENU_EDGE_PANO_OVERLAP,   MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.edge_overlay_pano_overlap, MENU_MINMAX(0, 100)},
     {0x5c,LANG_MENU_EDGE_SHOW,     MENUITEM_BOOL,          &conf.edge_overlay_show },
-    {0x7f,LANG_MENU_EDGE_OVERLAY_TRESH,      MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.edge_overlay_thresh, MENU_MINMAX(0, 255)},
+    {0x5e,LANG_MENU_EDGE_OVERLAY_TRESH,      MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.edge_overlay_thresh, MENU_MINMAX(0, 255)},
     {0x65,LANG_MENU_EDGE_OVERLAY_COLOR,      MENUITEM_COLOR_FG,      (int*)&conf.edge_overlay_color },
     {0x5c,LANG_MENU_EDGE_PLAY,                  MENUITEM_BOOL,          &conf.edge_overlay_play }, //does not work on cams like s-series, which dont have a real "hardware" play/rec switch, need a workaround, probably another button
@@ -3420 +3420 @@
 
     conf.edge_overlay_pano+=change;
-    if (conf.edge_overlay_pano<0)
-        conf.edge_overlay_pano=0;
-    else if (conf.edge_overlay_pano>=(sizeof(modes)/sizeof(modes[0])))
-        conf.edge_overlay_pano=sizeof(modes)/sizeof(modes[0])-1;
-
+    if (conf.edge_overlay_pano<0) 
+        conf.edge_overlay_pano=(sizeof(modes)/sizeof(modes[0]))-1; 
+    else if (conf.edge_overlay_pano>=(sizeof(modes)/sizeof(modes[0]))) 
+        conf.edge_overlay_pano=0; 
     return modes[conf.edge_overlay_pano]; 
 }

trunk/include/camera.h

@@ -845 +845 @@
     #define CAM_EV_IN_VIDEO             1
     #define DNG_SUPPORT                 1
+    #define CAM_REAR_CURTAIN            1 // http://chdk.setepontos.com/index.php/topic,650.msg54434.html#msg54434 
     // pattern
     #define cam_CFAPattern 0x02010100 // Red  Green  Green  Blue

trunk/platform/sx20/sub/102b/boot.c

@@ -15 +15 @@
  if (p[0]==0xff85f3cc)  p[0]=(int)JogDial_task_my;
  if (p[0]==0xFF879034)  p[0]=(int)movie_record_task;
+}
+void taskCreateHook2(int *p) { 
+p-=17;
+if (p[0]==0xFF89A8CC)  p[0]=(int)init_file_modules_task;
+if (p[0]==0xFF8C1430)  p[0]=(int)exp_drv_task;
 }
 
@@ -119 +124 @@
 void __attribute__((naked,noinline)) sub_FF810354_my() {
         //http://chdk.setepontos.com/index.php/topic,4194.0.html
+        *(int*)0x1934 = (int)taskCreateHook2;   // this is inferred, but not actually tested
         *(int*)0x1938 = (int)taskCreateHook3;
+    *(int*)(0x2564)= (*(int*)0xC0220134)&1 ? 0x2000000 : 0x1000000; // replacement of sub_FF8331CC for correct power-on.
 
         asm volatile (
@@ -265 +272 @@
                 "B      loc_FF81F89C\n"
 "loc_FF81F8A0:\n"
-                "BL     sub_FF8331CC\n"
+//              "BL     sub_FF8331CC\n"         // see begin of sub_FF810354_my
 //              "BL     j_nullsub_235\n"
                 "BL     sub_FF8388E4\n"

trunk/platform/sx20/sub/102b/capt_seq.c

@@ -4 +4 @@
 #include "conf.h"
 
-static long *nrflag = (long*)0x9B40;
+static long *nrflag = (long*)0x7910;
 
 #include "../../../generic/capt_seq.c"
@@ -373 +373 @@
                 "SUB    R3, R3, #8\n"
                 "BL     sub_FF96481C\n"
-                "LDR    R0, [R4,#0x1C]\n"
-                "CMP    R0, #0\n" // get here!
-                "MOVNE  R0, #1\n"
-                "STRNE  R0, [R5]\n"
-                "LDR    R0, [R5,#4]\n"
-                "BL     sub_FF9254CC\n"
-                "LDR    R0, [R5,#8]\n"
-                "BL     sub_FF8C83DC\n"
-                "MOV    R0, #1\n"
-                "BL     sub_FF8C83E8\n" // BX LR
-                "LDR    R0, =0xFF961D60\n"
-                "MOV    R1, R4\n"
-                "BL     sub_FF8C83B8\n"
-                "LDR    R0, [R5]\n"
-                "CMP    R0, #5\n" // get here!
-                "ADDLS  PC, PC, R0,LSL#2\n" // badly wrong setting pc here
-                "BL     wait_until_remote_button_is_released\n"
-                "BL     capt_seq_hook_set_nr\n"                     // +
-                "B      sub_FF96251C\n"                             // continue function in firmware
+                 "BL      wait_until_remote_button_is_released\n"
+                 "BL      capt_seq_hook_set_nr\n"                     // +
+                 "B       sub_FF962410\n"                             // continue function in firmware
+//              "LDR    R0, [R4,#0x1C]\n"
+//              "CMP    R0, #0\n" // get here!
+//              "MOVNE  R0, #1\n"
+//              "STRNE  R0, [R5]\n"
+//              "LDR    R0, [R5,#4]\n"
+//              "BL     sub_FF9254CC\n"
+//              "LDR    R0, [R5,#8]\n"
+//              "BL     sub_FF8C83DC\n"
+//              "MOV    R0, #1\n"
+//              "BL     sub_FF8C83E8\n" // BX LR
+//              "LDR    R0, =0xFF961D60\n"
+//              "MOV    R1, R4\n"
+//              "BL     sub_FF8C83B8\n"
+//              "LDR    R0, [R5]\n"
+//              "CMP    R0, #5\n" // get here!
+//              "ADDLS  PC, PC, R0,LSL#2\n" // badly wrong setting pc here
+//                "BL     wait_until_remote_button_is_released\n"
+//                "BL     capt_seq_hook_set_nr\n"                     // +
+//              "B      sub_FF96251C\n"                             // continue function in firmware
  );
 
@@ -523 +526 @@
                 "BL     sub_FF962CF4\n" // changed
                 "MOV    R0, R4\n"
-                                        "BL     sub_FF962364\n" //changed sub_FF962364_my - badly wrong if we use _my
+                                        "BL     sub_FF962364_my\n"
                 "MOV    R7, R0\n"
                                         "BL      capt_seq_hook_raw_here\n"      // +

trunk/platform/sx20/sub/102b/stubs_auto.S

@@ -218 +218 @@
 STUB(FF96227C)
 STUB(FF962364)
+STUB(FF962410)
 STUB(FF96251C)
 STUB(FF962618)

trunk/platform/sx20/sub/102d/boot.c

@@ -24 +24 @@
 void CreateTask_spytask() {
         _CreateTask("SpyTask", 0x19, 0x2000, core_spytask, 0);
+#ifdef CAM_CHDK_PTP
+    _CreateTask("InitCHDKPTP", 0x19, 0x2000, init_chdk_ptp, 0);
+#endif
 };
 

trunk/platform/sx20/sub/102d/stubs_entry_2.S

@@ -47 +47 @@
 NHSTUB(RenameFile_Fut,                                  0xFF834B74) // doesn't look like SX10 but works
 NHSTUB(strrchr,                                                 0xFF813FE4) // incorrectly detected
+NHSTUB(add_ptp_handler,                                 0xFFA49320) 
 
 # Might be wrong