Changeset 623

Timestamp:

12/07/08 00:05:29 (4 years ago)

Author:

EWAVR

Message:

+added optional DNG extension for DNG files
+added possibility to create badpixel.bin from scripts
-fixed small bug in file browser - ​http://chdk.kernreaktor.org/mantis/view.php?id=129

Location:

trunk

Files:

• CHDK/LANG/english.lng (modified) (1 diff)
• core/conf.c (modified) (1 diff)
• core/dng_hdr.c (modified) (2 diffs)
• core/gui.c (modified) (1 diff)
• core/gui_fselect.c (modified) (1 diff)
• core/gui_lang.c (modified) (1 diff)
• core/gui_lang.h (modified) (1 diff)
• core/raw.c (modified) (3 diffs)
• include/camera.h (modified) (1 diff)
• include/conf.h (modified) (1 diff)
• version.inc (modified) (1 diff)

trunk/CHDK/LANG/english.lng

@@ -578 +578 @@
 437 "Enable flash in video?"
 438 "   Flash Power"
+439 "'DNG' file extension"

trunk/core/conf.c

@@ -395 +395 @@
     CONF_INFO(232, conf.flash_video_override,     CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO(233, conf.flash_video_override_power,     CONF_DEF_VALUE, i:0, NULL),
+    CONF_INFO(234, conf.raw_dng_ext,     CONF_DEF_VALUE, i:0, NULL),
     };
 #define CONF_NUM (sizeof(conf_info)/sizeof(conf_info[0]))

trunk/core/dng_hdr.c

@@ -32 +32 @@
  {0x103,  T_SHORT,     1,  1},   // Compression: Uncompressed
  {0x106,  T_SHORT,     1,  2}, //PhotometricInterpretation: RGB
+ {0x10E,  T_ASCII,     0,  0}, // ImageDescription
  {0x10F,  T_ASCII,     6,  (int)"Canon"}, // Make
  {0x110,  T_ASCII,     32, (int)cam_name}, //Model: Filled at header generation.
@@ -41 +42 @@
  {0x11C,  T_SHORT,     1,  1}, // PlanarConfiguration: 1
  {0x131,  T_ASCII,     (sizeof(cam_chdk_ver)/2)*2,  (int)cam_chdk_ver}, //Software
- {0x132,  T_ASCII,     20, 0}, // DataTime
+ {0x132,  T_ASCII,     20, 0}, // DateTime
  {0x14A,  T_LONG,      1,  0}, //SubIFDs offset
  {0x8298, T_ASCII,     0,  0}, // Copyright

trunk/core/gui.c

@@ -774 +774 @@
     {0x5c,LANG_MENU_BAD_PIXEL_REMOVAL,       MENUITEM_ENUM,      (int*)gui_bad_pixel_enum },
 #if DNG_SUPPORT
-    {0x5c, LANG_MENU_DNG_FORMAT,                MENUITEM_BOOL | MENUITEM_ARG_CALLBACK, &conf.dng_raw , (int)cb_change_dng },
-#endif
-    {0x5c,LANG_MENU_RAW_CACHED,          MENUITEM_BOOL,      &conf.raw_cache },
+    {0x5c,LANG_MENU_DNG_FORMAT,              MENUITEM_BOOL | MENUITEM_ARG_CALLBACK, &conf.dng_raw , (int)cb_change_dng },
+    {0x5c,LANG_MENU_RAW_DNG_EXT,             MENUITEM_BOOL,      &conf.raw_dng_ext},
+#endif
+    {0x5c,LANG_MENU_RAW_CACHED,              MENUITEM_BOOL,      &conf.raw_cache },
     {0x51,LANG_MENU_BACK,                    MENUITEM_UP },
     {0}

trunk/core/gui_fselect.c

@@ -988 +988 @@
             break;
         case KEY_SET:
