Changeset 1008 for trunk/core/raw.c

Timestamp:

01/01/11 22:51:22 (2 years ago)

Author:

reyalP

Message:

sx30 100e, 100h, 100l and g12 100c support from from philmoz in ​http://chdk.setepontos.com/index.php?topic=650.msg59036#msg59036
not added to autobuild yet

File:

• trunk/core/raw.c (modified) (6 diffs)

trunk/core/raw.c

@@ -42 +42 @@
  else return (char*) ((int)hook_raw_image_addr()&~CAM_UNCACHED_BIT);
 }
+
+#if DNG_DOUBLE_BUF
+char* get_alt_raw_image_addr(void){     // return inactive buffer
+ if (!conf.raw_cache) return hook_alt_raw_image_addr();
+ else return (char*) ((int)hook_alt_raw_image_addr()&~CAM_UNCACHED_BIT);
+}
+#endif    
 
 //-------------------------------------------------------------------
@@ -67 +74 @@
  int i;
  if (gamma[255]) return;
+#if defined(CAMERA_sx30) || defined(CAMERA_g12)
+ for (i=0; i<12; i++) gamma[i]=255*pow(i/255.0, 0.5);
+ for (i=12; i<64; i++) gamma[i]=255*pow(i/255.0, 0.4);
+ for (i=64; i<=255; i++) gamma[i]=255*pow(i/255.0, 0.25);
+#else
  for (i=0; i<=255; i++) gamma[i]=255*pow(i/255.0, 0.5);
+#endif
 }
 
@@ -107 +120 @@
     if (state_kbd_script_run && shot_histogram_isenabled()) build_shot_histogram();
 
+#if DNG_DOUBLE_BUF
+        char* rawadr = get_raw_image_addr();
+        char* altrawadr = get_alt_raw_image_addr();
+#endif    
+
     // ! ! ! 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");
@@ -156 +174 @@
 
         mkdir("A/DCIM");
+#if defined(CAM_DATE_FOLDER_NAMING)
+                if (conf.raw_in_dir)
+                        get_target_dir_name(dir);
+                else
+                        sprintf(dir, RAW_TARGET_DIRECTORY, 100);
+#else
         sprintf(dir, RAW_TARGET_DIRECTORY, (conf.raw_in_dir)?get_target_dir_num():100);
+#endif
         mkdir(dir);
 
@@ -178 +203 @@
                write(fd, get_dng_header(), get_dng_header_size());
                write(fd, thumbnail_buf, DNG_TH_WIDTH*DNG_TH_HEIGHT*3);
+#if DNG_DOUBLE_BUF
+               reverse_bytes_order2(rawadr, altrawadr, hook_raw_size());
+#else
                reverse_bytes_order(get_raw_image_addr(), hook_raw_size());
+#endif
              }
             }
 #endif
+#if DNG_DOUBLE_BUF
+            if (conf.dng_raw) {
+                        write(fd, (char*)(((unsigned long)altrawadr)|CAM_UNCACHED_BIT), hook_raw_size());
+                        }
+                        else
+                        {
+                    write(fd, (char*)(((unsigned long)rawadr)|CAM_UNCACHED_BIT), hook_raw_size());
+                        }
+#else
             write(fd, get_raw_image_addr(), hook_raw_size());
+#endif
             close(fd);
             utime(fn, &t);
@@ -188 +227 @@
             if (conf.dng_raw) {
              if (get_dng_header() && thumbnail_buf) {
+#if !DNG_DOUBLE_BUF
               reverse_bytes_order(get_raw_image_addr(), hook_raw_size());
+#endif
           //   unpatch_bad_pixels_b();
               }