diff options
| author | Tyler Luu <tluu@ti.com> | 2011-10-12 17:39:00 -0500 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-10-15 13:44:35 -0700 |
| commit | c11c07d676f130e6e28ab1611f4862a01a160389 (patch) | |
| tree | 043a4cf195feea7bac8e634275354dd2090da016 /camera/inc | |
| parent | 73ffa5e393306d8a574e1540c4e1027f9e55a7fc (diff) | |
| download | hardware_ti_omap4xxx-c11c07d676f130e6e28ab1611f4862a01a160389.zip hardware_ti_omap4xxx-c11c07d676f130e6e28ab1611f4862a01a160389.tar.gz hardware_ti_omap4xxx-c11c07d676f130e6e28ab1611f4862a01a160389.tar.bz2 | |
CameraHal: Fixes for #testVideoSnapshot
1. Add raw notify callback for video snapshot
2. Add new state for video capture + AF
3. We were not populating focal length correctly for jhead. Need to send
focal length as a rational in this format "xx/yy"
4. Need to send GPSProcessingMethod as an UNDEFINED ASCII to jhead
b/5448171
Change-Id: Ie6be9ad821d1fa106d9c857681f2fa6427d4f283
Signed-off-by: Tyler Luu <tluu@ti.com>
Diffstat (limited to 'camera/inc')
| -rw-r--r-- | camera/inc/CameraHal.h | 1 | ||||
| -rwxr-xr-x | camera/inc/Encoder_libjpeg.h | 11 | ||||
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h index e44c1b6..2b1f0c9 100644 --- a/camera/inc/CameraHal.h +++ b/camera/inc/CameraHal.h @@ -778,6 +778,7 @@ public: AF_STATE = AF_ACTIVE | PREVIEW_ACTIVE | INTIALIZED_ACTIVE, ZOOM_STATE = ZOOM_ACTIVE | PREVIEW_ACTIVE | INTIALIZED_ACTIVE, VIDEO_STATE = VIDEO_ACTIVE | PREVIEW_ACTIVE | INTIALIZED_ACTIVE, + VIDEO_AF_STATE = VIDEO_ACTIVE | AF_ACTIVE | PREVIEW_ACTIVE | INTIALIZED_ACTIVE, VIDEO_ZOOM_STATE = VIDEO_ACTIVE | ZOOM_ACTIVE | PREVIEW_ACTIVE | INTIALIZED_ACTIVE, VIDEO_LOADED_CAPTURE_STATE = VIDEO_ACTIVE | LOADED_CAPTURE_ACTIVE | PREVIEW_ACTIVE | INTIALIZED_ACTIVE, VIDEO_CAPTURE_STATE = VIDEO_ACTIVE | CAPTURE_ACTIVE | PREVIEW_ACTIVE | INTIALIZED_ACTIVE, diff --git a/camera/inc/Encoder_libjpeg.h b/camera/inc/Encoder_libjpeg.h index da6382e..e3e9ac5 100755 --- a/camera/inc/Encoder_libjpeg.h +++ b/camera/inc/Encoder_libjpeg.h @@ -31,7 +31,6 @@ extern "C" { #include "jhead.h" } namespace android { - /** * libjpeg encoder class - uses libjpeg to encode yuv */ @@ -75,6 +74,8 @@ class ExifElementsTable { status_t insertExifThumbnailImage(const char*, int); void saveJpeg(unsigned char* picture, size_t jpeg_size); static const char* degreesToExifOrientation(const char*); + static void stringToRational(const char*, unsigned int*, unsigned int*); + static bool isAsciiTag(const char* tag); private: ExifElement_t table[MAX_EXIF_TAGS_SUPPORTED]; unsigned int gps_tag_count; @@ -136,10 +137,12 @@ class Encoder_libjpeg : public Thread { mThumb->join(); mThumb.clear(); mThumb = NULL; - if(mCb) { - mCb(mMainInput, mThumbnailInput, mType, mCookie1, mCookie2, mCookie3); - } } + + if(mCb) { + mCb(mMainInput, mThumbnailInput, mType, mCookie1, mCookie2, mCookie3); + } + // encoder thread runs, self-destructs, and then exits this->decStrong(this); return false; diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index 8c748a8..87e2987 100644 --- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h +++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h @@ -204,9 +204,6 @@ public: ///Five second timeout static const int CAMERA_ADAPTER_TIMEOUT = 5000*1000; - //EXIF ASCII prefix - static const char EXIFASCIIPrefix[]; - enum OMXCameraEvents { CAMERA_PORT_ENABLE = 0x1, |