diff options
Diffstat (limited to 'camera/inc')
| -rw-r--r-- | camera/inc/Encoder_libjpeg.h | 2 | ||||
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/camera/inc/Encoder_libjpeg.h b/camera/inc/Encoder_libjpeg.h index 727dd92..fb9a894 100644 --- a/camera/inc/Encoder_libjpeg.h +++ b/camera/inc/Encoder_libjpeg.h @@ -93,7 +93,7 @@ class ExifElementsTable { void insertExifToJpeg(unsigned char* jpeg, size_t jpeg_size); status_t insertExifThumbnailImage(const char*, int); void saveJpeg(unsigned char* picture, size_t jpeg_size); - static const char* degreesToExifOrientation(const char*); + static const char* degreesToExifOrientation(unsigned int); static void stringToRational(const char*, unsigned int*, unsigned int*); static bool isAsciiTag(const char* tag); private: diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index 0fdc770..59c5efc 100644 --- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h +++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h @@ -298,6 +298,9 @@ public: { public: GPSData mGPSData; + char mMake[EXIF_MODEL_SIZE]; + char mModel[EXIF_MAKE_SIZE]; + unsigned int mFocalNum, mFocalDen; bool mMakeValid; bool mModelValid; }; @@ -867,6 +870,7 @@ private: unsigned int mPending3Asettings; Mutex m3ASettingsUpdateLock; Gen3A_settings mParameters3A; + const char *mPictureFormatFromClient; OMX_TI_CONFIG_3A_FACE_PRIORITY mFacePriority; OMX_TI_CONFIG_3A_REGION_PRIORITY mRegionPriority; @@ -889,6 +893,8 @@ private: bool mBracketingEnabled; int mBracketingRange; + bool mIternalRecordingHint; + CameraParameters mParameters; bool mOmxInitialized; OMXCameraAdapterComponentContext mCameraAdapterParameters; |