summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-09-07 09:36:23 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-09-07 09:36:23 -0700
commitceb22cffe92c73116009342c4f5e31e41b34fe5d (patch)
tree67db145e29bf27987724be8e2cff9a491f66e670
parentfdb26f84b2540aa253ece0c4b225e87cde63f64c (diff)
downloadandroid_system_media-ceb22cffe92c73116009342c4f5e31e41b34fe5d.tar.gz
android_system_media-ceb22cffe92c73116009342c4f5e31e41b34fe5d.tar.bz2
android_system_media-ceb22cffe92c73116009342c4f5e31e41b34fe5d.zip
Camera: Add android.jpeg.size field.
When the camera is producing JPEG buffers, need a field to provide the final buffer size. Bug: 7108816 Change-Id: I67f27a3c1d69f32541402e516de9fb4b61ffd352
-rw-r--r--camera/include/system/camera_metadata_tags.h1
-rw-r--r--camera/src/camera_metadata_tag_info.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h
index 938144e6..17123028 100644
--- a/camera/include/system/camera_metadata_tags.h
+++ b/camera/include/system/camera_metadata_tags.h
@@ -246,6 +246,7 @@ enum {
ANDROID_JPEG_GPS_PROCESSING_METHOD,
ANDROID_JPEG_GPS_TIMESTAMP,
ANDROID_JPEG_ORIENTATION,
+ ANDROID_JPEG_SIZE,
ANDROID_JPEG_END,
ANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES = ANDROID_JPEG_INFO_START,
diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c
index c9a8f776..794c18ec 100644
--- a/camera/src/camera_metadata_tag_info.c
+++ b/camera/src/camera_metadata_tag_info.c
@@ -394,7 +394,9 @@ tag_info_t android_jpeg[ANDROID_JPEG_END -
TIDX(JPEG, GPS_TIMESTAMP) =
{ "gpsTimestamp", TYPE_INT64 },
TIDX(JPEG, ORIENTATION) =
- { "orientation", TYPE_INT32 }
+ { "orientation", TYPE_INT32 },
+ TIDX(JPEG, SIZE) =
+ { "size", TYPE_INT32 }
};
tag_info_t android_jpeg_info[ANDROID_JPEG_INFO_END -