11 files changed, 362 insertions, 660 deletions

diff --git a/v3/fake-pipeline2/JpegCompressor.h b/v3/fake-pipeline2/JpegCompressor.h
index 464af4d..d524ef3 100644
--- a/v3/fake-pipeline2/JpegCompressor.h
+++ b/v3/fake-pipeline2/JpegCompressor.h
@@ -40,39 +40,9 @@
 
 extern "C" {
 #include <jpeglib.h>
-#include <jhead.h>
 }
 
 namespace android {
-#define MAX_EXIF_TAGS_SUPPORTED 30
-static const char TAG_MODEL[] = "Model";
-static const char TAG_MAKE[] = "Make";
-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";
-static const char TAG_GPS_LAT[] = "GPSLatitude";
-static const char TAG_GPS_LAT_REF[] = "GPSLatitudeRef";
-static const char TAG_GPS_LONG[] = "GPSLongitude";
-static const char TAG_GPS_LONG_REF[] = "GPSLongitudeRef";
-static const char TAG_GPS_ALT[] = "GPSAltitude";
-static const char TAG_GPS_ALT_REF[] = "GPSAltitudeRef";
-static const char TAG_GPS_MAP_DATUM[] = "GPSMapDatum";
-static const char TAG_GPS_PROCESSING_METHOD[] = "GPSProcessingMethod";
-static const char TAG_GPS_VERSION_ID[] = "GPSVersionID";
-static const char TAG_GPS_TIMESTAMP[] = "GPSTimeStamp";
-static const char TAG_GPS_DATESTAMP[] = "GPSDateStamp";
-static const char TAG_ORIENTATION[] = "Orientation";
-
-static const char TAG_EXPOSURETIME[] = "ExposureTime";
-static const char TAG_APERTURE[] = "ApertureValue";
-static const char TAG_FLASH[] = "Flash";
-static const char TAG_WHITEBALANCE[] = "WhiteBalance";
-static const char TAG_ISO_EQUIVALENT[] = "ISOSpeedRatings";
-static const char TAG_DATETIME_DIGITIZED[] = "DateTimeDigitized";
-static const char TAG_SUBSEC_TIME[] = "SubSecTime";
-static const char TAG_SUBSEC_TIME_ORIG[] = "SubSecTimeOriginal";
-static const char TAG_SUBSEC_TIME_DIG[] = "SubSecTimeDigitized";
 
 struct CaptureRequest {
     uint32_t         frameNumber;
@@ -86,27 +56,6 @@ typedef struct _exif_buffer {
     unsigned int size;
 } exif_buffer;
 
-class ExifElementsTable {
-    public:
-        ExifElementsTable() :
-           gps_tag_count(0), exif_tag_count(0), position(0),
-           jpeg_opened(false) { }
-        ~ExifElementsTable();
-        status_t insertElement(const char* tag, const char* value);
-        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 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;
-        unsigned int exif_tag_count;
-        unsigned int position;
-        bool jpeg_opened;
-};
-
 class JpegCompressor: private Thread, public virtual RefBase {
   public:
 
@@ -141,8 +90,6 @@ class JpegCompressor: private Thread, public virtual RefBase {
     ssize_t GetMaxJpegBufferSize();
     void SetMaxJpegBufferSize(ssize_t size);
     void SetExifInfo(struct ExifInfo info);
-    int GenExif(ExifElementsTable* exiftable);
-    status_t Create_Exif_Use_Libjpeg();
     status_t Create_Exif_Use_Libexif();
     exif_buffer *get_exif_buffer();
     void exif_entry_set_string (ExifData * pEdata, ExifIfd eEifd, ExifTag eEtag, const char *s);