| commit | 1212e59d1a4c50e5edb9d6a1b2560f7e047b52a9 | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Thu Jun 02 18:17:37 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 02 18:17:37 2016 +0000 |
| tree | 7bf5d9a92340eec0d6117ac3bd03c3f3bcb55e48 | |
| parent | 30689c9e4c7cbcfb1f537f224ab1b50f5fe0efa6 [diff] | |
| parent | 470241b168a9db7514bc0df775109db591836d4b [diff] |
Merge "Camera: Add media/camera NDK documents" into nyc-dev am: 470241b168 * commit '470241b168a9db7514bc0df775109db591836d4b': Camera: Add media/camera NDK documents Change-Id: Ib66856fba84301834a81f0c361f5244bd152eeb3
diff --git a/docs/Doxyfile b/docs/Doxyfile index 46d6d84..3ea453f 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile
@@ -677,7 +677,7 @@ # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = ../include/android +INPUT = ../include/android ../../av/include/ndk ../../av/include/camera/ndk # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
diff --git a/docs/images/camera2/metadata/android.colorCorrection.mode/processing_pipeline.png b/docs/images/camera2/metadata/android.colorCorrection.mode/processing_pipeline.png new file mode 100644 index 0000000..7578b48 --- /dev/null +++ b/docs/images/camera2/metadata/android.colorCorrection.mode/processing_pipeline.png Binary files differ
diff --git a/docs/images/camera2/metadata/android.statistics.lensShadingMap/blue_shading.png b/docs/images/camera2/metadata/android.statistics.lensShadingMap/blue_shading.png new file mode 100644 index 0000000..7b10f6b --- /dev/null +++ b/docs/images/camera2/metadata/android.statistics.lensShadingMap/blue_shading.png Binary files differ
diff --git a/docs/images/camera2/metadata/android.statistics.lensShadingMap/green_e_shading.png b/docs/images/camera2/metadata/android.statistics.lensShadingMap/green_e_shading.png new file mode 100644 index 0000000..41972cf --- /dev/null +++ b/docs/images/camera2/metadata/android.statistics.lensShadingMap/green_e_shading.png Binary files differ
diff --git a/docs/images/camera2/metadata/android.statistics.lensShadingMap/green_o_shading.png b/docs/images/camera2/metadata/android.statistics.lensShadingMap/green_o_shading.png new file mode 100644 index 0000000..d26600b --- /dev/null +++ b/docs/images/camera2/metadata/android.statistics.lensShadingMap/green_o_shading.png Binary files differ
diff --git a/docs/images/camera2/metadata/android.statistics.lensShadingMap/inv_shading.png b/docs/images/camera2/metadata/android.statistics.lensShadingMap/inv_shading.png new file mode 100644 index 0000000..1e7208e --- /dev/null +++ b/docs/images/camera2/metadata/android.statistics.lensShadingMap/inv_shading.png Binary files differ
diff --git a/docs/images/camera2/metadata/android.statistics.lensShadingMap/red_shading.png b/docs/images/camera2/metadata/android.statistics.lensShadingMap/red_shading.png new file mode 100644 index 0000000..ecef3ae --- /dev/null +++ b/docs/images/camera2/metadata/android.statistics.lensShadingMap/red_shading.png Binary files differ
diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png new file mode 100644 index 0000000..a02fd89 --- /dev/null +++ b/docs/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png Binary files differ
diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png new file mode 100644 index 0000000..c309ac5 --- /dev/null +++ b/docs/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png Binary files differ
diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png new file mode 100644 index 0000000..414fad4 --- /dev/null +++ b/docs/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png Binary files differ
diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png new file mode 100644 index 0000000..c147a87 --- /dev/null +++ b/docs/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png Binary files differ
diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png new file mode 100644 index 0000000..4ce2125 --- /dev/null +++ b/docs/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png Binary files differ