-            if (selected && selected->attr != 0xFF) {
+            if (selected && selected->attr != 0xFF && gui_fselect_redraw==0) {
                 if (selected->attr & DOS_ATTR_DIRECTORY) {
                     i=strlen(current_dir);

trunk/core/gui_lang.c

@@ -559 +559 @@
 "437 \"Enable flash in video?\"\n"
 "438 \"   Power of flash\"\n"
+"439 \"'DNG' file extension\"\n"
 ;
 

trunk/core/gui_lang.h

@@ -549 +549 @@
 #define LANG_MENU_FLASH_VIDEO_OVERRIDE     437
 #define LANG_MENU_FLASH_VIDEO_OVERRIDE_POWER     438
+#define LANG_MENU_RAW_DNG_EXT              439
 //-------------------------------------------------------------------
 
-#define GUI_LANG_ITEMS                  438
+#define GUI_LANG_ITEMS                  439
 
 //-------------------------------------------------------------------

trunk/core/raw.c

@@ -41 +41 @@
  else return (char*) ((int)hook_raw_image_addr()&~0x10000000);
 }
+
+//-------------------------------------------------------------------
+
+unsigned int get_bad_count_and_write_file(char *fn){
+ int count=0;
+ unsigned short c[2];
+ FILE*f;
+ f=fopen(fn,"w+b");
+ for (c[1]=0; c[1]<CAM_RAW_ROWS; c[1]++)
+   for (c[0]=0; c[0]<CAM_RAW_ROWPIX; c[0]++)
+    if (get_raw_pixel(c[0],c[1])==0) { fwrite(c, 1, 4, f); count++;}
+ fclose(f);
+ return count;
+}
+
 
 //-------------------------------------------------------------------
@@ -90 +105 @@
     if (state_kbd_script_run && shot_histogram_enabled) build_shot_histogram();
 
+    // ! ! ! exclusively for special script which creates badpixel.bin ! ! !
+    if (conf.save_raw==255) conf.save_raw=get_bad_count_and_write_file("A/CHDK/bad_tmp.bin");
+    //
+
     if (develop_raw) {
      started();
@@ -142 +161 @@
             sprintf(fn+strlen(fn), RAW_BRACKETING_FILENAME, img_prefixes[conf.raw_prefix], get_target_file_num(), br_counter, img_exts[conf.raw_ext]);
         else
-            sprintf(fn+strlen(fn), RAW_TARGET_FILENAME, img_prefixes[conf.raw_prefix], get_target_file_num(), img_exts[conf.raw_ext]); 
+            sprintf(fn+strlen(fn), RAW_TARGET_FILENAME, img_prefixes[conf.raw_prefix], get_target_file_num(),
+              conf.dng_raw&&conf.raw_dng_ext ? ".DNG" : img_exts[conf.raw_ext]); 
         fd = open(fn, O_WRONLY|O_CREAT, 0777);
         if (fd>=0) {

trunk/include/camera.h

@@ -392 +392 @@
 #define CAM_RAW_ROWS                2480   // for new 8 MP
 
-#define CAM_USE_ZOOM_FOR_MF         1      // Zoom lever can be used for manual focus adjustments
+#define CAM_USE_ZOOM_FOR_MF         1
 
 // cannot mute during video-zoom through CHDK, it can mute in general firmware settings (non CHDK)
 #undef  CAM_CAN_MUTE_MICROPHONE            // Camera has no function to mute microphone
 
-#define CAM_HAS_IRIS_DIAPHRAGM      1      // it has a 6 blade iris diaphragm
+#define CAM_HAS_IRIS_DIAPHRAGM      1
 #undef  CAM_HAS_ND_FILTER
 
-#define CAM_HAS_MANUAL_FOCUS        1      // Camera has manual focus mode
-
-#define CAM_AF_SCAN_DURING_VIDEO_RECORD 1   // Camera adapts focus in video recording
+#define CAM_HAS_MANUAL_FOCUS        1
+
+#define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
 //#define CAM_EV_IN_VIDEO             1      // not working on 101b!!!
 #define DNG_SUPPORT                 1
 // pattern
-// It has indeed Green Blue Red Green, so that makes 01 00 02 01
-#define cam_CFAPattern 0x01000201 // Green  Blue  Red  Green
-// color 
-#define CAM_COLORMATRIX1                               \
-0.647380, 1000000, -0.169846, 1000000, -0.115337, 1000000, \
--0.011566, 1000000, 0.451223, 1000000, 0.013279, 1000000, \
-0.062541, 1000000, 0.054140, 1000000, 0.161148, 1000000
+#define cam_CFAPattern 0x01000201 // Green  Blue  Red  Green 
+// color                                                        // Source?
+#define CAM_COLORMATRIX1                              \
+ 647380, 1000000, -169846, 1000000, -115337, 1000000, \
+ -11566, 1000000,  451223, 1000000,   13279, 1000000, \
+  62541, 1000000,   54140, 1000000,  161148, 1000000
 
 #define cam_CalibrationIlluminant1 1 // Daylight

trunk/include/conf.h

@@ -33 +33 @@
     int dng_raw;
     int raw_timer;
+    int raw_dng_ext;
 
     int show_osd;

trunk/version.inc

@@ -1 @@
-BUILD_NUMBER := 0.8.8
+BUILD_NUMBER := 0.8.9