OSDN Git Service

Merge "camera3: Remove noiseModelCoefficients."
authorRuben Brunk <rubenbrunk@google.com>
Sat, 8 Feb 2014 02:57:52 +0000 (02:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 8 Feb 2014 02:57:52 +0000 (02:57 +0000)
1  2 
camera/docs/docs.html
camera/docs/metadata_properties.xml
camera/include/system/camera_metadata_tags.h
camera/src/camera_metadata_tag_info.c

  
              <li><a href="#static_android.sensor.baseGainFactor">android.sensor.baseGainFactor</a></li>
              <li><a href="#static_android.sensor.blackLevelPattern">android.sensor.blackLevelPattern</a></li>
 -            <li><a href="#static_android.sensor.calibrationTransform1">android.sensor.calibrationTransform1</a></li>
 -            <li><a href="#static_android.sensor.calibrationTransform2">android.sensor.calibrationTransform2</a></li>
 -            <li><a href="#static_android.sensor.colorTransform1">android.sensor.colorTransform1</a></li>
 -            <li><a href="#static_android.sensor.colorTransform2">android.sensor.colorTransform2</a></li>
 -            <li><a href="#static_android.sensor.forwardMatrix1">android.sensor.forwardMatrix1</a></li>
 -            <li><a href="#static_android.sensor.forwardMatrix2">android.sensor.forwardMatrix2</a></li>
              <li><a href="#static_android.sensor.maxAnalogSensitivity">android.sensor.maxAnalogSensitivity</a></li>
-             <li><a href="#static_android.sensor.noiseModelCoefficients">android.sensor.noiseModelCoefficients</a></li>
              <li><a href="#static_android.sensor.orientation">android.sensor.orientation</a></li>
              <li><a href="#static_android.sensor.profileHueSatMapDimensions">android.sensor.profileHueSatMapDimensions</a></li>
 -            <li><a href="#static_android.sensor.referenceIlluminant1">android.sensor.referenceIlluminant1</a></li>
 -            <li><a href="#static_android.sensor.referenceIlluminant2">android.sensor.referenceIlluminant2</a></li>
              <li><a href="#static_android.sensor.availableTestPatternModes">android.sensor.availableTestPatternModes</a></li>
            </ul>
          </li>
@@@ -12483,70 -11603,19 +12482,14 @@@ digital.<wbr/></p
             <!-- end of entry -->
          
                  
-           <tr class="entry" id="static_android.sensor.noiseModelCoefficients">
-             <td class="entry_name" rowspan="3">
-               android.<wbr/>sensor.<wbr/>noise<wbr/>Model<wbr/>Coefficients
-             </td>
-             <td class="entry_type">
-                 <span class="entry_type_name">float</span>
-                 <span class="entry_type_container">x</span>
-                 <span class="entry_type_array">
-                   2
-                 </span>
-               <span class="entry_type_visibility"> [system]</span>
-                 <div class="entry_type_notes">float constants A,<wbr/> B for the noise variance model</div>
-             </td> <!-- entry_type -->
-             <td class="entry_description">
-               <p>Estimation of sensor noise
- characteristics</p>
-             </td>
-             <td class="entry_units">
-               var(raw pixel value) = electrons * (baseGainFactor
-           * iso/<wbr/>100)^2 + A * (baseGainFactor * iso/<wbr/>100)^2 +
-           B
-             </td>
-             <td class="entry_range">
-             </td>
-             <td class="entry_tags">
-               <ul class="entry_tags">
-                   <li><a href="#tag_V1">V1</a></li>
-               </ul>
-             </td>
-           </tr>
-           <tr class="entries_header">
-             <th class="th_details" colspan="5">Details</th>
-           </tr>
-           <tr class="entry_cont">
-             <td class="entry_details" colspan="5">
-               <p>A represents sensor read noise before analog
- amplification; B represents noise from A/<wbr/>D conversion and
- other circuits after amplification.<wbr/> Both noise sources
- are assumed to be gaussian,<wbr/> independent,<wbr/> and not to vary
- across the sensor</p>
-             </td>
-           </tr>
-           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
-            <!-- end of entry -->
-         
-                 
 -          <tr class="entry" id="static_android.sensor.calibrationTransform2">
 +          <tr class="entry" id="static_android.sensor.orientation">
              <td class="entry_name" rowspan="1">
 -              android.<wbr/>sensor.<wbr/>calibration<wbr/>Transform2
 +              android.<wbr/>sensor.<wbr/>orientation
              </td>
              <td class="entry_type">
 -                <span class="entry_type_name">rational</span>
 -                <span class="entry_type_container">x</span>
 +                <span class="entry_type_name">int32</span>
  
 -                <span class="entry_type_array">
 -                  9
 -                </span>
 -              <span class="entry_type_visibility"> [system]</span>
 -                <div class="entry_type_notes">3x3 matrix in row-major-order</div>
 +              <span class="entry_type_visibility"> [public]</span>
  
  
              </td> <!-- entry_type -->
Simple merge
@@@ -276,16 -273,19 +276,15 @@@ typedef enum camera_metadata_tag 
      ANDROID_SENSOR_SENSITIVITY,                       // int32        | public
      ANDROID_SENSOR_BASE_GAIN_FACTOR,                  // rational     | public
      ANDROID_SENSOR_BLACK_LEVEL_PATTERN,               // int32[]      | public
 -    ANDROID_SENSOR_CALIBRATION_TRANSFORM1,            // rational[]   | system
 -    ANDROID_SENSOR_CALIBRATION_TRANSFORM2,            // rational[]   | system
 -    ANDROID_SENSOR_COLOR_TRANSFORM1,                  // rational[]   | system
 -    ANDROID_SENSOR_COLOR_TRANSFORM2,                  // rational[]   | system
 -    ANDROID_SENSOR_FORWARD_MATRIX1,                   // rational[]   | system
 -    ANDROID_SENSOR_FORWARD_MATRIX2,                   // rational[]   | system
      ANDROID_SENSOR_MAX_ANALOG_SENSITIVITY,            // int32        | public
-     ANDROID_SENSOR_NOISE_MODEL_COEFFICIENTS,          // float[]      | system
      ANDROID_SENSOR_ORIENTATION,                       // int32        | public
      ANDROID_SENSOR_PROFILE_HUE_SAT_MAP_DIMENSIONS,    // int32[]      | public
 -    ANDROID_SENSOR_REFERENCE_ILLUMINANT1,             // enum         | system
 -    ANDROID_SENSOR_REFERENCE_ILLUMINANT2,             // byte         | system
      ANDROID_SENSOR_TIMESTAMP,                         // int64        | public
      ANDROID_SENSOR_TEMPERATURE,                       // float        | public
 +    ANDROID_SENSOR_REFERENCE_ILLUMINANT,              // enum         | system
 +    ANDROID_SENSOR_CALIBRATION_TRANSFORM,             // rational[]   | public
 +    ANDROID_SENSOR_COLOR_TRANSFORM,                   // rational[]   | public
 +    ANDROID_SENSOR_FORWARD_MATRIX,                    // rational[]   | public
      ANDROID_SENSOR_NEUTRAL_COLOR_POINT,               // rational[]   | public
      ANDROID_SENSOR_PROFILE_HUE_SAT_MAP,               // float[]      | public
      ANDROID_SENSOR_PROFILE_TONE_CURVE,                // float[]      | public
@@@ -427,10 -417,26 +427,8 @@@ static tag_info_t android_sensor[ANDROI
                  },
      [ ANDROID_SENSOR_BLACK_LEVEL_PATTERN - ANDROID_SENSOR_START ] =
      { "blackLevelPattern",             TYPE_INT32  },
 -    [ ANDROID_SENSOR_CALIBRATION_TRANSFORM1 - ANDROID_SENSOR_START ] =
 -    { "calibrationTransform1",         TYPE_RATIONAL
 -                },
 -    [ ANDROID_SENSOR_CALIBRATION_TRANSFORM2 - ANDROID_SENSOR_START ] =
 -    { "calibrationTransform2",         TYPE_RATIONAL
 -                },
 -    [ ANDROID_SENSOR_COLOR_TRANSFORM1 - ANDROID_SENSOR_START ] =
 -    { "colorTransform1",               TYPE_RATIONAL
 -                },
 -    [ ANDROID_SENSOR_COLOR_TRANSFORM2 - ANDROID_SENSOR_START ] =
 -    { "colorTransform2",               TYPE_RATIONAL
 -                },
 -    [ ANDROID_SENSOR_FORWARD_MATRIX1 - ANDROID_SENSOR_START ] =
 -    { "forwardMatrix1",                TYPE_RATIONAL
 -                },
 -    [ ANDROID_SENSOR_FORWARD_MATRIX2 - ANDROID_SENSOR_START ] =
 -    { "forwardMatrix2",                TYPE_RATIONAL
 -                },
      [ ANDROID_SENSOR_MAX_ANALOG_SENSITIVITY - ANDROID_SENSOR_START ] =
      { "maxAnalogSensitivity",          TYPE_INT32  },
-     [ ANDROID_SENSOR_NOISE_MODEL_COEFFICIENTS - ANDROID_SENSOR_START ] =
-     { "noiseModelCoefficients",        TYPE_FLOAT  },
      [ ANDROID_SENSOR_ORIENTATION - ANDROID_SENSOR_START ] =
      { "orientation",                   TYPE_INT32  },
      [ ANDROID_SENSOR_PROFILE_HUE_SAT_MAP_DIMENSIONS - ANDROID_SENSOR_START ] =
@@@ -1684,67 -1645,52 +1682,64 @@@ int camera_metadata_enum_snprint(uint32
          case ANDROID_SCALER_AVAILABLE_RAW_SIZES: {
              break;
          }
 -
 -        case ANDROID_SENSOR_EXPOSURE_TIME: {
 +        case ANDROID_SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP: {
              break;
          }
 -        case ANDROID_SENSOR_FRAME_DURATION: {
 +        case ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS: {
 +            switch (value) {
 +                case ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT:
 +                    msg = "OUTPUT";
 +                    ret = 0;
 +                    break;
 +                case ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_INPUT:
 +                    msg = "INPUT";
 +                    ret = 0;
 +                    break;
 +                default:
 +                    msg = "error: enum value out of range";
 +            }
              break;
          }
 -        case ANDROID_SENSOR_SENSITIVITY: {
 +        case ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS: {
              break;
          }
 -        case ANDROID_SENSOR_BASE_GAIN_FACTOR: {
 +        case ANDROID_SCALER_AVAILABLE_STALL_DURATIONS: {
              break;
          }
 -        case ANDROID_SENSOR_BLACK_LEVEL_PATTERN: {
 +
 +        case ANDROID_SENSOR_EXPOSURE_TIME: {
              break;
          }
 -        case ANDROID_SENSOR_CALIBRATION_TRANSFORM1: {
 +        case ANDROID_SENSOR_FRAME_DURATION: {
              break;
          }
 -        case ANDROID_SENSOR_CALIBRATION_TRANSFORM2: {
 +        case ANDROID_SENSOR_SENSITIVITY: {
              break;
          }
 -        case ANDROID_SENSOR_COLOR_TRANSFORM1: {
 +        case ANDROID_SENSOR_BASE_GAIN_FACTOR: {
              break;
          }
 -        case ANDROID_SENSOR_COLOR_TRANSFORM2: {
 +        case ANDROID_SENSOR_BLACK_LEVEL_PATTERN: {
              break;
          }
 -        case ANDROID_SENSOR_FORWARD_MATRIX1: {
 +        case ANDROID_SENSOR_MAX_ANALOG_SENSITIVITY: {
              break;
          }
-         case ANDROID_SENSOR_NOISE_MODEL_COEFFICIENTS: {
-             break;
-         }
 -        case ANDROID_SENSOR_FORWARD_MATRIX2: {
 +        case ANDROID_SENSOR_ORIENTATION: {
              break;
          }
 -        case ANDROID_SENSOR_MAX_ANALOG_SENSITIVITY: {
 +        case ANDROID_SENSOR_PROFILE_HUE_SAT_MAP_DIMENSIONS: {
              break;
          }
 -        case ANDROID_SENSOR_ORIENTATION: {
 +        case ANDROID_SENSOR_TIMESTAMP: {
              break;
          }
 -        case ANDROID_SENSOR_PROFILE_HUE_SAT_MAP_DIMENSIONS: {
 +        case ANDROID_SENSOR_TEMPERATURE: {
              break;
          }
 -        case ANDROID_SENSOR_REFERENCE_ILLUMINANT1: {
 +        case ANDROID_SENSOR_REFERENCE_ILLUMINANT: {
              switch (value) {
 -                case ANDROID_SENSOR_REFERENCE_ILLUMINANT1_DAYLIGHT:
 +                case ANDROID_SENSOR_REFERENCE_ILLUMINANT_DAYLIGHT:
                      msg = "DAYLIGHT";
                      ret = 0;
                      break;