diff options
-rw-r--r-- | camera/OMXCameraAdapter/OMXExif.cpp | 6 | ||||
-rw-r--r-- | camera/inc/Encoder_libjpeg.h | 2 | ||||
-rw-r--r-- | rootdir/init.omap4.rc | 6 |
3 files changed, 14 insertions, 0 deletions
diff --git a/camera/OMXCameraAdapter/OMXExif.cpp b/camera/OMXCameraAdapter/OMXExif.cpp index f9ed59d..81135d0 100644 --- a/camera/OMXCameraAdapter/OMXExif.cpp +++ b/camera/OMXCameraAdapter/OMXExif.cpp @@ -373,6 +373,7 @@ status_t OMXCameraAdapter::setupEXIF() exifTags->eStatusImageHeight = OMX_TI_TagUpdated; } +#ifndef CAMERAHAL_PIRANHA if ( OMX_TI_TagReadWrite == exifTags->eStatusPixelXDimension && OMX_TI_TagReadWrite == exifTags->eStatusPixelYDimension) { @@ -394,6 +395,7 @@ status_t OMXCameraAdapter::setupEXIF() exifTags->usOrientation = 0; exifTags->eStatusOrientation = OMX_TI_TagUpdated; } +#endif if ( ( OMX_TI_TagReadWrite == exifTags->eStatusGpsLatitude ) && ( mEXIFData.mGPSData.mLatValid ) ) @@ -584,18 +586,22 @@ status_t OMXCameraAdapter::setupEXIF_libjpeg(ExifElementsTable* exifTable, char temp_value[5]; snprintf(temp_value, sizeof(temp_value)/sizeof(char), "%lu", (unsigned long)capData->mWidth); ret = exifTable->insertElement(TAG_IMAGE_WIDTH, temp_value); +#ifndef CAMERAHAL_PIRANHA if ((NO_ERROR == ret)) { ret = exifTable->insertElement(TAG_EXIF_IMAGE_WIDTH, temp_value); } +#endif } if ((NO_ERROR == ret)) { char temp_value[5]; snprintf(temp_value, sizeof(temp_value)/sizeof(char), "%lu", (unsigned long)capData->mHeight); ret = exifTable->insertElement(TAG_IMAGE_LENGTH, temp_value); +#ifndef CAMERAHAL_PIRANHA if ((NO_ERROR == ret)) { ret = exifTable->insertElement(TAG_EXIF_IMAGE_LENGTH, temp_value); } +#endif } if ((NO_ERROR == ret) && (mEXIFData.mGPSData.mLatValid)) { diff --git a/camera/inc/Encoder_libjpeg.h b/camera/inc/Encoder_libjpeg.h index bb41562..3766b15 100644 --- a/camera/inc/Encoder_libjpeg.h +++ b/camera/inc/Encoder_libjpeg.h @@ -63,8 +63,10 @@ static const char TAG_FOCALLENGTH[] = "FocalLength"; static const char TAG_DATETIME[] = "DateTime"; static const char TAG_IMAGE_WIDTH[] = "ImageWidth"; static const char TAG_IMAGE_LENGTH[] = "ImageLength"; +#ifndef CAMERAHAL_PIRANHA static const char TAG_EXIF_IMAGE_WIDTH[] = "ExifImageWidth"; static const char TAG_EXIF_IMAGE_LENGTH[] = "ExifImageLength"; +#endif static const char TAG_GPS_LAT[] = "GPSLatitude"; static const char TAG_GPS_LAT_REF[] = "GPSLatitudeRef"; static const char TAG_GPS_LONG[] = "GPSLongitude"; diff --git a/rootdir/init.omap4.rc b/rootdir/init.omap4.rc index 686a3d1..c9d0e9e 100644 --- a/rootdir/init.omap4.rc +++ b/rootdir/init.omap4.rc @@ -7,6 +7,12 @@ on boot restorecon /sys/devices/platform/omapdss/manager0/cpr_coef restorecon /sys/devices/platform/omapdss/manager0/cpr_enable +# Workaround slow llvmpipe at the expense of applications +# compatibility. While this defeats the point of using llvmpipe +# it enables all the devices (exynos and OMAP) to use llvmpipe. + setprop ro.kernel.qemu 1 + setprop ro.kernel.qemu.gles 0 + on fs # Load PVR module insmod /system/lib/modules/pvrsrvkm.ko |