diff options
| author | Scott Main <smain@google.com> | 2009-09-10 18:08:37 -0700 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2009-09-10 18:08:37 -0700 |
| commit | da0a56df963353a1f1bd1914fa31f870d982dd5a (patch) | |
| tree | a9619776842b845803b60db08c55a4973de5d8f9 /graphics/java | |
| parent | ebebf9c36c0112d99cb2e11953febdff8ba5ff23 (diff) | |
| parent | e0408aa11904ce1373b4e01a6182cc52ff43caa2 (diff) | |
| download | frameworks_base-da0a56df963353a1f1bd1914fa31f870d982dd5a.zip frameworks_base-da0a56df963353a1f1bd1914fa31f870d982dd5a.tar.gz frameworks_base-da0a56df963353a1f1bd1914fa31f870d982dd5a.tar.bz2 | |
resolved conflicts for merge of e0408aa1 to eclair
Diffstat (limited to 'graphics/java')
| -rw-r--r-- | graphics/java/android/graphics/PixelFormat.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/PixelFormat.java b/graphics/java/android/graphics/PixelFormat.java index 159accc..221c2f8 100644 --- a/graphics/java/android/graphics/PixelFormat.java +++ b/graphics/java/android/graphics/PixelFormat.java @@ -52,6 +52,12 @@ public class PixelFormat * by the hardware. */ public static final int YCbCr_422_SP= 0x10; + + /** YCbCr format used for images, which uses the NV21 encoding format. + * This is the default format for camera preview images, when not + * otherwise set with + * {@link android.hardware.Camera.Parameters#setPreviewFormat(int)}. + */ public static final int YCbCr_420_SP= 0x11; /** |