drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9b6a8ab8: Add camera parameters constants and methods.

Browse Source 
Merge commit '9b6a8ab8221f2df20c32711b0f1e4f301165fac2' into eclair-plus-aosp

* commit '9b6a8ab8221f2df20c32711b0f1e4f301165fac2':
  Add camera parameters constants and methods.
This commit is contained in:
Wu-cheng Li
2009-09-01 22:01:00 -07:00
committed by Android Git Automerger
parent 9073dc69b1 9b6a8ab822
commit eb05398fcc
2 changed files with 1426 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

820
api/current.xml
View File

@ -65052,6 +65052,39 @@
<parameter name="key" type="java.lang.String"> <parameter name="key" type="java.lang.String">
</parameter> </parameter>
</method> </method>
<method name="getAntibanding"
return="java.lang.String"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getColorEffect"
return="java.lang.String"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getFlashMode"
return="java.lang.String"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getInt" <method name="getInt"
return="int" return="int"
abstract="false" abstract="false"
@ -65065,6 +65098,39 @@
<parameter name="key" type="java.lang.String"> <parameter name="key" type="java.lang.String">
</parameter> </parameter>
</method> </method>
<method name="getJpegQuality"
return="int"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getJpegThumbnailQuality"
return="int"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getJpegThumbnailSize"
return="android.hardware.Camera.Size"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getPictureFormat" <method name="getPictureFormat"
return="int" return="int"
abstract="false" abstract="false"
@ -65120,6 +65186,138 @@
visibility="public" visibility="public"
> >
</method> </method>
<method name="getSceneMode"
return="java.lang.String"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedAntibanding"
return="java.util.List&lt;java.lang.String&gt;"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedColorEffects"
return="java.util.List&lt;java.lang.String&gt;"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedFlashModes"
return="java.util.List&lt;java.lang.String&gt;"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedPictureFormats"
return="java.util.List&lt;java.lang.Integer&gt;"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedPictureSizes"
return="java.util.List&lt;android.hardware.Camera.Size&gt;"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedPreviewFormats"
return="java.util.List&lt;java.lang.Integer&gt;"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedPreviewFrameRates"
return="java.util.List&lt;java.lang.Integer&gt;"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedPreviewSizes"
return="java.util.List&lt;android.hardware.Camera.Size&gt;"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedSceneModes"
return="java.util.List&lt;java.lang.String&gt;"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedWhiteBalance"
return="java.util.List&lt;java.lang.String&gt;"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getWhiteBalance"
return="java.lang.String"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="remove" <method name="remove"
return="void" return="void"
abstract="false" abstract="false"
@ -65133,6 +65331,17 @@
<parameter name="key" type="java.lang.String"> <parameter name="key" type="java.lang.String">
</parameter> </parameter>
</method> </method>
<method name="removeGpsData"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="set" <method name="set"
return="void" return="void"
abstract="false" abstract="false"
@ -65163,6 +65372,138 @@
<parameter name="value" type="int"> <parameter name="value" type="int">
</parameter> </parameter>
</method> </method>
<method name="setAntibanding"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="antibanding" type="java.lang.String">
</parameter>
</method>
<method name="setColorEffect"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="value" type="java.lang.String">
</parameter>
</method>
<method name="setFlashMode"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="value" type="java.lang.String">
</parameter>
</method>
<method name="setGpsAltitude"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="altitude" type="double">
</parameter>
</method>
<method name="setGpsLatitude"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="latitude" type="double">
</parameter>
</method>
<method name="setGpsLongitude"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="longitude" type="double">
</parameter>
</method>
<method name="setGpsTimestamp"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="timestamp" type="long">
</parameter>
</method>
<method name="setJpegQuality"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="quality" type="int">
</parameter>
</method>
<method name="setJpegThumbnailQuality"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="quality" type="int">
</parameter>
</method>
<method name="setJpegThumbnailSize"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="width" type="int">
</parameter>
<parameter name="height" type="int">
</parameter>
</method>
<method name="setPictureFormat" <method name="setPictureFormat"
return="void" return="void"
abstract="false" abstract="false"
@ -65232,6 +65573,45 @@
<parameter name="height" type="int"> <parameter name="height" type="int">
</parameter> </parameter>
</method> </method>
<method name="setRotation"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="rotation" type="int">
</parameter>
</method>
<method name="setSceneMode"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="value" type="java.lang.String">
</parameter>
</method>
<method name="setWhiteBalance"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="value" type="java.lang.String">
</parameter>
</method>
<method name="unflatten" <method name="unflatten"
return="void" return="void"
abstract="false" abstract="false"
@ -65245,6 +65625,446 @@
<parameter name="flattened" type="java.lang.String"> <parameter name="flattened" type="java.lang.String">
</parameter> </parameter>
</method> </method>
<field name="ANTIBANDING_50HZ"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;50hz&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="ANTIBANDING_60HZ"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;60hz&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="ANTIBANDING_AUTO"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;auto&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="ANTIBANDING_OFF"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;off&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_AQUA"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;aqua&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_BLACKBOARD"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;blackboard&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_MONO"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;mono&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_NEGATIVE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;negative&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_NONE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;none&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_POSTERIZE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;posterize&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_SEPIA"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;sepia&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_SOLARIZE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;solarize&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_WHITEBOARD"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;whiteboard&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FLASH_MODE_AUTO"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;auto&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FLASH_MODE_OFF"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;off&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FLASH_MODE_ON"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;on&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FLASH_MODE_RED_EYE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;red-eye&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_ACTION"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;action&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_AUTO"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;auto&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_BEACH"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;beach&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_CANDLELIGHT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;candlelight&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_FIREWORKS"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;fireworks&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_LANDSCAPE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;landscape&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_NIGHT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;night&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_NIGHT_PORTRAIT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;night-portrait&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_PARTY"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;party&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_PORTRAIT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;portrait&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_SNOW"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;snow&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_SPORTS"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;sports&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_STEADYPHOTO"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;steadyphoto&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_SUNSET"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;sunset&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_THEATRE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;theatre&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="WHITE_BALANCE_AUTO"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;auto&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="WHITE_BALANCE_CLOUDY_DAYLIGHT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;cloudy-daylight&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="WHITE_BALANCE_DAYLIGHT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;daylight&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="WHITE_BALANCE_FLUORESCENT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;fluorescent&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="WHITE_BALANCE_INCANDESCENT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;incandescent&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="WHITE_BALANCE_SHADE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;shade&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="WHITE_BALANCE_TWILIGHT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;twilight&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="WHITE_BALANCE_WARM_FLUORESCENT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;warm-fluorescent&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
</class> </class>
<interface name="Camera.PictureCallback" <interface name="Camera.PictureCallback"
abstract="true" abstract="true"

