Changeset 720

Timestamp:

03/14/09 22:43:07 (4 years ago)

Author:

reyalp

Message:

• preliminary 12bpp support (my sd990 code + ewavr sx10 code). Curves are disabled for 12 bpp sd990 and sx10 sections included in camera.h as examples, the rest of the code isn't.
• Digic IV memory layout support with CAM_UNCACHED_BIT
• make g9 stubs_entry.S match what is generated from SVN

Location:

trunk

Files:

• core/curves.c (modified) (2 diffs)
• core/luascript.c (modified) (3 diffs)
• core/raw.c (modified) (6 diffs)
• core/raw_merge.c (modified) (9 diffs)
• core/shot_histogram.c (modified) (4 diffs)
• include/camera.h (modified) (4 diffs)
• platform/g9/sub/100d/stubs_entry.S (modified) (2 diffs)
• platform/g9/sub/100g/stubs_entry.S (modified) (2 diffs)

trunk/core/curves.c

@@ -3 +3 @@
 #include "stdlib.h"
 #include "raw.h"
+
+#ifdef OPT_CURVES
+
 #include "curves.h"
 
@@ -390 +393 @@
 }
 
+#endif

trunk/core/luascript.c

@@ -13 +13 @@
 #include "raw.h"
 #include "raw_merge.h"
+
+#ifdef OPT_CURVES
 #include "curves.h"
 
@@ -22 +24 @@
   return 0;
 }
-
+#endif
 
 static int luaCB_set_aflock(lua_State* L) 
@@ -1016 +1018 @@
   FUNC(set_backlight);
    FUNC(set_aflock);
+#ifdef OPT_CURVES
    FUNC(set_curve_state);
-}
+#endif
+}

trunk/core/raw.c

@@ -39 +39 @@
 char* get_raw_image_addr(void){
  if (!conf.raw_cache) return hook_raw_image_addr();
- else return (char*) ((int)hook_raw_image_addr()&~0x10000000);
+ else return (char*) ((int)hook_raw_image_addr()&~CAM_UNCACHED_BIT);
 }
 
@@ -78 +78 @@
     y=CAM_ACTIVE_AREA_Y1+((CAM_ACTIVE_AREA_Y2-CAM_ACTIVE_AREA_Y1)*i)/DNG_TH_HEIGHT;
 #if cam_CFAPattern==0x02010100    // Red  Green  Green  Blue
-    r=gamma[get_raw_pixel((x/2)*2,(y/2)*2)>>2]; // red pixel
-    g=gamma[6*(get_raw_pixel((x/2)*2+1,(y/2)*2)>>2)/10]; // green pixel
-    b=gamma[get_raw_pixel((x/2)*2+1,(y/2)*2+1)>>2]; //blue pixel
+    r=gamma[get_raw_pixel((x/2)*2,(y/2)*2)>>(CAM_SENSOR_BITS_PER_PIXEL-8)]; // red pixel
+    g=gamma[6*(get_raw_pixel((x/2)*2+1,(y/2)*2)>>(CAM_SENSOR_BITS_PER_PIXEL-8))/10]; // green pixel
+    b=gamma[get_raw_pixel((x/2)*2+1,(y/2)*2+1)>>(CAM_SENSOR_BITS_PER_PIXEL-8)]; //blue pixel
 #elif cam_CFAPattern==0x01000201 // Green  Blue  Red  Green
-    r=gamma[get_raw_pixel((x/2)*2,(y/2)*2+1)>>2]; // red pixel
-    g=gamma[6*(get_raw_pixel((x/2)*2,(y/2)*2)>>2)/10]; // green pixel
-    b=gamma[get_raw_pixel((x/2)*2+1,(y/2)*2)>>2]; //blue pixel
+    r=gamma[get_raw_pixel((x/2)*2,(y/2)*2+1)>>(CAM_SENSOR_BITS_PER_PIXEL-8)]; // red pixel
+    g=gamma[6*(get_raw_pixel((x/2)*2,(y/2)*2)>>(CAM_SENSOR_BITS_PER_PIXEL-8))/10]; // green pixel
+    b=gamma[get_raw_pixel((x/2)*2+1,(y/2)*2)>>(CAM_SENSOR_BITS_PER_PIXEL-8)]; //blue pixel
 #else 
  #error please define new pattern here
