Remove deprecated image meta function 31/304831/1
authorminje.ahn <minje.ahn@samsung.com>
Wed, 24 Jan 2024 06:17:55 +0000 (15:17 +0900)
committerminje.ahn <minje.ahn@samsung.com>
Wed, 24 Jan 2024 06:18:46 +0000 (15:18 +0900)
Change-Id: Ib212043f0b395170d191274205543b02b29034a1
Signed-off-by: minje.ahn <minje.ahn@samsung.com>
src/common/media-svc-db-utils.c
src/common/media-svc-media.c
src/common/media-svc-util.c
src/include/common/media-svc-util.h

index 0eaf550..9660175 100755 (executable)
@@ -384,8 +384,8 @@ int _media_svc_init_table_query(void)
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_samplerate", DB_TYPE_INT, "DEFAULT -1", false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_channel", DB_TYPE_INT, "DEFAULT -1", false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_duration", DB_TYPE_INT, "DEFAULT -1", false, false, true);
-       __add_column_info(&column_list[DB_LIST_MEDIA], "media_longitude", DB_TYPE_DOUBLE, "DEFAULT 0", false, false, true);
-       __add_column_info(&column_list[DB_LIST_MEDIA], "media_latitude", DB_TYPE_DOUBLE, "DEFAULT 0", false, false, true);
+       __add_column_info(&column_list[DB_LIST_MEDIA], "media_longitude", DB_TYPE_DOUBLE, "DEFAULT -200", false, false, true);
+       __add_column_info(&column_list[DB_LIST_MEDIA], "media_latitude", DB_TYPE_DOUBLE, "DEFAULT -200", false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_altitude", DB_TYPE_DOUBLE, "DEFAULT 0", false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "exposure_time", DB_TYPE_TEXT, NULL, false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "fnumber", DB_TYPE_DOUBLE, "DEFAULT 0", false, false, true);
index d290cf1..0961f99 100755 (executable)
@@ -72,19 +72,13 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
 {
        int ret = MS_MEDIA_ERR_NONE;
 
-       const char *db_fields = "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, folder_id, media_thumbnail_path, media_title, album_id, media_album, media_artist, media_album_artist, media_genre, media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_description, media_bitrate, media_bitpersample, media_samplerate, media_channel, media_duration, media_longitude, media_latitude, media_altitude, exposure_time, fnumber, iso, model, media_width, media_height, media_datetaken, media_orientation, media_rating, media_timeline, storage_uuid, media_360";
+       const char *db_fields = "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, folder_id, media_thumbnail_path, media_title, album_id, media_album, media_artist, media_album_artist, media_genre, media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_description, media_bitrate, media_bitpersample, media_samplerate, media_channel, media_duration, media_width, media_height, media_datetaken, media_orientation, media_rating, media_timeline, storage_uuid";
 
-       const char *db_fields_basic = "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, folder_id, media_thumbnail_path, album_id, media_timeline, storage_uuid, media_360";
-
-       /* This sql is due to sqlite3_mprintf's wrong operation when using floating point in the text format */
-       /* This code will be removed when sqlite3_mprintf works clearly */
-       char *test_sql = sqlite3_mprintf("%f, %f, %f", content_info->media_meta.longitude, content_info->media_meta.latitude, content_info->media_meta.altitude);
-       SQLITE3_SAFE_FREE(test_sql);
+       const char *db_fields_basic = "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, folder_id, media_thumbnail_path, album_id, media_timeline, storage_uuid";
 
        char *sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %lld, \
                %Q, %Q, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, \
-               %d, %d, %d, %d, %d, %.6f, %.6f, %.6f, %Q, %.6f, %d, %Q, %d, %d, %Q, %d, \
-               %d, %d, %Q, %d);",
+               %d, %d, %d, %d, %d, %d, %d, %Q, %d, %d, %d, %Q);",
                                DB_TABLE_MEDIA, db_fields,
                                content_info->media_uuid,
                                content_info->path,
@@ -113,21 +107,13 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                                content_info->media_meta.samplerate,
                                content_info->media_meta.channel,
                                content_info->media_meta.duration,
