Changeset 1249

Timestamp:

07/27/11 23:47:27 (22 months ago)

Author:

philmoz

Message:

Add DNG_VERT_RLE_BADPIXELS definition & comments to camera.h
Fix raw/dng saving on the SX220HS and IXUS 310HS (probably the SX230HS will need it as well).

• Add a new function to wrappers.c that checks if a directory exists before calling mkdir on it (mkdir_if_not_exist).
• Add a simple run length compression for the badpixel.bin file.

​http://chdk.setepontos.com/index.php?topic=650.msg70786#msg70786

Location:

trunk

Files:

• . (modified) (1 prop)
• CHDK/FONTS/Arial14.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Arial14b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Arial16.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Arial16b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Arial18.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Arial18b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Arial20.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Arial20b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Courier14.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Courier14b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Courier16.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Courier16b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Courier18.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Courier18b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Courier20.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Courier20b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Lucida14.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Lucida16.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Lucida18.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Lucida20.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Menu-A16b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Menu-A20.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Menu-AN18b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Menu-AN20b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Tahoma14.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Tahoma14b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Tahoma16.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Tahoma16b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Tahoma18.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Tahoma18b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Tahoma20.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Tahoma20b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Times14.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Times14b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Times16.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Times16b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Times18.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Times18b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Times20.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Times20b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Verdana14.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Verdana14b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Verdana16.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Verdana16b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Verdana18.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Verdana18b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Verdana20.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/Verdana20b.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/arialround16.rbf (modified) (1 prop) (previous)
• CHDK/FONTS/arialround18.rbf (modified) (1 prop) (previous)
• CHDK/GRIDS/3to2grid.grd (modified) (1 prop)
• CHDK/GRIDS/3to8grid.grd (modified) (1 prop)
• CHDK/GRIDS/golden1.grd (modified) (1 prop)
• CHDK/GRIDS/golden2.grd (modified) (1 prop)
• CHDK/GRIDS/id.grd (modified) (1 prop)
• CHDK/GRIDS/readme.txt (modified) (1 prop)
• CHDK/GRIDS/rulecross.grd (modified) (1 prop)
• CHDK/GRIDS/rulers.grd (modified) (1 prop)
• CHDK/GRIDS/sports.grd (modified) (1 prop)
• CHDK/GRIDS/stolen.grd (modified) (1 prop)
• CHDK/GRIDS/third_h.grd (modified) (1 prop)
• CHDK/GRIDS/third_v.grd (modified) (1 prop)
• CHDK/LANG/english.lng (modified) (1 prop)
• CHDK/LANG/german.lng (modified) (1 prop)
• CHDK/LANG/russian.lng (modified) (1 prop)
• CHDK/SYMBOLS/icon_10.rbf (modified) (1 prop) (previous)
• CHDK/SYMBOLS/icon_16.rbf (modified) (1 prop) (previous)
• core/dng.c (modified) (1 prop)
• core/raw.c (modified) (4 diffs)
• doc/2_installation.txt (modified) (1 prop)
• doc/changelog.txt (modified) (1 prop)
• include/camera.h (modified) (1 diff)
• include/stdlib.h (modified) (1 diff)
• platform/generic/wrappers.c (modified) (1 diff)
• platform/sx100is/sub/100b (modified) (1 prop)

trunk/core/raw.c

@@ -75 +75 @@
     }
     count = 0;
