diff options
| author | hj kim <backto.kim@samsung.com> | 2020-02-10 01:41:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2020-02-10 01:41:47 +0000 |
| commit | c2ca476eab9ed88efc91951bde7451ed699f11a0 (patch) | |
| tree | a21df9427a49f5ef5165294792c7fbf39b16183d | |
| parent | 97e0ec2be16a3f22b1d21c936c9b3242742949f0 (diff) | |
| parent | 36e986fa283cf07a58f2af02667e7883185b7b1a (diff) | |
| download | libmedia-service-c2ca476eab9ed88efc91951bde7451ed699f11a0.tar.gz libmedia-service-c2ca476eab9ed88efc91951bde7451ed699f11a0.tar.bz2 libmedia-service-c2ca476eab9ed88efc91951bde7451ed699f11a0.zip | |
Merge "Remove gps getting function" into tizen_5.5
| -rw-r--r-- | src/common/media-svc-util.c | 57 |
1 files changed, 11 insertions, 46 deletions
diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c index 3e5e8db..03524e7 100644 --- a/src/common/media-svc-util.c +++ b/src/common/media-svc-util.c @@ -487,32 +487,6 @@ static bool __media_svc_get_file_ext(const char *file_path, char *file_ext) return false; } -static int __media_svc_get_location_value(MMHandleType tag, double *longitude, double *latitude, double *altitude) -{ - int mmf_error = 0; - double gps_value = 0.0; - - mmf_error = mm_file_get_attrs(tag, MM_FILE_TAG_LONGITUDE, &gps_value, NULL); - if (mmf_error == FILEINFO_ERROR_NONE) { - if (longitude != NULL) - *longitude = (gps_value == 0.0) ? MEDIA_SVC_DEFAULT_GPS_VALUE : gps_value; - } - - mmf_error = mm_file_get_attrs(tag, MM_FILE_TAG_LATIDUE, &gps_value, NULL); - if (mmf_error == FILEINFO_ERROR_NONE) { - if (latitude != NULL) - *latitude = (gps_value == 0.0) ? MEDIA_SVC_DEFAULT_GPS_VALUE : gps_value; - } - - mmf_error = mm_file_get_attrs(tag, MM_FILE_TAG_ALTIDUE, &gps_value, NULL); - if (mmf_error == FILEINFO_ERROR_NONE) { - if (altitude != NULL) - *altitude = (gps_value == 0.0) ? MEDIA_SVC_DEFAULT_GPS_VALUE : gps_value; - } - - return MS_MEDIA_ERR_NONE; -} - static int __media_svc_resize_artwork(const char *path, const char *img_format) { int ret = MS_MEDIA_ERR_NONE; @@ -1252,23 +1226,10 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, bool is_direct, media_svc mmf_error = mm_file_get_attrs(tag, MM_FILE_TAG_TITLE, &p, &size, NULL); if (mmf_error == FILEINFO_ERROR_NONE && size > 0) { - if (!isspace(*p)) { - content_info->media_meta.title = g_strdup(p); - } else { - int idx = 0; + while(p && isspace(*p)) + p++; - for (idx = 0; idx < size; idx++) { - if (isspace(*p)) { - media_svc_debug("SPACE [%s]", p); - p++; - continue; - } else { - media_svc_debug("Not SPACE [%s]", p); - content_info->media_meta.title = g_strdup(p); - break; - } - } - } + content_info->media_meta.title = g_strdup(p); } mmf_error = mm_file_get_attrs(tag, MM_FILE_TAG_DESCRIPTION, &p, &size, NULL); @@ -1425,10 +1386,14 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, bool is_direct, media_svc double latitude = 0.0; double altitude = 0.0; - __media_svc_get_location_value(tag, &longitude, &latitude, &altitude); - content_info->media_meta.longitude = longitude; - content_info->media_meta.latitude = latitude; - content_info->media_meta.altitude = altitude; + 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_CDIS, &cdis_value, NULL); if (mmf_error != FILEINFO_ERROR_NONE) |