-                               content_info->media_meta.longitude,
-                               content_info->media_meta.latitude,
-                               content_info->media_meta.altitude,
-                               content_info->media_meta.exposure_time,
-                               content_info->media_meta.fnumber,
-                               content_info->media_meta.iso,
-                               content_info->media_meta.model,
                                content_info->media_meta.width,
                                content_info->media_meta.height,
                                content_info->media_meta.datetaken,
-                               content_info->media_meta.orientation,           /* 3rd line */
+                               content_info->media_meta.orientation,
                                content_info->media_meta.rating,
                                content_info->timeline,
-                               content_info->storage_uuid,
-                               content_info->media_meta.is_360         /* 4th line */
+                               content_info->storage_uuid              /* 3rd line */
                        );
 
        /* Check query length */
@@ -135,7 +121,7 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                media_svc_debug("Query length is over %d byte.. So, remake query using only basic information..", MEDIA_SVC_QUERY_LEN_MAX - 1);
                SQLITE3_SAFE_FREE(sql);
 
-               sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %lld, %Q, %d, %d, %d, %d, %Q, %d);",
+               sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %lld, %Q, %d, %d, %d, %d, %Q);",
                                                DB_TABLE_MEDIA, db_fields_basic,
                                                content_info->media_uuid,
                                                content_info->path,
@@ -149,8 +135,7 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                                                content_info->thumbnail_path,
                                                content_info->album_id,
                                                content_info->timeline,
-                                               content_info->storage_uuid,
-                                               content_info->media_meta.is_360
+                                               content_info->storage_uuid
                                                );
        }
 