-    for (c[1]=CAM_ACTIVE_AREA_Y1; c[1]<CAM_ACTIVE_AREA_Y2; c[1]++) {
-        for (c[0]=CAM_ACTIVE_AREA_X1; c[0]<CAM_ACTIVE_AREA_X2; c[0]++) {
-            if (get_raw_pixel(c[0],c[1])==0) {
-                if(f) {
-                    fwrite(c, 1, 4, f);
-                }
+#ifdef DNG_VERT_RLE_BADPIXELS
+    for (c[0]=CAM_ACTIVE_AREA_X1; c[0]<CAM_ACTIVE_AREA_X2; c[0]++)
+    {
+        for (c[1]=CAM_ACTIVE_AREA_Y1; c[1]<CAM_ACTIVE_AREA_Y2; c[1]++)
+        {
+            if (get_raw_pixel(c[0],c[1])==0)
+            {
+                unsigned short l;
+                for (l=0; l<7; l++) if (get_raw_pixel(c[0],c[1]+l+1)!=0) break;
+                c[1] = c[1] | (l << 13);
+                if (f) fwrite(c, 1, 4, f);
+                c[1] = (c[1] & 0x1FFF) + l;
+                count = count + l + 1;
+            }
+        }
+    }
+#else
+    for (c[1]=CAM_ACTIVE_AREA_Y1; c[1]<CAM_ACTIVE_AREA_Y2; c[1]++) 
+    {
+        for (c[0]=CAM_ACTIVE_AREA_X1; c[0]<CAM_ACTIVE_AREA_X2; c[0]++) 
+        {
+            if (get_raw_pixel(c[0],c[1])==0) 
+            {
+                if (f) fwrite(c, 1, 4, f);
                 count++;
             }
         }
     }
-    if(f) {
-        fclose(f);
-    }
+#endif
+    if (f) fclose(f);
     init_badpixel_bin_flag = count;
     state_shooting_progress = SHOOTING_PROGRESS_PROCESSING;
@@ -199 +216 @@
         t.actime = t.modtime = time(NULL);
 
-        mkdir("A/DCIM");
+        mkdir_if_not_exist("A/DCIM");
 #if defined(CAM_DATE_FOLDER_NAMING)
         if (conf.raw_in_dir)
@@ -208 +225 @@
         sprintf(dir, RAW_TARGET_DIRECTORY, (conf.raw_in_dir)?get_target_dir_num():100);
 #endif
-        mkdir(dir);
+        mkdir_if_not_exist(dir);
 
         sprintf(fn, "%s/", dir);
@@ -470 +487 @@
     int i;
     short* ptr=binary_list;
-    for (i=0; i<binary_count; i++, ptr+=2) if (get_raw_pixel(ptr[0], ptr[1])==0) patch_bad_pixel(ptr[0], ptr[1]);
+#ifdef DNG_VERT_RLE_BADPIXELS
+    short y, cnt;
+    for (i=0; i<binary_count; i++, ptr+=2)
+    {
+        y = ptr[1] & 0x1FFF;
+        cnt = (ptr[1] >> 13) & 7;
+        for (; cnt>=0; cnt--, y++)
+            if (get_raw_pixel(ptr[0], y)==0)
+                patch_bad_pixel(ptr[0], y);
+    }
+#else
+    for (i=0; i<binary_count; i++, ptr+=2)
+        if (get_raw_pixel(ptr[0], ptr[1])==0)
+            patch_bad_pixel(ptr[0], ptr[1]);
+#endif
 }
 /*

trunk/include/camera.h

@@ -135 +135 @@
 #undef  DNG_EXT_FROM                            // Extension in the cameras known extensions to replace with .DNG to allow DNG
                                                 // files to be transfered over standard PTP. Only applicable to older cameras
+#undef  DNG_VERT_RLE_BADPIXELS                  // Enable vertical run length compression of badpixel data for DNG
+                                                // IXUS 310 HS bad pixels tend to be grouped into vertical lines of 1-4 pixels
+                                                // This reduces the file size by approx 45%
 
 // Games definitions

trunk/include/stdlib.h

@@ -144 +144 @@
 extern int lseek (int fd, long offset, int whence);
 extern long mkdir(const char *dirname);
+extern long mkdir_if_not_exist(const char *dirname);
 extern int rename(const char *oldname, const char *newname);
 extern int chdir(char *pathname);

trunk/platform/generic/wrappers.c

@@ -358 +358 @@
 }
 
+long mkdir_if_not_exist(const char *dirname) 
+{
+    // Check if directory exists and create it if it does not.
+    struct stat st;
+    if (stat(dirname,&st) != 0) return mkdir(dirname);
+    return 0;   // Success
+}
+
 int remove(const char *name) {
         return _DeleteFile_Fut(name);