Changeset 1410 for trunk

Timestamp:

11/12/11 21:48:56 (19 months ago)

Author:

philmoz

Message:

Add optional lens info to DNG files. To have this included define CAM_DNG_LENS_INFO in platform_camera.h (see the comments in camera.h for the data format).
Enabled for G12, SX30 and IXUS310.

Location:

trunk

Files:

• core/dng.c (modified) (2 diffs)
• include/camera.h (modified) (1 diff)
• platform/g12/platform_camera.h (modified) (1 diff)
• platform/ixus310_elph500hs/platform_camera.h (modified) (1 diff)
• platform/sx30/platform_camera.h (modified) (1 diff)

trunk/core/dng.c

@@ -12 +12 @@
 const int cam_ActiveArea[]={CAM_ACTIVE_AREA_Y1, CAM_ACTIVE_AREA_X1, CAM_ACTIVE_AREA_Y2, CAM_ACTIVE_AREA_X2};
 const int cam_DefaultCropOrigin[]={CAM_DEFAULT_CROP_ORIGIN_W,CAM_DEFAULT_CROP_ORIGIN_H};
+#if defined(CAM_DNG_LENS_INFO)
+const int cam_lensinfo[] = CAM_DNG_LENS_INFO;
+#endif
 #if defined(CAM_DNG_EXPOSURE_BIAS)
 const int cam_BaselineExposure[]={CAM_DNG_EXPOSURE_BIAS};
@@ -64 +67 @@
  {0xC62C, T_RATIONAL,  1,  (int)cam_BaselineSharpness},
  {0xC62E, T_RATIONAL,  1,  (int)cam_LinearResponseLimit},
+#if defined(CAM_DNG_LENS_INFO)
+ {0xC630, T_RATIONAL,  4,  (int)cam_lensinfo},
+#endif
  {0xC65A, T_SHORT,     1,  cam_CalibrationIlluminant1}, 
  {0}

trunk/include/camera.h

@@ -148 +148 @@
                                                 // This reduces the file size by approx 45%
 
+#undef  CAM_DNG_LENS_INFO                       // Define this to include camera lens information in DNG files
+                                                // Value should be an array of 4 DNG 'RATIONAL' values specifying
+                                                //   - min focal length in mm
+                                                //   - max focal length in mm
+                                                //   - max aperture at min focal length
+                                                //   - max aperture at max focal length
+                                                // E.G - SX30 = { 43,10, 1505,10, 27,10, 58,10 }
+                                                //            = 4.3 - 150.5mm, f/2.7 - f.5.8
+                                                // Each pair of integers is one 'RATIONAL' value (numerator,denominator)
+
 #undef  PARAM_CAMERA_NAME                        // parameter number for GetParameterData to get camera name
 

trunk/platform/g12/platform_camera.h

@@ -75 +75 @@
         #define CAM_DNG_EXPOSURE_BIAS           0,1             // Specify DNG exposure bias value to 0 (to override default of -0.5 in the dng.c code)
 
-        //need fixing *****************************************************
+    #define     CAM_DNG_LENS_INFO           { 61,10, 305,10, 28,10, 45,10 }     // See comments in camera.h
+
     #define cam_CalibrationIlluminant1  17              // Standard Light A
-/*
-    #define CAM_COLORMATRIX1                               \
-      14134, 100000, -5576, 100000, -1527, 100000, \
-      -1991, 100000, 10719, 100000,  1273, 100000, \
-      -1158, 100000,  1929, 100000,  3581, 100000
-*/
     // From dcraw
     #define CAM_COLORMATRIX1                       \

trunk/platform/ixus310_elph500hs/platform_camera.h

@@ -88 +88 @@
         #define CAM_DNG_EXPOSURE_BIAS           0,1             // Specify DNG exposure bias value to 0 (to override default of -0.5 in the dng.c code)
 
+    #define     CAM_DNG_LENS_INFO           { 43,10, 188,10, 20,10, 58,10 }     // See comments in camera.h
+
         //need fixing *****************************************************
 /*

trunk/platform/sx30/platform_camera.h

@@ -53 +53 @@
 
         #define CAM_DNG_EXPOSURE_BIAS           0,1             // Specify DNG exposure bias value to 0 (to override default of -0.5 in the dng.c code)
+
+    #define     CAM_DNG_LENS_INFO           { 43,10, 1505,10, 27,10, 58,10 }    // See comments in camera.h
 
         // TODO - Still needs work