650
core/java/android/hardware/Camera.java
View File

@ -17,7 +17,9 @@
package android.hardware; package android.hardware;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.io.IOException; import java.io.IOException;
@ -114,7 +116,7 @@ public class Camera {
* MediaRecorder is done with the Camera, this method can be used to * MediaRecorder is done with the Camera, this method can be used to
* re-establish a connection with the camera hardware. NOTE: The Camera * re-establish a connection with the camera hardware. NOTE: The Camera
* object must first be unlocked by the process that owns it before it * object must first be unlocked by the process that owns it before it
* can be connected to another proces. * can be connected to another process.
* *
* @throws IOException if the method fails. * @throws IOException if the method fails.
* *
@ -139,7 +141,7 @@ public class Camera {
public native final int lock(); public native final int lock();
/** /**
* Unlock the camera to allow aother process to access it. To save * Unlock the camera to allow another process to access it. To save
* setup/teardown time, a client of Camera can pass an initialized Camera * setup/teardown time, a client of Camera can pass an initialized Camera
* object to another process. This method is used to unlock the Camera * object to another process. This method is used to unlock the Camera
* object before handing off the Camera object to the other process. * object before handing off the Camera object to the other process.
@ -177,8 +179,12 @@ public class Camera {
/** /**
* The callback that delivers the preview frames. * The callback that delivers the preview frames.
* *
* @param data The contents of the preview frame in getPreviewFormat() * @param data The contents of the preview frame in {@link
* format. * android.hardware.Camera.Parameters#getPreviewFormat()}
* format. If {@link
* android.hardware.Camera.Parameters#setPreviewFormat()}
* is never called, the default will be the YCbCr_420_SP
* (NV21) format.
* @param camera The Camera service object. * @param camera The Camera service object.
*/ */
void onPreviewFrame(byte[] data, Camera camera); void onPreviewFrame(byte[] data, Camera camera);
@ -321,7 +327,9 @@ public class Camera {
public interface AutoFocusCallback public interface AutoFocusCallback
{ {
/** /**
* Callback for the camera auto focus. * Callback for the camera auto focus. If the camera does not support
* auto-focus and autoFocus is called, onAutoFocus will be called
* immediately with success.
* *
* @param success true if focus was successful, false if otherwise * @param success true if focus was successful, false if otherwise
* @param camera the Camera service object * @param camera the Camera service object
@ -330,9 +338,10 @@ public class Camera {
}; };
/** /**
* Starts auto-focus function and registers a callback function to * Starts auto-focus function and registers a callback function to run when
* run when camera is focused. Only valid after startPreview() has * camera is focused. Only valid after startPreview() has been called. If
* been called. * the camera does not support auto-focus, it is a no-op and {@link
* AutoFocusCallback#onAutoFocus} callback will be called immediately.
* *
* @param cb the callback to run * @param cb the callback to run
*/ */
@ -369,15 +378,15 @@ public class Camera {
}; };
/** /**
* Triggers an asynchronous image capture. The camera service * Triggers an asynchronous image capture. The camera service will initiate
* will initiate a series of callbacks to the application as the * a series of callbacks to the application as the image capture progresses.
* image capture progresses. The shutter callback occurs after * The shutter callback occurs after the image is captured. This can be used
* the image is captured. This can be used to trigger a sound * to trigger a sound to let the user know that image has been captured. The
* to let the user know that image has been captured. The raw * raw callback occurs when the raw image data is available (NOTE: the data
* callback occurs when the raw image data is available. The jpeg * may be null if the hardware does not have enough memory to make a copy).
* callback occurs when the compressed image is available. If the * The jpeg callback occurs when the compressed image is available. If the
* application does not need a particular callback, a null can be * application does not need a particular callback, a null can be passed
* passed instead of a callback method. * instead of a callback method.
* *
* @param shutter callback after the image is captured, may be null * @param shutter callback after the image is captured, may be null
* @param raw callback with raw image data, may be null * @param raw callback with raw image data, may be null
@ -390,17 +399,17 @@ public class Camera {
private native final void native_takePicture(); private native final void native_takePicture();
/** /**
* Triggers an asynchronous image capture. The camera service * Triggers an asynchronous image capture. The camera service will initiate
* will initiate a series of callbacks to the application as the * a series of callbacks to the application as the image capture progresses.
* image capture progresses. The shutter callback occurs after * The shutter callback occurs after the image is captured. This can be used
* the image is captured. This can be used to trigger a sound * to trigger a sound to let the user know that image has been captured. The
* to let the user know that image has been captured. The raw * raw callback occurs when the raw image data is available (NOTE: the data
* callback occurs when the raw image data is available. The * may be null if the hardware does not have enough memory to make a copy).
* postview callback occurs when a scaled, fully processed * The postview callback occurs when a scaled, fully processed postview
* postview image is available (NOTE: not all hardware supports * image is available (NOTE: not all hardware supports this). The jpeg
* this). The jpeg callback occurs when the compressed image is * callback occurs when the compressed image is available. If the
* available. If the application does not need a particular * application does not need a particular callback, a null can be passed
* callback, a null can be passed instead of a callback method. * instead of a callback method.
* *
* @param shutter callback after the image is captured, may be null * @param shutter callback after the image is captured, may be null
* @param raw callback with raw image data, may be null * @param raw callback with raw image data, may be null
@ -519,8 +528,111 @@ public class Camera {
/** /**
* Handles the parameters for pictures created by a Camera service. * Handles the parameters for pictures created by a Camera service.
*
* <p>To make camera parameters take effect, applications have to call
* Camera.setParameters. For example, after setWhiteBalance is called, white
* balance is not changed until Camera.setParameters() is called.
*
* <p>Different devices may have different camera capabilities, such as
* picture size or flash modes. The application should query the camera
* capabilities before setting parameters. For example, the application
* should call getSupportedColorEffects before calling setEffect. If the
* camera does not support color effects, getSupportedColorEffects will
* return null.
*/ */
public class Parameters { public class Parameters {
// Parameter keys to communicate with the camera driver.
private static final String KEY_PREVIEW_SIZE = "preview-size";
private static final String KEY_PREVIEW_FORMAT = "preview-format";
private static final String KEY_PREVIEW_FRAME_RATE = "preview-frame-rate";
private static final String KEY_PICTURE_SIZE = "picture-size";
private static final String KEY_PICTURE_FORMAT = "picture-format";
private static final String KEY_JPEG_THUMBNAIL_WIDTH = "jpeg-thumbnail-width";
private static final String KEY_JPEG_THUMBNAIL_HEIGHT = "jpeg-thumbnail-height";
private static final String KEY_JPEG_THUMBNAIL_QUALITY = "jpeg-thumbnail-quality";
private static final String KEY_JPEG_QUALITY = "jpeg-quality";
private static final String KEY_ROTATION = "rotation";
private static final String KEY_GPS_LATITUDE = "gps-latitude";
private static final String KEY_GPS_LONGITUDE = "gps-longitude";
private static final String KEY_GPS_ALTITUDE = "gps-altitude";
private static final String KEY_GPS_TIMESTAMP = "gps-timestamp";
private static final String KEY_WHITE_BALANCE = "whitebalance";
private static final String KEY_EFFECT = "effect";
private static final String KEY_ANTIBANDING = "antibanding";
private static final String KEY_SCENE_MODE = "scene-mode";
private static final String KEY_FLASH_MODE = "flash-mode";
// Parameter key suffix for supported values.
private static final String SUPPORTED_VALUES_SUFFIX = "-values";
// Values for white balance settings.
public static final String WHITE_BALANCE_AUTO = "auto";
public static final String WHITE_BALANCE_INCANDESCENT = "incandescent";
public static final String WHITE_BALANCE_FLUORESCENT = "fluorescent";
public static final String WHITE_BALANCE_WARM_FLUORESCENT = "warm-fluorescent";
public static final String WHITE_BALANCE_DAYLIGHT = "daylight";
public static final String WHITE_BALANCE_CLOUDY_DAYLIGHT = "cloudy-daylight";
public static final String WHITE_BALANCE_TWILIGHT = "twilight";
public static final String WHITE_BALANCE_SHADE = "shade";
// Values for color effect settings.
public static final String EFFECT_NONE = "none";
public static final String EFFECT_MONO = "mono";
public static final String EFFECT_NEGATIVE = "negative";
public static final String EFFECT_SOLARIZE = "solarize";
public static final String EFFECT_SEPIA = "sepia";
public static final String EFFECT_POSTERIZE = "posterize";
public static final String EFFECT_WHITEBOARD = "whiteboard";
public static final String EFFECT_BLACKBOARD = "blackboard";
public static final String EFFECT_AQUA = "aqua";
// Values for antibanding settings.
public static final String ANTIBANDING_AUTO = "auto";
public static final String ANTIBANDING_50HZ = "50hz";
public static final String ANTIBANDING_60HZ = "60hz";
public static final String ANTIBANDING_OFF = "off";
// Values for flash mode settings.
/**
* Flash will not be fired.
*/
public static final String FLASH_MODE_OFF = "off";
/**
* Flash will be fired automatically when required. The timing is
* decided by camera driver.
*/
public static final String FLASH_MODE_AUTO = "auto";
/**
* Flash will always be fired. The timing is decided by camera driver.
*/
public static final String FLASH_MODE_ON = "on";
/**
* Flash will be fired in red-eye reduction mode.
*/
public static final String FLASH_MODE_RED_EYE = "red-eye";
// Values for scene mode settings.
public static final String SCENE_MODE_AUTO = "auto";
public static final String SCENE_MODE_ACTION = "action";
public static final String SCENE_MODE_PORTRAIT = "portrait";
public static final String SCENE_MODE_LANDSCAPE = "landscape";
public static final String SCENE_MODE_NIGHT = "night";
public static final String SCENE_MODE_NIGHT_PORTRAIT = "night-portrait";
public static final String SCENE_MODE_THEATRE = "theatre";
public static final String SCENE_MODE_BEACH = "beach";
public static final String SCENE_MODE_SNOW = "snow";
public static final String SCENE_MODE_SUNSET = "sunset";
public static final String SCENE_MODE_STEADYPHOTO = "steadyphoto";
public static final String SCENE_MODE_FIREWORKS = "fireworks";
public static final String SCENE_MODE_SPORTS = "sports";
public static final String SCENE_MODE_PARTY = "party";
public static final String SCENE_MODE_CANDLELIGHT = "candlelight";
// Formats for setPreviewFormat and setPictureFormat.
private static final String PIXEL_FORMAT_YUV422SP = "yuv422sp";
private static final String PIXEL_FORMAT_YUV420SP = "yuv420sp";
private static final String PIXEL_FORMAT_RGB565 = "rgb565";
private static final String PIXEL_FORMAT_JPEG = "jpeg";
private HashMap<String, String> mMap; private HashMap<String, String> mMap;
private Parameters() { private Parameters() {
@ -645,7 +757,7 @@ public class Camera {
*/ */
public void setPreviewSize(int width, int height) { public void setPreviewSize(int width, int height) {
String v = Integer.toString(width) + "x" + Integer.toString(height); String v = Integer.toString(width) + "x" + Integer.toString(height);
set("preview-size", v); set(KEY_PREVIEW_SIZE, v);
} }
/** /**
@ -655,68 +767,79 @@ public class Camera {
* for the preview picture * for the preview picture
*/ */
public Size getPreviewSize() { public Size getPreviewSize() {
String pair = get("preview-size"); String pair = get(KEY_PREVIEW_SIZE);
if (pair == null) return strToSize(pair);
return null;
String[] dims = pair.split("x");
if (dims.length != 2)
return null;
return new Size(Integer.parseInt(dims[0]),
Integer.parseInt(dims[1]));
} }
/** /**
* Sets the dimensions for EXIF thumbnails. * Gets the supported preview sizes.
*
* @return a List of Size object. null if preview size setting is not
* supported.
*/
public List<Size> getSupportedPreviewSizes() {
String str = get(KEY_PREVIEW_SIZE + SUPPORTED_VALUES_SUFFIX);
return splitSize(str);
}
/**
* Sets the dimensions for EXIF thumbnail in Jpeg picture.
* *
* @param width the width of the thumbnail, in pixels * @param width the width of the thumbnail, in pixels
* @param height the height of the thumbnail, in pixels * @param height the height of the thumbnail, in pixels
*
* FIXME: unhide before release
* @hide
*/ */
public void setThumbnailSize(int width, int height) { public void setJpegThumbnailSize(int width, int height) {
set("jpeg-thumbnail-width", width); set(KEY_JPEG_THUMBNAIL_WIDTH, width);
set("jpeg-thumbnail-height", height); set(KEY_JPEG_THUMBNAIL_HEIGHT, height);
} }
/** /**
* Returns the dimensions for EXIF thumbnail * Returns the dimensions for EXIF thumbnail in Jpeg picture.
* *
* @return a Size object with the height and width setting * @return a Size object with the height and width setting for the EXIF
* for the EXIF thumbnails * thumbnails
*
* FIXME: unhide before release
* @hide
*/ */
public Size getThumbnailSize() { public Size getJpegThumbnailSize() {
return new Size(getInt("jpeg-thumbnail-width"), return new Size(getInt(KEY_JPEG_THUMBNAIL_WIDTH),
getInt("jpeg-thumbnail-height")); getInt(KEY_JPEG_THUMBNAIL_HEIGHT));
} }
/** /**
* Sets the quality of the EXIF thumbnail * Sets the quality of the EXIF thumbnail in Jpeg picture.
* *
* @param quality the JPEG quality of the EXIT thumbnail * @param quality the JPEG quality of the EXIF thumbnail. The range is 1
* * to 100, with 100 being the best.
* FIXME: unhide before release
* @hide
*/ */
public void setThumbnailQuality(int quality) { public void setJpegThumbnailQuality(int quality) {
set("jpeg-thumbnail-quality", quality); set(KEY_JPEG_THUMBNAIL_QUALITY, quality);
} }
/** /**
* Returns the quality setting for the EXIF thumbnail * Returns the quality setting for the EXIF thumbnail in Jpeg picture.
* *
* @return the JPEG quality setting of the EXIF thumbnail * @return the JPEG quality setting of the EXIF thumbnail.
*
* FIXME: unhide before release
* @hide
*/ */
public int getThumbnailQuality() { public int getJpegThumbnailQuality() {
return getInt("jpeg-thumbnail-quality"); return getInt(KEY_JPEG_THUMBNAIL_QUALITY);
}
/**
* Sets Jpeg quality of captured picture.
*
* @param quality the JPEG quality of captured picture. The range is 1
* to 100, with 100 being the best.
*/
public void setJpegQuality(int quality) {
set(KEY_JPEG_QUALITY, quality);
}
/**
* Returns the quality setting for the JPEG picture.
*
* @return the JPEG picture quality setting.
*/
public int getJpegQuality() {
return getInt(KEY_JPEG_QUALITY);
} }
/** /**
@ -725,7 +848,7 @@ public class Camera {
* @param fps the frame rate (frames per second) * @param fps the frame rate (frames per second)
*/ */
public void setPreviewFrameRate(int fps) { public void setPreviewFrameRate(int fps) {
set("preview-frame-rate", fps); set(KEY_PREVIEW_FRAME_RATE, fps);
} }
/** /**
@ -735,14 +858,26 @@ public class Camera {
* @return the frame rate setting (frames per second) * @return the frame rate setting (frames per second)
*/ */
public int getPreviewFrameRate() { public int getPreviewFrameRate() {
return getInt("preview-frame-rate"); return getInt(KEY_PREVIEW_FRAME_RATE);
} }
/** /**
* Sets the image format for preview pictures. * Gets the supported preview frame rates.
*
* @return a List of Integer objects (preview frame rates). null if
* preview frame rate setting is not supported.
*/
public List<Integer> getSupportedPreviewFrameRates() {
String str = get(KEY_PREVIEW_FRAME_RATE + SUPPORTED_VALUES_SUFFIX);
return splitInt(str);
}
/**
* Sets the image format for preview pictures. If this is never called,
* the default will be the YCbCr_420_SP (NV21) format.
* *
* @param pixel_format the desired preview picture format * @param pixel_format the desired preview picture format
* (<var>PixelFormat.YCbCr_420_SP</var>, * (<var>PixelFormat.YCbCr_420_SP (NV21)</var>,
* <var>PixelFormat.RGB_565</var>, or * <var>PixelFormat.RGB_565</var>, or
* <var>PixelFormat.JPEG</var>) * <var>PixelFormat.JPEG</var>)
* @see android.graphics.PixelFormat * @see android.graphics.PixelFormat
@ -750,19 +885,33 @@ public class Camera {
public void setPreviewFormat(int pixel_format) { public void setPreviewFormat(int pixel_format) {
String s = cameraFormatForPixelFormat(pixel_format); String s = cameraFormatForPixelFormat(pixel_format);
if (s == null) { if (s == null) {
throw new IllegalArgumentException(); throw new IllegalArgumentException(
"Invalid pixel_format=" + pixel_format);
} }
set("preview-format", s); set(KEY_PREVIEW_FORMAT, s);
} }
/** /**
* Returns the image format for preview pictures. * Returns the image format for preview pictures got from
* {@link PreviewCallback}.
* *
* @return the PixelFormat int representing the preview picture format * @return the PixelFormat int representing the preview picture format
* @see android.graphics.PixelFormat
*/ */
public int getPreviewFormat() { public int getPreviewFormat() {
return pixelFormatForCameraFormat(get("preview-format")); return pixelFormatForCameraFormat(get(KEY_PREVIEW_FORMAT));
}
/**
* Gets the supported preview formats.
*
* @return a List of Integer objects. null if preview format setting is
* not supported.
*/
public List<Integer> getSupportedPreviewFormats() {
String str = get(KEY_PREVIEW_FORMAT + SUPPORTED_VALUES_SUFFIX);
return splitInt(str);
} }
/** /**
@ -773,7 +922,7 @@ public class Camera {
*/ */
public void setPictureSize(int width, int height) { public void setPictureSize(int width, int height) {
String v = Integer.toString(width) + "x" + Integer.toString(height); String v = Integer.toString(width) + "x" + Integer.toString(height);
set("picture-size", v); set(KEY_PICTURE_SIZE, v);
} }
/** /**
@ -783,23 +932,26 @@ public class Camera {
* for pictures * for pictures
*/ */
public Size getPictureSize() { public Size getPictureSize() {
String pair = get("picture-size"); String pair = get(KEY_PICTURE_SIZE);
if (pair == null) return strToSize(pair);
return null; }
String[] dims = pair.split("x");
if (dims.length != 2)
return null;
return new Size(Integer.parseInt(dims[0]),
Integer.parseInt(dims[1]));
/**
* Gets the supported picture sizes.
*
* @return a List of Size objects. null if picture size setting is not
* supported.
*/
public List<Size> getSupportedPictureSizes() {
String str = get(KEY_PICTURE_SIZE + SUPPORTED_VALUES_SUFFIX);
return splitSize(str);
} }
/** /**
* Sets the image format for pictures. * Sets the image format for pictures.
* *
* @param pixel_format the desired picture format * @param pixel_format the desired picture format
* (<var>PixelFormat.YCbCr_420_SP</var>, * (<var>PixelFormat.YCbCr_420_SP (NV21)</var>,
* <var>PixelFormat.RGB_565</var>, or * <var>PixelFormat.RGB_565</var>, or
* <var>PixelFormat.JPEG</var>) * <var>PixelFormat.JPEG</var>)
* @see android.graphics.PixelFormat * @see android.graphics.PixelFormat
@ -807,10 +959,11 @@ public class Camera {
public void setPictureFormat(int pixel_format) { public void setPictureFormat(int pixel_format) {
String s = cameraFormatForPixelFormat(pixel_format); String s = cameraFormatForPixelFormat(pixel_format);
if (s == null) { if (s == null) {
throw new IllegalArgumentException(); throw new IllegalArgumentException(
"Invalid pixel_format=" + pixel_format);
} }
set("picture-format", s); set(KEY_PICTURE_FORMAT, s);
} }
/** /**
@ -819,15 +972,26 @@ public class Camera {
* @return the PixelFormat int representing the picture format * @return the PixelFormat int representing the picture format
*/ */
public int getPictureFormat() { public int getPictureFormat() {
return pixelFormatForCameraFormat(get("picture-format")); return pixelFormatForCameraFormat(get(KEY_PICTURE_FORMAT));
}
/**
* Gets the supported picture formats.
*
* @return a List of Integer objects (values are PixelFormat.XXX). null
* if picture setting is not supported.
*/
public List<Integer> getSupportedPictureFormats() {
String str = get(KEY_PICTURE_SIZE + SUPPORTED_VALUES_SUFFIX);
return splitInt(str);
} }
private String cameraFormatForPixelFormat(int pixel_format) { private String cameraFormatForPixelFormat(int pixel_format) {
switch(pixel_format) { switch(pixel_format) {
case PixelFormat.YCbCr_422_SP: return "yuv422sp"; case PixelFormat.YCbCr_422_SP: return PIXEL_FORMAT_YUV422SP;
case PixelFormat.YCbCr_420_SP: return "yuv420sp"; case PixelFormat.YCbCr_420_SP: return PIXEL_FORMAT_YUV420SP;
case PixelFormat.RGB_565: return "rgb565"; case PixelFormat.RGB_565: return PIXEL_FORMAT_RGB565;
case PixelFormat.JPEG: return "jpeg"; case PixelFormat.JPEG: return PIXEL_FORMAT_JPEG;
default: return null; default: return null;
} }
} }
@ -836,21 +1000,309 @@ public class Camera {
if (format == null) if (format == null)
return PixelFormat.UNKNOWN; return PixelFormat.UNKNOWN;
if (format.equals("yuv422sp")) if (format.equals(PIXEL_FORMAT_YUV422SP))
return PixelFormat.YCbCr_422_SP; return PixelFormat.YCbCr_422_SP;
if (format.equals("yuv420sp")) if (format.equals(PIXEL_FORMAT_YUV420SP))
return PixelFormat.YCbCr_420_SP; return PixelFormat.YCbCr_420_SP;
if (format.equals("rgb565")) if (format.equals(PIXEL_FORMAT_RGB565))
return PixelFormat.RGB_565; return PixelFormat.RGB_565;
if (format.equals("jpeg")) if (format.equals(PIXEL_FORMAT_JPEG))
return PixelFormat.JPEG; return PixelFormat.JPEG;
return PixelFormat.UNKNOWN; return PixelFormat.UNKNOWN;
} }
/**
* Sets the orientation of the device in degrees, which instructs the
* camera driver to rotate the picture and thumbnail, in order to match
* what the user sees from the viewfinder. For example, suppose the
* natural position of the device is landscape. If the user takes a
* picture in landscape mode in 2048x1536 resolution, the rotation
* should be set to 0. If the user rotates the phone 90 degrees
* clockwise, the rotation should be set to 90. Applications can use
* {@link android.view.OrientationEventListener} to set this parameter.
*
* Since the picture is rotated, the orientation in the EXIF header is
* missing or always 1 (row #0 is top and column #0 is left side).
*
* @param rotation The orientation of the device in degrees. Rotation
* can only be 0, 90, 180 or 270.
* @throws IllegalArgumentException if rotation value is invalid.
* @see android.view.OrientationEventListener
*/
public void setRotation(int rotation) {
if (rotation == 0 || rotation == 90 || rotation == 180
|| rotation == 270) {
set(KEY_ROTATION, Integer.toString(rotation));
} else {
throw new IllegalArgumentException(
"Invalid rotation=" + rotation);
}
}
/**
* Sets GPS latitude coordinate. This will be stored in JPEG EXIF
* header.
*
* @param latitude GPS latitude coordinate.
*/
public void setGpsLatitude(double latitude) {
set(KEY_GPS_LATITUDE, Double.toString(latitude));
}
/**
* Sets GPS longitude coordinate. This will be stored in JPEG EXIF
* header.
*
* @param longitude GPS longitude coordinate.
*/
public void setGpsLongitude(double longitude) {
set(KEY_GPS_LONGITUDE, Double.toString(longitude));
}
/**
* Sets GPS altitude. This will be stored in JPEG EXIF header.
*
* @param altitude GPS altitude in meters.
*/
public void setGpsAltitude(double altitude) {
set(KEY_GPS_ALTITUDE, Double.toString(altitude));
}
/**
* Sets GPS timestamp. This will be stored in JPEG EXIF header.
*
* @param timestamp GPS timestamp (UTC in seconds since January 1,
* 1970).
*/
public void setGpsTimestamp(long timestamp) {
set(KEY_GPS_TIMESTAMP, Long.toString(timestamp));
}
/**
* Removes GPS latitude, longitude, altitude, and timestamp from the
* parameters.
*/
public void removeGpsData() {
remove(KEY_GPS_LATITUDE);
remove(KEY_GPS_LONGITUDE);
remove(KEY_GPS_ALTITUDE);
remove(KEY_GPS_TIMESTAMP);
}
/**
* Gets the current white balance setting.
*
* @return one of WHITE_BALANCE_XXX string constant. null if white
* balance setting is not supported.
*/
public String getWhiteBalance() {
return get(KEY_WHITE_BALANCE);
}
/**
* Sets the white balance.
*
* @param value WHITE_BALANCE_XXX string constant.
*/
public void setWhiteBalance(String value) {
set(KEY_WHITE_BALANCE, value);
}
/**
* Gets the supported white balance.
*
* @return a List of WHITE_BALANCE_XXX string constants. null if white
* balance setting is not supported.
*/
public List<String> getSupportedWhiteBalance() {
String str = get(KEY_WHITE_BALANCE + SUPPORTED_VALUES_SUFFIX);
return split(str);
}
/**
* Gets the current color effect setting.
*
* @return one of EFFECT_XXX string constant. null if color effect
* setting is not supported.
*/
public String getColorEffect() {
return get(KEY_EFFECT);
}
/**
* Sets the current color effect setting.
*
* @param value EFFECT_XXX string constants.
*/
public void setColorEffect(String value) {
set(KEY_EFFECT, value);
}
/**
* Gets the supported color effects.
*
* @return a List of EFFECT_XXX string constants. null if color effect
* setting is not supported.
*/
public List<String> getSupportedColorEffects() {
String str = get(KEY_EFFECT + SUPPORTED_VALUES_SUFFIX);
return split(str);
}
/**
* Gets the current antibanding setting.
*
* @return one of ANTIBANDING_XXX string constant. null if antibanding
* setting is not supported.
*/
public String getAntibanding() {
return get(KEY_ANTIBANDING);
}
/**
* Sets the antibanding.
*
* @param antibanding ANTIBANDING_XXX string constant.
*/
public void setAntibanding(String antibanding) {
set(KEY_ANTIBANDING, antibanding);
}
/**
* Gets the supported antibanding values.
*
* @return a List of ANTIBANDING_XXX string constants. null if
* antibanding setting is not supported.
*/
public List<String> getSupportedAntibanding() {
String str = get(KEY_ANTIBANDING + SUPPORTED_VALUES_SUFFIX);
return split(str);
}
/**
* Gets the current scene mode setting.
*
* @return one of SCENE_MODE_XXX string constant. null if scene mode
* setting is not supported.
*/
public String getSceneMode() {
return get(KEY_SCENE_MODE);
}
/**
* Sets the scene mode.
*
* @param value SCENE_MODE_XXX string constants.
*/
public void setSceneMode(String value) {
set(KEY_SCENE_MODE, value);
}
/**
* Gets the supported scene modes.
*
* @return a List of SCENE_MODE_XXX string constant. null if scene mode
* setting is not supported.
*/
public List<String> getSupportedSceneModes() {
String str = get(KEY_SCENE_MODE + SUPPORTED_VALUES_SUFFIX);
return split(str);
}
/**
* Gets the current flash mode setting.
*
* @return one of FLASH_MODE_XXX string constant. null if flash mode
* setting is not supported.
*/
public String getFlashMode() {
return get(KEY_FLASH_MODE);
}
/**
* Sets the flash mode.
*
* @param value FLASH_MODE_XXX string constants.
*/
public void setFlashMode(String value) {
set(KEY_FLASH_MODE, value);
}
/**
* Gets the supported flash modes.
*
* @return a List of FLASH_MODE_XXX string constants. null if flash mode
* setting is not supported.
*/
public List<String> getSupportedFlashModes() {
String str = get(KEY_FLASH_MODE + SUPPORTED_VALUES_SUFFIX);
return split(str);
}
// Splits a comma delimited string to an ArrayList of String.
// Return null if the passing string is null or the size is 0.
private ArrayList<String> split(String str) {
if (str == null) return null;
// Use StringTokenizer because it is faster than split.
StringTokenizer tokenizer = new StringTokenizer(str, ",");
ArrayList<String> substrings = new ArrayList<String>();
while (tokenizer.hasMoreElements()) {
substrings.add(tokenizer.nextToken());
}
return substrings;
}
// Splits a comma delimited string to an ArrayList of Integer.
// Return null if the passing string is null or the size is 0.
private ArrayList<Integer> splitInt(String str) {
if (str == null) return null;
StringTokenizer tokenizer = new StringTokenizer(str, ",");
ArrayList<Integer> substrings = new ArrayList<Integer>();
while (tokenizer.hasMoreElements()) {
String token = tokenizer.nextToken();
substrings.add(Integer.parseInt(token));
}
if (substrings.size() == 0) return null;
return substrings;
}
// Splits a comma delimited string to an ArrayList of Size.
// Return null if the passing string is null or the size is 0.
private ArrayList<Size> splitSize(String str) {
if (str == null) return null;
StringTokenizer tokenizer = new StringTokenizer(str, ",");
ArrayList<Size> sizeList = new ArrayList<Size>();
while (tokenizer.hasMoreElements()) {
Size size = strToSize(tokenizer.nextToken());
if (size != null) sizeList.add(size);
}
if (sizeList.size() == 0) return null;
return sizeList;
}
// Parses a string (ex: "480x320") to Size object.
// Return null if the passing string is null.
private Size strToSize(String str) {
if (str == null) return null;
int pos = str.indexOf('x');
if (pos != -1) {
String width = str.substring(0, pos);
String height = str.substring(pos + 1);
return new Size(Integer.parseInt(width),
Integer.parseInt(height));
}
Log.e(TAG, "Invalid size parameter string=" + str);
return null;
}
}; };
} }