From 2569725e938810d592a57160770a310f176adb81 Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Wed, 23 Jul 2014 15:13:16 -0700 Subject: [PATCH] camera2: Move noise model to dynamic metadata. Bug: 16369384 Change-Id: I7a540705176c7be68431a977e2b7218ffa1bddd0 --- camera/docs/docs.html | 164 +++++++++++++-------------- camera/docs/metadata_properties.xml | 82 +++++++------- camera/include/system/camera_metadata_tags.h | 2 +- camera/src/camera_metadata_tag_info.c | 10 +- 4 files changed, 129 insertions(+), 129 deletions(-) diff --git a/camera/docs/docs.html b/camera/docs/docs.html index 7ec7d687..e1b4363b 100644 --- a/camera/docs/docs.html +++ b/camera/docs/docs.html @@ -774,8 +774,6 @@
  • android.sensor.profileHueSatMapDimensions
  • android.sensor.noiseProfile
    • -
  • android.sensor.availableTestPatternModes
    • @@ -795,6 +793,8 @@
  • android.sensor.neutralColorPoint
  • android.sensor.noiseProfile
    • +
  • android.sensor.profileHueSatMap
  • android.sensor.profileToneCurve
    • @@ -17273,85 +17273,6 @@ element.

    - - - android.sensor.noiseProfile - - - double - x - - - 2 x CFA Channels - - [public as pairDoubleDouble] - - - -
    Pairs of noise model coefficients
    - - - - - -

    Noise model coefficients for each CFA mosaic channel.

    - - - - - - - - - - - - - - - Details - - - -

    This tag contains two noise model coefficients for each CFA channel -corresponding to the sensor amplification (S) and sensor readout -noise (O). These are given as pairs of coefficients for each channel -in the same order as channels listed for the CFA layout tag -(see android.sensor.info.colorFilterArrangement). This is -represented as an array of Pair<Double, Double>, where -the first member of the Pair at index n is the S coefficient and the -second member is the O coefficient for the nth color channel in the CFA.

    -

    These coefficients are used in a two parameter noise model to describe -the amount of noise present in the image for each CFA channel. The -noise model used here is:

    -

    N(x) = sqrt(Sx + O)

    -

    Where x represents the recorded signal of a CFA channel normalized to -the range [0, 1], and S and O are the noise model coeffiecients for -that channel.

    -

    A more detailed description of the noise model can be found in the -Adobe DNG specification for the NoiseProfile tag.

    - - - - - HAL Implementation Details - - - -

    For a CFA layout of RGGB, the list of coefficients would be given as -an array of doubles S0,O0,S1,O1,..., where S0 and O0 are the coefficients -for the red channel, S1 and O1 are the coefficients for the first green -channel, etc.

    - - - - - - - @@ -17853,6 +17774,85 @@ processing raw sensor data.

    + + + android.sensor.noiseProfile + + + double + x + + + 2 x CFA Channels + + [public as pairDoubleDouble] + + + +
    Pairs of noise model coefficients
    + + + + + +

    Noise model coefficients for each CFA mosaic channel.

    + + + + + + + + + + + + + + + Details + + + +

    This tag contains two noise model coefficients for each CFA channel +corresponding to the sensor amplification (S) and sensor readout +noise (O). These are given as pairs of coefficients for each channel +in the same order as channels listed for the CFA layout tag +(see android.sensor.info.colorFilterArrangement). This is +represented as an array of Pair<Double, Double>, where +the first member of the Pair at index n is the S coefficient and the +second member is the O coefficient for the nth color channel in the CFA.

    +

    These coefficients are used in a two parameter noise model to describe +the amount of noise present in the image for each CFA channel. The +noise model used here is:

    +

    N(x) = sqrt(Sx + O)

    +

    Where x represents the recorded signal of a CFA channel normalized to +the range [0, 1], and S and O are the noise model coeffiecients for +that channel.

    +

    A more detailed description of the noise model can be found in the +Adobe DNG specification for the NoiseProfile tag.

    + + + + + HAL Implementation Details + + + +

    For a CFA layout of RGGB, the list of coefficients would be given as +an array of doubles S0,O0,S1,O1,..., where S0 and O0 are the coefficients +for the red channel, S1 and O1 are the coefficients for the first green +channel, etc.

    + + + + + + + @@ -22495,8 +22495,8 @@ to know when sensor settings have been applied.

  • android.sensor.forwardMatrix2 (static)
  • android.sensor.blackLevelPattern (static)
  • android.sensor.profileHueSatMapDimensions (static)
    • -
  • android.sensor.noiseProfile (static)
  • android.sensor.neutralColorPoint (dynamic)
    • +
  • android.sensor.noiseProfile (dynamic)
  • android.sensor.profileHueSatMap (dynamic)
  • android.sensor.profileToneCurve (dynamic)
  • android.sensor.greenSplit (dynamic)
    • diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml index 3edff047..02a98094 100644 --- a/camera/docs/metadata_properties.xml +++ b/camera/docs/metadata_properties.xml @@ -5221,47 +5221,6 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata - - - 2 - CFA Channels - - - Noise model coefficients for each CFA mosaic channel. - -
    - This tag contains two noise model coefficients for each CFA channel - corresponding to the sensor amplification (S) and sensor readout - noise (O). These are given as pairs of coefficients for each channel - in the same order as channels listed for the CFA layout tag - (see android.sensor.info.colorFilterArrangement). This is - represented as an array of Pair&lt;Double, Double&gt;, where - the first member of the Pair at index n is the S coefficient and the - second member is the O coefficient for the nth color channel in the CFA. - - These coefficients are used in a two parameter noise model to describe - the amount of noise present in the image for each CFA channel. The - noise model used here is: - - N(x) = sqrt(Sx + O) - - Where x represents the recorded signal of a CFA channel normalized to - the range [0, 1], and S and O are the noise model coeffiecients for - that channel. - - A more detailed description of the noise model can be found in the - Adobe DNG specification for the NoiseProfile tag. -
    - - For a CFA layout of RGGB, the list of coefficients would be given as - an array of doubles S0,O0,S1,O1,..., where S0 and O0 are the coefficients - for the red channel, S1 and O1 are the coefficients for the first green - channel, etc. - - -     @@ -5337,6 +5296,47 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata + + + 2 + CFA Channels + + + Noise model coefficients for each CFA mosaic channel. + +
    + This tag contains two noise model coefficients for each CFA channel + corresponding to the sensor amplification (S) and sensor readout + noise (O). These are given as pairs of coefficients for each channel + in the same order as channels listed for the CFA layout tag + (see android.sensor.info.colorFilterArrangement). This is + represented as an array of Pair&lt;Double, Double&gt;, where + the first member of the Pair at index n is the S coefficient and the + second member is the O coefficient for the nth color channel in the CFA. + + These coefficients are used in a two parameter noise model to describe + the amount of noise present in the image for each CFA channel. The + noise model used here is: + + N(x) = sqrt(Sx + O) + + Where x represents the recorded signal of a CFA channel normalized to + the range [0, 1], and S and O are the noise model coeffiecients for + that channel. + + A more detailed description of the noise model can be found in the + Adobe DNG specification for the NoiseProfile tag. +
    + + For a CFA layout of RGGB, the list of coefficients would be given as + an array of doubles S0,O0,S1,O1,..., where S0 and O0 are the coefficients + for the red channel, S1 and O1 are the coefficients for the first green + channel, etc. + + +