Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 185052e2 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Clarify the meaning of weight in the focus and metering area HAL."

parents a8965da9 4e396e06

core/java/android/hardware/Camera.java

+11 −8
Original line number Diff line number Diff line
@@ -2600,10 +2600,12 @@ public class Camera { 
         * (1000, 1000) is the lower right point. The length and width of focus

         * areas cannot be 0 or negative.

         *

         * 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 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 all-zero single focus area means driver to decide

         * the focus area. For example, the driver may use more signals to
@@ -2668,10 +2670,11 @@ public class Camera { 
         * point. (1000, 1000) 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 weight must range from 1 to 1000, and represents a weight for

         * every pixel in the area. This means that a large metering area with

         * the same weight as a smaller area will have more effect in the

         * metering result.  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

include/camera/CameraParameters.h

+12 −9
Original line number Diff line number Diff line
@@ -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