@@ -174,14 +159,7 @@ int _media_svc_update_item_with_data(bool is_direct, media_svc_content_info_s *c
 {
        int ret = MS_MEDIA_ERR_NONE;
 
-       /* This sql is due to sqlite3_mprintf's wrong operation when using floating point in the text format */
-       /* This code will be removed when sqlite3_mprintf works clearly */
-       char *test_sql = sqlite3_mprintf("%f, %f, %f", content_info->media_meta.longitude, content_info->media_meta.latitude, content_info->media_meta.altitude);
-       SQLITE3_SAFE_FREE(test_sql);
-
-       char *sql = sqlite3_mprintf("UPDATE %q SET media_size=%lld, media_modified_time=%d, media_thumbnail_path=%Q, media_title=%Q, album_id=%d, media_album=%Q, media_artist=%Q, media_album_artist=%Q, media_genre=%Q, \
-               media_composer=%Q, media_year=%Q, media_recorded_date=%Q, media_copyright=%Q, media_track_num=%Q, media_description=%Q, media_bitrate=%d, media_bitpersample=%d, media_samplerate=%d, media_channel=%d, media_duration=%d, \
-               media_longitude=%f, media_latitude=%f, media_altitude=%f, exposure_time=%Q, fnumber=%f, iso=%d, model=%Q, media_width=%d, media_height=%d, media_datetaken=%Q, media_orientation=%d, validity=1 WHERE media_path=%Q;",
+       char *sql = sqlite3_mprintf("UPDATE %q SET media_size=%lld, media_modified_time=%d, media_thumbnail_path=%Q, media_title=%Q, album_id=%d, media_album=%Q, media_artist=%Q, media_album_artist=%Q, media_genre=%Q, media_composer=%Q, media_year=%Q, media_recorded_date=%Q, media_copyright=%Q, media_track_num=%Q, media_description=%Q, media_bitrate=%d, media_bitpersample=%d, media_samplerate=%d, media_channel=%d, media_duration=%d, media_width=%d, media_height=%d, media_datetaken=%Q, media_orientation=%d, validity=1 WHERE media_path=%Q;",
                                DB_TABLE_MEDIA,
                                content_info->size,
                                content_info->modified_time,
@@ -203,13 +181,6 @@ int _media_svc_update_item_with_data(bool is_direct, media_svc_content_info_s *c
                                content_info->media_meta.samplerate,
                                content_info->media_meta.channel,
                                content_info->media_meta.duration,
-                               content_info->media_meta.longitude,
-                               content_info->media_meta.latitude,
-                               content_info->media_meta.altitude,
-                               content_info->media_meta.exposure_time,
-                               content_info->media_meta.fnumber,
-                               content_info->media_meta.iso,
-                               content_info->media_meta.model,
                                content_info->media_meta.width,
                                content_info->media_meta.height,
                                content_info->media_meta.datetaken,
index 51f33ee..1c61cf4 100644 (file)
@@ -68,8 +68,6 @@
 #define VIDEO_PREFIX "video/"
 #define VIDEO_PREFIX_LEN 6
 
-#define MEDIA_SVC_DEFAULT_GPS_VALUE                    -200                    /**< Default GPS Value*/
-
 #define MEDIA_SVC_PDF_TAG_TAIL_LEN 12
 #define MEDIA_SVC_PDF_BUF_SIZE 256
 
@@ -147,63 +145,10 @@ RETRY_GEN:
        return g_strdup(uuid_unparsed);
 }
 
-/* GPS information is not ExifTag member */
-static int __media_svc_get_exif_gps_double(ExifData *ed, double *value, long tagtype)
-{
-       ExifEntry *entry;
-       char gps_buf[MEDIA_SVC_METADATA_LEN_MAX + 1] = {0, };
-       double tmp_arr[3] = { 0.0, 0.0, 0.0 };
-       int i = 0;
-       char **tmp_split = NULL;
-
-       media_svc_retv_if(!ed, MS_MEDIA_ERR_INVALID_PARAMETER);
-       media_svc_retv_if(!value, MS_MEDIA_ERR_INVALID_PARAMETER);
-
-       entry = exif_data_get_entry(ed, tagtype);
-       media_svc_retv_if(!entry, MS_MEDIA_ERR_INTERNAL);
-
-       exif_entry_get_value(entry, gps_buf, sizeof(gps_buf));
-       gps_buf[strlen(gps_buf)] = '\0';
-
-       tmp_split = g_strsplit(gps_buf, ",", -1);
-       if (g_strv_length(tmp_split) != 3) {
-               g_strfreev(tmp_split);
-               media_svc_error("Wrong GPS format");
-               return MS_MEDIA_ERR_INTERNAL;
-       }
-
-       for (i = 0; i < 3; i++)
-               tmp_arr[i] = g_strtod(tmp_split[i], NULL);
-
-       g_strfreev(tmp_split);
-
-       *value = tmp_arr[0] + tmp_arr[1] / 60 + tmp_arr[2] / 3600;
-
-       return MS_MEDIA_ERR_NONE;
-}
-
-static int __media_svc_get_exif_gps_str(ExifData *ed, char *value, long tagtype)
-{
-       ExifEntry *entry;
-
-       media_svc_retv_if(!ed, MS_MEDIA_ERR_INVALID_PARAMETER);
-       media_svc_retv_if(!value, MS_MEDIA_ERR_INVALID_PARAMETER);
-
-       entry = exif_data_get_entry(ed, tagtype);
-       if (entry) {
-               exif_entry_get_value(entry, value, MEDIA_SVC_METADATA_LEN_MAX);
-               value[strlen(value)] = '\0';
-       }
-
-       return MS_MEDIA_ERR_NONE;
-}
-
-static int __media_svc_get_exif_info(ExifData *ed, char *buf, int *i_value, double *d_value, ExifTag tagtype)
+static int __media_svc_get_exif_info(ExifData *ed, char *buf, int *i_value, ExifTag tagtype)
 {
        ExifEntry *entry;
        ExifByteOrder mByteOrder;
-       ExifRational mRational;
-       long numerator, denominator;
 
        media_svc_retv_if(!ed, MS_MEDIA_ERR_INVALID_PARAMETER);
 
@@ -214,32 +159,12 @@ static int __media_svc_get_exif_info(ExifData *ed, char *buf, int *i_value, doub
        case EXIF_TAG_ORIENTATION:
        case EXIF_TAG_PIXEL_X_DIMENSION:
        case EXIF_TAG_PIXEL_Y_DIMENSION:
-       case EXIF_TAG_ISO_SPEED_RATINGS:
                media_svc_retvm_if(!i_value, MS_MEDIA_ERR_INVALID_PARAMETER, "i_value is NULL");
 
                mByteOrder = exif_data_get_byte_order(ed);
                short exif_value = exif_get_short(entry->data, mByteOrder);
                *i_value = (int)exif_value;
                break;
-       case EXIF_TAG_EXPOSURE_TIME:
-               media_svc_retvm_if(!buf, MS_MEDIA_ERR_INVALID_PARAMETER, "buf is NULL");
-
-               mByteOrder = exif_data_get_byte_order(ed);
-               mRational = exif_get_rational(entry->data, mByteOrder);
-               numerator = mRational.numerator;
-               denominator = mRational.denominator;
-               snprintf(buf, MEDIA_SVC_METADATA_LEN_MAX, "%ld/%ld", numerator, denominator);
-               break;
-       case EXIF_TAG_FNUMBER:
-               media_svc_retvm_if(!d_value, MS_MEDIA_ERR_INVALID_PARAMETER, "d_value is NULL");
-
-               mByteOrder = exif_data_get_byte_order(ed);
-               mRational = exif_get_rational(entry->data, mByteOrder);
-               numerator = mRational.numerator;
-               denominator = mRational.denominator;
-
-               *d_value = ((numerator*1.0)/(denominator*1.0));
-               break;
        default:
                media_svc_retvm_if(!buf, MS_MEDIA_ERR_INVALID_PARAMETER, "buf is NULL");
 
@@ -605,89 +530,6 @@ int _media_svc_set_media_info(media_svc_content_info_s *content_info, const char
        return MS_MEDIA_ERR_NONE;
 }
 
-static int __image_360_check(const char *path)
-{
-       FILE *fp = NULL;
-       size_t size = 0, app1_size = 0, exif_app1_xmp_size = 0;
-       unsigned char exif_header[4] = {0, };
-       unsigned char exif_app1[2] = {0, };
-       unsigned char exif_app1_xmp[2] = {0, };
-       unsigned char exif_app1_xmp_t[2] = {0, };
-       GString *xmp_data = NULL;
-       int fdata = 0;
-       int result = 0;
-
-       memset(exif_header, 0x00, sizeof(exif_header));
-       memset(exif_app1, 0x00, sizeof(exif_app1));
-       memset(exif_app1_xmp, 0x00, sizeof(exif_app1_xmp));
-       memset(exif_app1_xmp_t, 0x00, sizeof(exif_app1_xmp_t));
-
-       fp = fopen(path, "rb");
-       if (fp == NULL)
-               goto ERROR;
-
-       size = fread(exif_header, 1, sizeof(exif_header), fp);
-       if (size != sizeof(exif_header))
-               goto ERROR;
-
-       if ((exif_header[0] == 0xff) && (exif_header[1] == 0xd8) && (exif_header[2] == 0xff) && (exif_header[3] == 0xe1)) {
-               size = fread(exif_app1, 1, sizeof(exif_app1), fp);
-               if (size != sizeof(exif_app1))
-                       goto ERROR;
-
-               if ((size_t)((exif_app1[0] << 8) | (exif_app1[1])) <= 2)
-                       goto ERROR;
-
-               app1_size = (size_t)((exif_app1[0] << 8) | (exif_app1[1])) - 2 ;
-               if (fseek(fp, app1_size, SEEK_CUR) != 0)
-                       goto ERROR;
-
-               size = fread(exif_app1_xmp, 1, sizeof(exif_app1_xmp), fp);
-               if (size != sizeof(exif_app1_xmp))
-                       goto ERROR;
-
-               if ((exif_app1_xmp[0] == 0xff) && (exif_app1_xmp[1] == 0xe1)) {
-                       size = fread(exif_app1_xmp_t, 1, sizeof(exif_app1_xmp_t), fp);
-                       if (size != sizeof(exif_app1_xmp_t))
-                               goto ERROR;
-
-                       if ((size_t)((exif_app1_xmp_t[0] << 8) | (exif_app1_xmp_t[1])) <= 2)
-                               goto ERROR;
-
-                       exif_app1_xmp_size = (size_t)((exif_app1_xmp_t[0] << 8) | (exif_app1_xmp_t[1])) - 2;
-
-                       xmp_data = g_string_sized_new(exif_app1_xmp_size);
-
-                       do {
-                               exif_app1_xmp_size--;
-                               fdata = fgetc(fp);
-                               if (fdata == EOF)
-                                       continue;
-                               if (fdata == '\0')
-                                       continue;
-
-                               xmp_data = g_string_append_c(xmp_data, (gchar)fdata);
-                       } while (exif_app1_xmp_size > 0);
-
-                       if (strstr(xmp_data->str, "UsePanoramaViewer") &&
-                               strstr(xmp_data->str, "True") &&
-                               strstr(xmp_data->str, "ProjectionType") &&
-                               strstr(xmp_data->str, "equirectangular"))
-                               result = 1;
-
-                       g_string_free(xmp_data, TRUE);
-               }
-       }
-
-ERROR:
-       if (fp) {
-               fclose(fp);
-               fp = NULL;
-       }
-
-       return result;
-}
-
 static char * __media_svc_get_title(MMHandleType tag, const char *path)
 {
        int ret = FILEINFO_ERROR_NONE;
@@ -722,14 +564,11 @@ char * _media_svc_get_title_by_path(const char *path)
 
 int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info)
 {
-       double value = 0.0;
        int orient_value = 0;
        int exif_width = 0;
        int exif_height = 0;
        ExifData *ed = NULL;
        bool has_datetaken = false;
-       double fnumber = 0.0;
-       int iso = 0;
        char *path = NULL;
 
        char buf[MEDIA_SVC_METADATA_LEN_MAX + 1] = { '\0' };
@@ -741,10 +580,6 @@ int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info)
        path = content_info->path;
        content_info->media_meta.title = __media_svc_get_title(NULL, path);
 
-       content_info->media_meta.latitude = MEDIA_SVC_DEFAULT_GPS_VALUE;
-       content_info->media_meta.longitude = MEDIA_SVC_DEFAULT_GPS_VALUE;
-       content_info->media_meta.altitude = MEDIA_SVC_DEFAULT_GPS_VALUE;
-
        /* Not used. But to preserved the behavior, set MEDIA_SVC_TAG_UNKNOWN. */
        content_info->media_meta.album = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
        content_info->media_meta.artist = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
@@ -762,29 +597,8 @@ int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info)
                goto GET_WIDTH_HEIGHT;
        }
 
-       content_info->media_meta.is_360 = __image_360_check(path);
-
-       memset(buf, 0x00, sizeof(buf));
-       if (__media_svc_get_exif_gps_double(ed, &value, EXIF_TAG_GPS_LATITUDE) == MS_MEDIA_ERR_NONE) {
-               if (__media_svc_get_exif_gps_str(ed, buf, EXIF_TAG_GPS_LATITUDE_REF) == MS_MEDIA_ERR_NONE) {
-                       if (!g_strcmp0(buf, "S"))
-                               value *= -1;
-                       content_info->media_meta.latitude = value;
-               }
-       }
-
        memset(buf, 0x00, sizeof(buf));
-       if (__media_svc_get_exif_gps_double(ed, &value, EXIF_TAG_GPS_LONGITUDE) == MS_MEDIA_ERR_NONE) {
-               if (__media_svc_get_exif_gps_str(ed, buf, EXIF_TAG_GPS_LONGITUDE_REF) == MS_MEDIA_ERR_NONE) {
-                       if (!g_strcmp0(buf, "W"))
-                               value *= -1;
-
-                       content_info->media_meta.longitude = value;
-               }
-       }
-
-       memset(buf, 0x00, sizeof(buf));
-       if (__media_svc_get_exif_info(ed, buf, NULL, NULL, EXIF_TAG_IMAGE_DESCRIPTION) == MS_MEDIA_ERR_NONE) {
+       if (__media_svc_get_exif_info(ed, buf, NULL, EXIF_TAG_IMAGE_DESCRIPTION) == MS_MEDIA_ERR_NONE) {
                if (strlen(buf) > 0)
                        content_info->media_meta.description = g_strdup(buf);
                else
@@ -792,7 +606,7 @@ int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info)
        }
 
        memset(buf, 0x00, sizeof(buf));
-       if (!has_datetaken && __media_svc_get_exif_info(ed, buf, NULL, NULL, EXIF_TAG_DATE_TIME_ORIGINAL) == MS_MEDIA_ERR_NONE) {
+       if (!has_datetaken && __media_svc_get_exif_info(ed, buf, NULL, EXIF_TAG_DATE_TIME_ORIGINAL) == MS_MEDIA_ERR_NONE) {
                if (strlen(buf) > 0) {
                        has_datetaken = true;
                        content_info->media_meta.datetaken = g_strdup(buf);
@@ -803,7 +617,7 @@ int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info)
        }
 
        memset(buf, 0x00, sizeof(buf));
-       if (!has_datetaken && __media_svc_get_exif_info(ed, buf, NULL, NULL, EXIF_TAG_DATE_TIME) == MS_MEDIA_ERR_NONE) {
+       if (!has_datetaken && __media_svc_get_exif_info(ed, buf, NULL, EXIF_TAG_DATE_TIME) == MS_MEDIA_ERR_NONE) {
                if (strlen(buf) > 0) {
                        has_datetaken = true;
                        content_info->media_meta.datetaken = g_strdup(buf);
@@ -821,42 +635,20 @@ int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info)
                        media_svc_debug("Timeline : %ld", content_info->timeline);
        }
 
-       memset(buf, 0x00, sizeof(buf));
-       /* Get exposure_time value from exif. */
-       if (__media_svc_get_exif_info(ed, buf, NULL, NULL, EXIF_TAG_EXPOSURE_TIME) == MS_MEDIA_ERR_NONE) {
-               if (strlen(buf) > 0)
-                       content_info->media_meta.exposure_time = g_strdup(buf);
-       }
-
-       /* Get fnumber value from exif. */
-       if (__media_svc_get_exif_info(ed, NULL, NULL, &fnumber, EXIF_TAG_FNUMBER) == MS_MEDIA_ERR_NONE)
-               content_info->media_meta.fnumber = fnumber;
-
-       /* Get iso value from exif. */
-       if (__media_svc_get_exif_info(ed, NULL, &iso, NULL, EXIF_TAG_ISO_SPEED_RATINGS) == MS_MEDIA_ERR_NONE)
-               content_info->media_meta.iso = iso;
-
-       memset(buf, 0x00, sizeof(buf));
-       /* Get model value from exif. */
-       if (__media_svc_get_exif_info(ed, buf, NULL, NULL, EXIF_TAG_MODEL) == MS_MEDIA_ERR_NONE) {
-               if (strlen(buf) > 0)
-                       content_info->media_meta.model = g_strdup(buf);
-       }
-
        /* Get orientation value from exif. */
-       if (__media_svc_get_exif_info(ed, NULL, &orient_value, NULL, EXIF_TAG_ORIENTATION) == MS_MEDIA_ERR_NONE) {
+       if (__media_svc_get_exif_info(ed, NULL, &orient_value, EXIF_TAG_ORIENTATION) == MS_MEDIA_ERR_NONE) {
                if (orient_value >= NOT_AVAILABLE && orient_value <= ROT_270)
                        content_info->media_meta.orientation = orient_value;
        }
 
        /* Get width value from exif. */
-       if (__media_svc_get_exif_info(ed, NULL, &exif_width, NULL, EXIF_TAG_PIXEL_X_DIMENSION) == MS_MEDIA_ERR_NONE) {
+       if (__media_svc_get_exif_info(ed, NULL, &exif_width, EXIF_TAG_PIXEL_X_DIMENSION) == MS_MEDIA_ERR_NONE) {
                if (exif_width > 0)
                        content_info->media_meta.width = exif_width;
        }
 
        /* Get height value from exif. */
-       if (__media_svc_get_exif_info(ed, NULL, &exif_height, NULL, EXIF_TAG_PIXEL_Y_DIMENSION) == MS_MEDIA_ERR_NONE) {
+       if (__media_svc_get_exif_info(ed, NULL, &exif_height, EXIF_TAG_PIXEL_Y_DIMENSION) == MS_MEDIA_ERR_NONE) {
                if (exif_height > 0)
                        content_info->media_meta.height = exif_height;
        }
@@ -971,8 +763,6 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, bool is_direct, media_svc
                        content_info->media_meta.rating = 0;
                }
 
-               mmf_error = mm_file_get_attrs(tag, MM_FILE_TAG_SPHERICAL, &content_info->media_meta.is_360, NULL);
-
                /*Do not extract artwork for the USB Storage content*/
                if (support_albumart) {
                        mmf_error = mm_file_get_attrs(tag, MM_FILE_TAG_ARTWORK, &image, &size, NULL);
@@ -1022,24 +812,7 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, bool is_direct, media_svc
                        content_info->album_id = album_id;
                }
 
-               content_info->media_meta.longitude = MEDIA_SVC_DEFAULT_GPS_VALUE;
-               content_info->media_meta.latitude = MEDIA_SVC_DEFAULT_GPS_VALUE;
-               content_info->media_meta.altitude = MEDIA_SVC_DEFAULT_GPS_VALUE;
-
                if (content_info->media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO) {
-                       double longitude = 0.0;
-                       double latitude = 0.0;
-                       double altitude = 0.0;
-
-                       mm_file_get_attrs(tag, MM_FILE_TAG_LONGITUDE, &longitude,
-                               MM_FILE_TAG_LATIDUE, &latitude,
-                               MM_FILE_TAG_ALTIDUE, &altitude,
-                               NULL);
-
-                       content_info->media_meta.longitude = (longitude == 0.0) ? MEDIA_SVC_DEFAULT_GPS_VALUE : longitude;
-                       content_info->media_meta.latitude = (latitude == 0.0) ? MEDIA_SVC_DEFAULT_GPS_VALUE : latitude;
-                       content_info->media_meta.altitude = (altitude == 0.0) ? MEDIA_SVC_DEFAULT_GPS_VALUE : altitude;
-
                        mmf_error = mm_file_get_attrs(tag, MM_FILE_TAG_ROTATE, &p, &size, NULL);
                        if ((mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
                                content_info->media_meta.orientation = atoi(p);
@@ -1403,8 +1176,6 @@ void _media_svc_destroy_content_info(media_svc_content_info_s *content_info)
        g_free(content_info->media_meta.track_num);
        g_free(content_info->media_meta.description);
        g_free(content_info->media_meta.datetaken);
-       g_free(content_info->media_meta.exposure_time);
-       g_free(content_info->media_meta.model);
 }
 
 int _media_svc_create_thumbnail(const char *path, char *thumb_path, media_svc_media_type_e media_type, uid_t uid)
index 91d659e..405833f 100755 (executable)
@@ -53,20 +53,12 @@ typedef struct {
        int             samplerate;                     /**< samplerate*/
        int             channel;                                /**< channel*/
        int             duration;                       /**< duration*/
-       float           longitude;                      /**< longitude*/
-       float           latitude;                               /**< latitude*/
-       float           altitude;                               /**< altitude*/
-       char            *exposure_time;         /**< exposure_time*/
-       float           fnumber;                        /**< fnumber*/
-       int             iso;                                    /**< iso*/
-       char            *model;                         /**< model*/
        int             width;                          /**< width*/
        int             height;                         /**< height*/
        char            *datetaken;                     /**< datetaken*/
        int             orientation;                    /**< orientation*/
        int             rating;                         /**< user defined rating */
        int             bitpersample;           /**< bitrate*/
-       int             is_360;
 } media_svc_content_meta_s;
 
 /**