@@ -219 +219 @@
 
 void set_raw_pixel(unsigned int x, unsigned int y, unsigned short value){
+#if CAM_SENSOR_BITS_PER_PIXEL==10
  unsigned char* addr=(unsigned char*)get_raw_image_addr()+y*RAW_ROWLEN+(x/8)*CAM_SENSOR_BITS_PER_PIXEL;
-#if CAM_SENSOR_BITS_PER_PIXEL==10
  switch (x%8) {
   case 0: addr[0]=(addr[0]&0x3F)|(value<<6); addr[1]=value>>2;                  break;
@@ -231 +231 @@
   case 7: addr[8]=value;                     addr[9]=(addr[9]&0xFC)|(value>>8); break;
  }
+#elif CAM_SENSOR_BITS_PER_PIXEL==12
+ unsigned char* addr=(unsigned char*)get_raw_image_addr()+y*RAW_ROWLEN+(x/4)*6;
+ switch (x%4) {
+  case 0: addr[0] = (addr[0]&0x0F) | (unsigned char)(value << 4);  addr[1] = (unsigned char)(value >> 4);  break;
+  case 1: addr[0] = (addr[0]&0xF0) | (unsigned char)(value >> 8);  addr[3] = (unsigned char)value;         break;
+  case 2: addr[2] = (unsigned char)(value >> 4);  addr[5] = (addr[5]&0x0F) | (unsigned char)(value << 4);  break;
+  case 3: addr[4] = (unsigned char)value; addr[5] = (addr[5]&0xF0) | (unsigned char)(value >> 8);  break;
+ }
 #else 
  #error define set_raw_pixel for sensor bit depth
@@ -238 +246 @@
 //-------------------------------------------------------------------
 unsigned short get_raw_pixel(unsigned int x,unsigned  int y){
+#if CAM_SENSOR_BITS_PER_PIXEL==10
  unsigned char* addr=(unsigned char*)get_raw_image_addr()+y*RAW_ROWLEN+(x/8)*CAM_SENSOR_BITS_PER_PIXEL;
-#if CAM_SENSOR_BITS_PER_PIXEL==10
  switch (x%8) {
   case 0: return ((0x3fc&(((unsigned short)addr[1])<<2)) | (addr[0] >> 6));
@@ -249 +257 @@
   case 6: return ((0x3c0&(((unsigned short)addr[6])<<6)) | (addr[9] >> 2)); 
   case 7: return ((0x300&(((unsigned short)addr[9])<<8)) | (addr[8])); 
+ }
+#elif CAM_SENSOR_BITS_PER_PIXEL==12
+ unsigned char* addr=(unsigned char*)get_raw_image_addr()+y*RAW_ROWLEN+(x/4)*6;
+ switch (x%4) {
+  case 0: return ((unsigned short)(addr[1]) << 4) | (addr[0] >> 4);
+  case 1: return ((unsigned short)(addr[0] & 0x0F) << 8) | (addr[3]);
+  case 2: return ((unsigned short)(addr[2]) << 4) | (addr[5] >> 4);
+  case 3: return ((unsigned short)(addr[5] & 0x0F) << 8) | (addr[4]);
  }
 #else 

trunk/core/raw_merge.c

@@ -21 +21 @@
 // this may or may not be what you want
 static int raw_subtract_values(int from, int sub) {
-    if ( sub > conf.sub_in_dark_value ) {
+/*    if ( sub > conf.sub_in_dark_value ) {
         int result = from - sub;
         if ( result < conf.sub_out_dark_value ) {
@@ -32 +32 @@
     else {
         return from;
-    }
+    }*/
+
+ int result;
+ if ((from==0) || (sub==0)) return 0; // bad pixel
+ result = from - sub + CAM_BLACK_LEVEL;
+ if (result<CAM_BLACK_LEVEL) result=CAM_BLACK_LEVEL;
+ if (result>CAM_WHITE_LEVEL) result=CAM_WHITE_LEVEL;
+ return result;
+
 }
 /* subtract "sub" from "from" and store the result in "dest"*/
 /* TODO allow replacing if dest == from or sub*/
 int raw_subtract(const char *from, const char *sub, const char *dest) {
-     unsigned req=(hook_raw_size()>>10) + 1;
+    unsigned req=(hook_raw_size()>>10) + 1;
     unsigned avail=GetFreeCardSpaceKb();
     FILE *ffrom = NULL, *fsub = NULL, *fdest = NULL;
@@ -66 +74 @@
             fread(baccum,1, RAW_ROWLEN,ffrom);
             fread(bsub,1, RAW_ROWLEN,fsub);
+
+#if CAM_SENSOR_BITS_PER_PIXEL==10
+
             for(i = 0;i<RAW_ROWLEN; i+=10) {
                 s =((0x3fc&(((unsigned short)bsub[i+1])<<2)) | (bsub[i+0] >> 6));
@@ -118 +129 @@
                 baccum[i+9]=(baccum[i+9]&0xFC)|(d>>8);
             }
+
+#elif CAM_SENSOR_BITS_PER_PIXEL==12
+
+            for(i = 0;i<RAW_ROWLEN; i+=6) {
+
+                s=((0xFF0&(((unsigned short)bsub[i+1])<<4))   | (bsub[i+0] >> 4));
+                d=((0xFF0&(((unsigned short)baccum[i+1])<<4)) | (baccum[i+0] >> 4));
+                d = raw_subtract_values(d,s);
+                baccum[i+0]=(baccum[i+0]&0x0F)|(d<<4);
+                baccum[i+1]=d>>4;
+
+                s=((0xF00&(((unsigned short)bsub[i+0])<<8))   | (bsub[i+3]     ));
+                d=((0xF00&(((unsigned short)baccum[i+0])<<8)) | (baccum[i+3]   ));
+                d = raw_subtract_values(d,s);
+                baccum[i+0]=(baccum[i+0]&0xF0)|(d>>8);
+                baccum[i+3]=d;
+
+                s=((0xFF0&(((unsigned short)bsub[i+2])<<4))   | (bsub[i+5] >> 4));
+                d=((0xFF0&(((unsigned short)baccum[i+2])<<4)) | (baccum[i+5] >> 4));
+                d = raw_subtract_values(d,s);
+                baccum[i+2]=d>>4;
+                baccum[i+5]=(baccum[i+5]&0x0F)|(d<<4);
+
+                s=((0xF00&(((unsigned short)bsub[i+5])<<8))   | (bsub[i+4]     ));
+                d=((0xF00&(((unsigned short)baccum[i+5])<<8)) | (baccum[i+4]     ));
+                d = raw_subtract_values(d,s);
+                baccum[i+4]=d;
+                baccum[i+5]=(baccum[i+5]&0xF0)|(d>>8);
+            }
+
+#else 
+ #error define set_raw_pixel for sensor bit depth
+#endif
+
             fwrite(baccum,1,RAW_ROWLEN,fdest);
             if ( (j & 0x1F) == 0 ) {
@@ -192 +237 @@
 
         for (nrow=0,j=0;nrow<CAM_RAW_ROWS;nrow++,j++){
+
+#if CAM_SENSOR_BITS_PER_PIXEL==10
+
           for (i=0,src=0; i<CAM_RAW_ROWPIX; i+=8, src+=10){
             row[i+0]+=((0x3fc&(((unsigned short)rawrow[src+1])<<2)) | (rawrow[src+0] >> 6));
@@ -202 +250 @@
             row[i+7]+=((0x300&(((unsigned short)rawrow[src+9])<<8)) | (rawrow[src+8])); 
           }
+
+#elif CAM_SENSOR_BITS_PER_PIXEL==12
+
+          for (i=0,src=0; i<CAM_RAW_ROWPIX; i+=4, src+=6){
+            row[i+0]+=((0xFF0&(((unsigned short)rawrow[src+1])<<4)) | (rawrow[src+0] >> 4));
+            row[i+1]+=((0xF00&(((unsigned short)rawrow[src+0])<<8)) | (rawrow[src+3]     ));
+            row[i+2]+=((0xFF0&(((unsigned short)rawrow[src+2])<<4)) | (rawrow[src+5] >> 4));
+            row[i+3]+=((0xF00&(((unsigned short)rawrow[src+5])<<8)) | (rawrow[src+4]     ));
+          }
+
+#else
+ #error define set_raw_pixel for sensor bit depth
+#endif
+
           fwrite(row, 1, CAM_RAW_ROWPIX*sizeof(unsigned short), fbrawout);
           if (raw_count)
@@ -232 +294 @@
   FILE *fbraw, *fcraw;
   static struct utimbuf t;
-  #define BLACK_LEVEL 32 
   if (!raw_count)
     return;
@@ -253 +314 @@
             row[i]/=raw_count;
           else {
-            if (row[i]>BLACK_LEVEL*(raw_count-1))
-              row[i]-=BLACK_LEVEL*(raw_count-1);
+            if (row[i]>CAM_BLACK_LEVEL*(raw_count-1))
+              row[i]-=CAM_BLACK_LEVEL*(raw_count-1);
             else
               row[i]=0;
-            if (row[i]>0x3FF)
-              row[i]=0x3FF;
+            if (row[i]>CAM_WHITE_LEVEL)
+              row[i]=CAM_WHITE_LEVEL;
           }
         }
-
+#if CAM_SENSOR_BITS_PER_PIXEL==10
         for (i=0,src=0;i<CAM_RAW_ROWPIX;i+=8,src+=10) {
           rawrow[src+0]=(row[i+0]<<6)|(row[i+1]>>4);
@@ -274 +335 @@
           rawrow[src+9]=(row[i+6]<<2)|(row[i+7]>>8);
         }
+#elif CAM_SENSOR_BITS_PER_PIXEL==12
+        for (i=0,src=0; i<CAM_RAW_ROWPIX; i+=4, src+=6){
+          rawrow[src+0]=(row[i+0]<<4)|(row[i+1]>>8);
+          rawrow[src+1]=(row[i+0]>>4);
+          rawrow[src+2]=(row[i+2]>>4);
+          rawrow[src+3]= row[i+1];
+          rawrow[src+4]= row[i+3];
+          rawrow[src+5]=(row[i+2]<<4)|(row[i+3]>>8);
+        }
+#else 
+ #error define set_raw_pixel for sensor bit depth
+#endif
+
         fwrite(rawrow, 1, RAW_ROWLEN, fcraw);
         fread(row, 1, CAM_RAW_ROWPIX*sizeof(unsigned short), fbraw);

trunk/core/shot_histogram.c

@@ -9 +9 @@
 #define RAW_TARGET_FILENAME     "%s_%04d.%s"
 
+// we could use sensor bitdepth here. For now, we just discard low bits if > 10bpp
 #define SHOT_HISTOGRAM_SAMPLES 1024
 #define SHOT_HISTOGRAM_SIZE (SHOT_HISTOGRAM_SAMPLES*sizeof(short))
@@ -39 +40 @@
 void build_shot_histogram()
 {
- // read samples fromRAW memory and build an histogram of its luminosity
+ // read samples from RAW memory and build an histogram of its luminosity
  // actually, it' just reading pixels, ignoring difference between R, G and B, 
  // we just need an estimate of luminance
@@ -73 +74 @@
  {
   p=get_raw_pixel(x,y);
+// > 10bpp compatibility: discard the lowest N bits
+#if CAM_SENSOR_BITS_PER_PIXEL > 10
+  p >>= CAM_SENSOR_BITS_PER_PIXEL-10;
+#endif
   shot_histogram[p]++;
  }
@@ -105 +110 @@
  if(!shot_histogram_isenabled()) // TODO we could return an error somehow
   return 0;
- for (x = 0 ; x < 1024; x ++ )  
+ for (x = 0 ; x < SHOT_HISTOGRAM_SAMPLES; x ++ )  
  {
          tot += shot_histogram[x];

trunk/include/camera.h

@@ -53 +53 @@
     #undef  CAM_BRACKETING                // Cameras that have bracketing (focus & ev) in original firmware already, most likely s- & g-series (propcase for digic III not found yet!)
 
+    #define CAM_UNCACHED_BIT    0x10000000 // bit indicating the uncached memory
+
     #define CAM_MAKE                    "Canon"
-    #define CAM_SENSOR_BITS_PER_PIXEL   10  // Bits per pixel. Only value of 10 is currently supported
+    #define CAM_SENSOR_BITS_PER_PIXEL   10  // Bits per pixel. 10 is standard, 12 is supported except for curves
     #define CAM_WHITE_LEVEL             ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1)
     #define CAM_BLACK_LEVEL             31
@@ -1348 +1350 @@
     #define DNG_EXT_FROM ".CR2"
 
+#elif defined (CAMERA_ixus980_sd990)
+    #define CAM_PROPSET                 2 // all values checked so far match propset 2
+    #define CAM_DRYOS                   1
+
+    #define CAM_RAW_ROWPIX              4480 // 14.7 MP 12bpp
+    #define CAM_RAW_ROWS                3348   
+
+    #undef  CAM_USE_ZOOM_FOR_MF
+    #undef  CAM_HAS_ERASE_BUTTON
+    #undef  CAM_HAS_IRIS_DIAPHRAGM
+    #define CAM_HAS_ND_FILTER           1
+    #define  CAM_HAS_MANUAL_FOCUS               1
+    #define  CAM_HAS_USER_TV_MODES              1 //include M/P ? needed to make Tv bracketing work
+    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
+    #undef CAM_CHDK_HAS_EXT_VIDEO_MENU
+    #define CAM_NEED_SCREENLOCK          1
+    #define CAM_NEED_VIEWPORT_WIDTH      1
+    #undef CAM_UNCACHED_BIT  // shut up compiler
+    #define CAM_UNCACHED_BIT    0x40000000
+    #undef CAM_BITMAP_PALETTE
+    #define CAM_BITMAP_PALETTE    2
+
+        #undef CAM_BLACK_LEVEL
+    #define CAM_BLACK_LEVEL             127
+//    #define CAM_HAS_JOGDIAL             1
+//    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
+//    #define CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 1
+        // disabled until we get movie task running
+    #undef CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
+//    #define CAM_REMOTE 1
+//   #define CAM_SYNCH  1 
+        #undef CAM_SENSOR_BITS_PER_PIXEL
+    #define CAM_SENSOR_BITS_PER_PIXEL   12
+        #undef CAM_WHITE_LEVEL
+    #define CAM_WHITE_LEVEL             ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1)
+
+    #define DNG_SUPPORT                 1
+    // pattern
+//    #define cam_CFAPattern 0x02010100 // Red  Green  Green  Blue
+    #define cam_CFAPattern 0x01000201 // Green  Blue  Red  Green
+    // color TODO
+    #define CAM_COLORMATRIX1                               \
+      837237, 1000000, -290137, 1000000, -128156, 1000000, \
+      -127762, 1000000, 643909, 1000000,  52973,  1000000, \
+      4446,  1000000, 88354,   1000000,  224246, 1000000
+    
+    #define cam_CalibrationIlluminant1 1 // Daylight
+    // cropping 
+        // TODO, capture the full frame for now
+    #define CAM_JPEG_WIDTH  4416
+    #define CAM_JPEG_HEIGHT 3312
+    #define CAM_ACTIVE_AREA_X1 12
+    #define CAM_ACTIVE_AREA_Y1 12
+    #define CAM_ACTIVE_AREA_X2 4444
+    #define CAM_ACTIVE_AREA_Y2 3324
+    // camera name
+    #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData sd990: OK
+
+//    #define DNG_EXT_FROM ".CR2"
+
 //==========================================================
 // S-Series
@@ -1537 +1599 @@
 //----------------------------------------------------------
 
+#elif defined (CAMERA_sx10)
+    #define CAM_PROPSET                 2
+    #define CAM_DRYOS                   1
+
+    #define CAM_RAW_ROWPIX              3720   
+    #define CAM_RAW_ROWS                2772   
+    
+    #define CAM_SWIVEL_SCREEN           1
+    #define CAM_ADJUSTABLE_ALT_BUTTON   1
+    #undef  CAM_CAN_SD_OVER_NOT_IN_MF
+    #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
+    #define CAM_HAS_VIDEO_BUTTON       1
+    #undef  CAM_CHDK_HAS_EXT_VIDEO_MENU
+    #define CAM_BRACKETING              1 
+    #undef  CAM_VIDEO_CONTROL
+    #define CAM_MULTIPART               1
+    #define CAM_HAS_JOGDIAL             1
+    #undef  CAM_USE_ZOOM_FOR_MF
+    #undef  CAM_UNCACHED_BIT  // shut up compiler
+    #define CAM_UNCACHED_BIT    0x40000000
+
+//    #undef  OPT_CURVES
+
+    #define DNG_SUPPORT                 1
+    // pattern
+    #define cam_CFAPattern 0x02010100 // Red  Green  Green  Blue
+    // color
+    #define CAM_COLORMATRIX1                               \
+      650591, 1000000, -199585, 1000000, -123118, 1000000, \
+     -69617,  1000000, 583926,  1000000,  34354,  1000000, \
+     -19113,  1000000, 82163,   1000000, 210786,  1000000
+    
+    #define cam_CalibrationIlluminant1 1 // Daylight
+    // cropping
+    #define CAM_JPEG_WIDTH  3648
+    #define CAM_JPEG_HEIGHT 2736
+    #define CAM_ACTIVE_AREA_X1 6
+    #define CAM_ACTIVE_AREA_Y1 12
+    #define CAM_ACTIVE_AREA_X2 3690
+    #define CAM_ACTIVE_AREA_Y2 2772
+    // camera name
+    #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
+    #undef  CAM_SENSOR_BITS_PER_PIXEL
+    #undef  CAM_WHITE_LEVEL
+    #undef  CAM_BLACK_LEVEL
+    #define CAM_SENSOR_BITS_PER_PIXEL   12
+    #define CAM_WHITE_LEVEL             ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1)
+    #define CAM_BLACK_LEVEL             127
+ 
+//----------------------------------------------------------
+
 #else
     #error camera type not defined
@@ -1542 +1655 @@
 #endif
 
+// curves only work in 10bpp for now
+#if CAM_SENSOR_BITS_PER_PIXEL != 10
+#undef OPT_CURVES
+#endif
+
 #endif /* CAMERA_H */

trunk/platform/g9/sub/100d/stubs_entry.S

@@ -68 +68 @@
 NSTUB(SleepTask, 0xff82a610)
 NSTUB(TakeSemaphore, 0xff81b98c)
+// Best match: 58%
+NSTUB(TurnOffBackLight, 0xff87ff88)
+// Best match: 77%
+NSTUB(TurnOnBackLight, 0xff87ff70)
 NSTUB(UIFS_WriteFirmInfoToFile, 0xff99c320)
 NSTUB(UnlockMainPower, 0xff873144)
@@ -125 +129 @@
 NSTUB(vsprintf, 0xff81e6f8)
 NSTUB(write, 0xff81a3d8)
-NSTUB(TurnOffBackLight, 0xff87ff88)
-NSTUB(TurnOnBackLight, 0xff87ff70)

trunk/platform/g9/sub/100g/stubs_entry.S

@@ -68 +68 @@
 NSTUB(SleepTask, 0xff82a610)
 NSTUB(TakeSemaphore, 0xff81b98c)
+// Best match: 58%
+NSTUB(TurnOffBackLight, 0xff87ff88)
+// Best match: 77%
+NSTUB(TurnOnBackLight, 0xff87ff70)
 NSTUB(UIFS_WriteFirmInfoToFile, 0xff99c390)
 NSTUB(UnlockMainPower, 0xff873144)
@@ -125 +129 @@
 NSTUB(vsprintf, 0xff81e6f8)
 NSTUB(write, 0xff81a3d8)
-NSTUB(TurnOffBackLight, 0xff88ff88)
-NSTUB(TurnOnBackLight, 0xff88ff70)