diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2011-04-25 09:39:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-25 09:39:28 -0700 |
| commit | 185052e2d1b8b4eb9df5f47e6d7fd05acb739b84 (patch) | |
| tree | e6345d0958bd112beee8810e2a6cc4087218e492 /include | |
| parent | a8965da9886496952c6f97a402c4682ee1e37c81 (diff) | |
| parent | 4e396e063c8b0fa6201b47166f547a98abfd6038 (diff) | |
| download | frameworks_base-185052e2d1b8b4eb9df5f47e6d7fd05acb739b84.zip frameworks_base-185052e2d1b8b4eb9df5f47e6d7fd05acb739b84.tar.gz frameworks_base-185052e2d1b8b4eb9df5f47e6d7fd05acb739b84.tar.bz2 | |
Merge "Clarify the meaning of weight in the focus and metering area HAL."
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/CameraParameters.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index e272839..db81721 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -265,11 +265,12 @@ public: // (-1000,-1000) is the upper left point. (1000, 1000) is the lower right // point. The length and width of focus areas cannot be 0 or negative. // - // The fifth element is the weight. The weight ranges from 1 to 1000. - // The sum of the weights of all focus areas must be 1000. Focus areas - // can partially overlap and the driver will add the weights in the - // overlap region. But apps should not set two focus areas that have - // identical coordinates. + // The fifth element is the weight. Values for weight must range from 1 to + // 1000. The weight should be interpreted as a per-pixel weight - all + // pixels in the area have the specified weight. This means a small area + // with the same weight as a larger area will have less influence on the + // focusing than the larger area. Focus areas can partially overlap and the + // driver will add the weights in the overlap region. // // A special case of single focus area (0,0,0,0,0) means driver to decide // the focus area. For example, the driver may use more signals to decide @@ -327,10 +328,12 @@ public: // is the lower right point. The length and width of metering areas cannot // be 0 or negative. // - // The weight ranges from 1 to 1000. The sum of the weights of all metering - // areas must be 1000. Metering areas can partially overlap and the driver - // will add the weights in the overlap region. But apps should not set two - // metering areas that have identical coordinates. + // The fifth element is the weight. Values for weight must range from 1 to + // 1000. The weight should be interpreted as a per-pixel weight - all + // pixels in the area have the specified weight. This means a small area + // with the same weight as a larger area will have less influence on the + // metering than the larger area. Metering areas can partially overlap and + // the driver will add the weights in the overlap region. // // A special case of all-zero single metering area means driver to decide // the metering area. For example, the driver may use more signals to decide |