Update metadata extract logic 09/304909/2
authorminje.ahn <minje.ahn@samsung.com>
Thu, 25 Jan 2024 08:06:17 +0000 (17:06 +0900)
committerminje.ahn <minje.ahn@samsung.com>
Fri, 26 Jan 2024 07:12:40 +0000 (16:12 +0900)
1. Separate audio and video.
2. Use default values in DB.
3. Modified to not extract deprecated metadata.

Change-Id: I7b0efa31065124b96c0aee9267bffa15be282d87
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/common/media-svc.c
src/include/common/media-svc-util.h

index 9660175..e877c71 100755 (executable)
@@ -373,12 +373,12 @@ int _media_svc_init_table_query(void)
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_artist", DB_TYPE_TEXT, NULL, false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_album_artist", DB_TYPE_TEXT, NULL, false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_genre", DB_TYPE_TEXT, NULL, false, false, true);
-       __add_column_info(&column_list[DB_LIST_MEDIA], "media_composer", DB_TYPE_TEXT, NULL, false, false, true);
+       __add_column_info(&column_list[DB_LIST_MEDIA], "media_composer", DB_TYPE_TEXT, "DEFAULT ''", false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_year", DB_TYPE_TEXT, NULL, false, false, true);
-       __add_column_info(&column_list[DB_LIST_MEDIA], "media_recorded_date", DB_TYPE_TEXT, NULL, false, false, true);
-       __add_column_info(&column_list[DB_LIST_MEDIA], "media_copyright", DB_TYPE_TEXT, NULL, false, false, true);
+       __add_column_info(&column_list[DB_LIST_MEDIA], "media_recorded_date", DB_TYPE_TEXT, "DEFAULT ''", false, false, true);
+       __add_column_info(&column_list[DB_LIST_MEDIA], "media_copyright", DB_TYPE_TEXT, "DEFAULT ''", false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_track_num", DB_TYPE_TEXT, NULL, false, false, true);
-       __add_column_info(&column_list[DB_LIST_MEDIA], "media_description", DB_TYPE_TEXT, NULL, false, false, true);
+       __add_column_info(&column_list[DB_LIST_MEDIA], "media_description", DB_TYPE_TEXT, "DEFAULT ''", false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_bitrate", DB_TYPE_INT, "DEFAULT -1", false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_bitpersample", DB_TYPE_INT, "DEFAULT 0", false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_samplerate", DB_TYPE_INT, "DEFAULT -1", false, false, true);
index 0961f99..6ba8dae 100755 (executable)
@@ -72,13 +72,11 @@ 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_width, media_height, media_datetaken, media_orientation, media_rating, media_timeline, storage_uuid";
+       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_year, media_track_num, media_width, media_height, media_datetaken, media_orientation, 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";
+       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, album_id, 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, %d, %d, %Q, %d, %d, %d, %Q);",
+       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, %d, %d, %Q, %d, %Q);",
                                DB_TABLE_MEDIA, db_fields,
                                content_info->media_uuid,
                                content_info->path,
@@ -88,7 +86,7 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                                content_info->size,
                                content_info->added_time,
                                content_info->modified_time,
-                               content_info->folder_id,                        /* 1st line */
+                               content_info->folder_id,
                                content_info->thumbnail_path,
                                content_info->media_meta.title,
                                content_info->album_id,
@@ -96,32 +94,20 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                                content_info->media_meta.artist,
                                content_info->media_meta.album_artist,
                                content_info->media_meta.genre,
-                               content_info->media_meta.composer,
                                content_info->media_meta.year,
-                               content_info->media_meta.recorded_date,
-                               content_info->media_meta.copyright,
                                content_info->media_meta.track_num,
-                               content_info->media_meta.description,   /* 2nd line */
-                               content_info->media_meta.bitrate,
-                               content_info->media_meta.bitpersample,
-                               content_info->media_meta.samplerate,
-                               content_info->media_meta.channel,
-                               content_info->media_meta.duration,
                                content_info->media_meta.width,
                                content_info->media_meta.height,
                                content_info->media_meta.datetaken,
                                content_info->media_meta.orientation,
-                               content_info->media_meta.rating,
-                               content_info->timeline,
-                               content_info->storage_uuid              /* 3rd line */
-                       );
+                               content_info->storage_uuid);
 
        /* Check query length */
        if (sql != NULL && strlen(sql) >= (MEDIA_SVC_QUERY_LEN_MAX - 1) && is_direct == false) {
                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);",
+               sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %lld, %d, %Q);",
                                                DB_TABLE_MEDIA, db_fields_basic,
                                                content_info->media_uuid,
                                                content_info->path,
@@ -132,9 +118,7 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                                                content_info->added_time,
                                                content_info->modified_time,
                                                content_info->folder_id,
-                                               content_info->thumbnail_path,
                                                content_info->album_id,
-                                               content_info->timeline,
                                                content_info->storage_uuid
                                                );
        }
@@ -159,7 +143,7 @@ int _media_svc_update_item_with_data(bool is_direct, media_svc_content_info_s *c
 {
        int ret = MS_MEDIA_ERR_NONE;
 
-       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;",
+       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_year=%Q, media_track_num=%Q, 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,
@@ -170,17 +154,8 @@ int _media_svc_update_item_with_data(bool is_direct, media_svc_content_info_s *c
                                content_info->media_meta.artist,
                                content_info->media_meta.album_artist,
                                content_info->media_meta.genre,
-                               content_info->media_meta.composer,
                                content_info->media_meta.year,
-                               content_info->media_meta.recorded_date,
-                               content_info->media_meta.copyright,
                                content_info->media_meta.track_num,
-                               content_info->media_meta.description,
-                               content_info->media_meta.bitrate,
-                               content_info->media_meta.bitpersample,
-                               content_info->media_meta.samplerate,
-                               content_info->media_meta.channel,
-                               content_info->media_meta.duration,
                                content_info->media_meta.width,
                                content_info->media_meta.height,
                                content_info->media_meta.datetaken,
index 73c1895..263df8d 100644 (file)
 
 #include <unistd.h>
 #include <stdlib.h>
-#ifndef __USE_XOPEN
-#define DEF_XOPEN
-#define __USE_XOPEN /* needed for strptime */
-#endif
-#include <time.h>
-#ifdef DEF_XOPEN
-#undef __USE_XOPEN
-#endif
 #include <string.h>
-#include <sys/vfs.h>
-#include <glib/gstdio.h>
 #include <sys/stat.h>
-#include <dirent.h>
+#include <sys/vfs.h>
 #include <ctype.h>
 #include <aul/aul.h>
 #include <mm_file.h>
@@ -40,7 +30,6 @@
 #include <uuid/uuid.h>
 #include <mm_util_magick.h>
 #include <media-thumbnail.h>
-#include "media-util-err.h"
 #include "media-svc-util.h"
 #include "media-svc-db-utils.h"
 #include "media-svc-debug.h"
@@ -175,58 +164,6 @@ static int __media_svc_get_exif_info(ExifData *ed, char *buf, int *i_value, Exif
        return MS_MEDIA_ERR_NONE;
 }
 
-static time_t __media_svc_get_timeline_from_str(const char *timstr)
-{
-       struct tm t;
-       time_t modified_t = 0;
-       time_t rawtime;
-       struct tm timeinfo;
-
-       if (!STRING_VALID(timstr)) {
-               media_svc_error("Invalid Parameter");
-               return 0;
-       }
-
-       /*Exif Format : %Y:%m:%d %H:%M:%S
-       Videoc Content Creation_time format of FFMpeg : %Y-%m-%d %H:%M:%S*/
-       memset(&t, 0x00, sizeof(struct tm));
-
-       tzset();
-       time(&rawtime);
-       localtime_r(&rawtime, &timeinfo);
-
-       if (strptime(timstr, "%Y:%m:%d %H:%M:%S", &t) || strptime(timstr, "%Y-%m-%d %H:%M:%S", &t)) {
-               t.tm_isdst = timeinfo.tm_isdst;
-               if (t.tm_isdst != 0)
-                       media_svc_debug("DST %d", t.tm_isdst);
-
-               /* If time string has timezone */
-               if (strptime(timstr, "%Y:%m:%d %H:%M:%S %z", &t) || strptime(timstr, "%Y-%m-%d %H:%M:%S %z", &t)) {
-                       char tim_tmp_str[255] = { 0, };
-
-                       /* ISO8601 Time string format */
-                       strftime(tim_tmp_str, 255, "%Y-%m-%dT%H:%M:%S%z", &t);
-                       GDateTime *pdatetime = g_date_time_new_from_iso8601(tim_tmp_str, NULL);
-                       if (pdatetime)
-                               modified_t = g_date_time_to_unix(pdatetime);
-                       g_date_time_unref(pdatetime);
-                       media_svc_debug("Calibrated timeval : [%ld][%s]", modified_t, tim_tmp_str);
-               } else {
-                       /* Just localtime */
-                       modified_t = mktime(&t);
-               }
-
-               if (modified_t > 0)
-                       return modified_t;
-               else
-                       media_svc_debug("Failed to get timeline : [%s] [%d:%d:%d: %d:%d:%d]", timstr, t.tm_year, t.tm_mon, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec);
-       } else {
-               media_svc_error("Failed to get timeline : [%s]", timstr);
-       }
-
-       return 0;
-}
-
 static int __media_svc_get_media_type(const char *path, const char *mime_type, media_svc_media_type_e *media_type)
 {
        int idx = 0;
@@ -585,9 +522,7 @@ int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info)
        content_info->media_meta.artist = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
        content_info->media_meta.album_artist = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
        content_info->media_meta.genre = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
-       content_info->media_meta.composer = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
        content_info->media_meta.year = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
-       content_info->media_meta.copyright = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
        content_info->media_meta.track_num = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
 
        /* Load an ExifData object from an EXIF file */
@@ -598,21 +533,10 @@ int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info)
        }
 
        memset(buf, 0x00, sizeof(buf));
-       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
-                       content_info->media_meta.description = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
-       }
-
-       memset(buf, 0x00, sizeof(buf));
        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);
-
-                       /* This is same as recorded_date */
-                       content_info->media_meta.recorded_date = g_strdup(buf);
                }
        }
 
@@ -621,20 +545,9 @@ int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info)
                if (strlen(buf) > 0) {
                        has_datetaken = true;
                        content_info->media_meta.datetaken = g_strdup(buf);
-
-                       /* This is same as recorded_date */
-                       content_info->media_meta.recorded_date = g_strdup(buf);
                }
        }
 
-       if (has_datetaken) {
-               content_info->timeline = __media_svc_get_timeline_from_str(content_info->media_meta.datetaken);
-               if (content_info->timeline == 0)
-                       content_info->timeline = content_info->modified_time;
-               else
-                       media_svc_debug("Timeline : %ld", content_info->timeline);
-       }
-
        /* Get orientation value from exif. */
        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)
@@ -688,9 +601,8 @@ static char * __media_svc_get_tag_str_value(MMHandleType tag, const char *tag_na
        return g_strdup(MEDIA_SVC_TAG_UNKNOWN);
 }
 
-int _media_svc_extract_media_metadata(sqlite3 *handle, bool is_direct, media_svc_content_info_s *content_info, uid_t uid)
+int _media_svc_extract_audio_metadata(sqlite3 *handle, bool is_direct, media_svc_content_info_s *content_info, uid_t uid)
 {
-       MMHandleType content = 0;
        MMHandleType tag = 0;
        char *p = NULL;
        unsigned char *image = NULL;
@@ -713,39 +625,8 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, bool is_direct, media_svc
                content_info->media_meta.artist = __media_svc_get_tag_str_value(tag, MM_FILE_TAG_ARTIST);
                content_info->media_meta.album_artist = __media_svc_get_tag_str_value(tag, MM_FILE_TAG_ALBUM_ARTIST);
                content_info->media_meta.genre = __media_svc_get_tag_str_value(tag, MM_FILE_TAG_GENRE);
-               content_info->media_meta.description = __media_svc_get_tag_str_value(tag, MM_FILE_TAG_DESCRIPTION);
-               content_info->media_meta.composer = __media_svc_get_tag_str_value(tag, MM_FILE_TAG_AUTHOR);
-               content_info->media_meta.copyright = __media_svc_get_tag_str_value(tag, MM_FILE_TAG_COPYRIGHT);
                content_info->media_meta.track_num = __media_svc_get_tag_str_value(tag, MM_FILE_TAG_TRACK_NUM);
 
-               mmf_error = mm_file_get_attrs(tag, MM_FILE_TAG_RECDATE, &p, &size, NULL);
-               if ((mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
-                       if (g_str_has_suffix(content_info->mime_type, "mp4") || g_str_has_suffix(content_info->mime_type, "3gpp")) {
-                               /*Creation time format is 2013-01-01 00:00:00 +0000. change it to 2013:01:01 00:00:00  +0000 like exif time format*/
-                               char *p_value = g_strdelimit(g_strdup(p), "-", ':');
-                               content_info->media_meta.recorded_date = g_strdup_printf("%s +0000", p_value);
-                               g_free(p_value);
-                       } else {
-                               content_info->media_meta.recorded_date = g_strdup(p);
-                       }
-
-                       if (STRING_VALID(content_info->media_meta.recorded_date)) {
-                               content_info->timeline = __media_svc_get_timeline_from_str(content_info->media_meta.recorded_date);
-                               if (content_info->timeline == 0)
-                                       content_info->timeline = content_info->modified_time;
-
-                               /* This is same as datetaken */
-                               /* Remove compensation string */
-                               if (strlen(content_info->media_meta.recorded_date) > MEDIA_SVC_DEFAULT_FORMAT_LEN) {
-                                       content_info->media_meta.datetaken = g_strndup(content_info->media_meta.recorded_date, MEDIA_SVC_DEFAULT_FORMAT_LEN);
-                                       g_free(content_info->media_meta.recorded_date);
-                                       content_info->media_meta.recorded_date = g_strdup(content_info->media_meta.datetaken);
-                               } else {
-                                       content_info->media_meta.datetaken = g_strdup(content_info->media_meta.recorded_date);
-                               }
-                       }
-               }
-
                mmf_error = mm_file_get_attrs(tag, MM_FILE_TAG_DATE, &p, &size, NULL);
                if (mmf_error == FILEINFO_ERROR_NONE && size == 4) {
                        if (__media_svc_safe_atoi(p, &convert_value) == MS_MEDIA_ERR_NONE)
@@ -755,14 +636,6 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, bool is_direct, media_svc
                if (!content_info->media_meta.year)
                                content_info->media_meta.year = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
 
-               mmf_error = mm_file_get_attrs(tag, MM_FILE_TAG_RATING, &p, &size, NULL);
-               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
-                       if (__media_svc_safe_atoi(p, &convert_value) == MS_MEDIA_ERR_NONE)
-                               content_info->media_meta.rating = convert_value;
-               } else {
-                       content_info->media_meta.rating = 0;
-               }
-
                /*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);
@@ -812,16 +685,6 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, bool is_direct, media_svc
                        content_info->album_id = album_id;
                }
 
-               if (content_info->media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO) {
-                       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);
-                       } else {
-                               content_info->media_meta.orientation = 0;
-                               media_svc_debug("fail to get video orientation attr - err(%x)", mmf_error);
-                       }
-               }
-
                mmf_error = mm_file_destroy_tag_attrs(tag);
                if (mmf_error != FILEINFO_ERROR_NONE)
                        media_svc_error("fail to free tag attr - err(%x)", mmf_error);
@@ -830,33 +693,19 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, bool is_direct, media_svc
                content_info->album_id = album_id;
        }
 
-       /*Get Content attribute ===========*/
-       mmf_error = mm_file_create_content_attrs_simple(&content, content_info->path);
-
-       media_svc_retvm_if(mmf_error != FILEINFO_ERROR_NONE, MS_MEDIA_ERR_NONE, "mm_file_create_content_attrs failed");
-
-       if (content_info->media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO) {
-               int audio_bitrate = 0;
-               int video_bitrate = 0;
-
-               mm_file_get_attrs(content, MM_FILE_CONTENT_DURATION, &content_info->media_meta.duration,
-                       MM_FILE_CONTENT_AUDIO_BITRATE, &audio_bitrate,
-                       MM_FILE_CONTENT_VIDEO_BITRATE, &video_bitrate,
-                       MM_FILE_CONTENT_VIDEO_WIDTH, &content_info->media_meta.width,
-                       MM_FILE_CONTENT_VIDEO_HEIGHT, &content_info->media_meta.height,
-                       NULL);
-
-               content_info->media_meta.bitrate = audio_bitrate + video_bitrate;
-       } else {
-               mm_file_get_attrs(content, MM_FILE_CONTENT_DURATION, &content_info->media_meta.duration,
-                       MM_FILE_CONTENT_AUDIO_BITRATE, &content_info->media_meta.bitrate,
-                       MM_FILE_CONTENT_AUDIO_SAMPLERATE, &content_info->media_meta.samplerate,
-                       MM_FILE_CONTENT_AUDIO_CHANNELS, &content_info->media_meta.channel,
-                       MM_FILE_CONTENT_AUDIO_BITPERSAMPLE, &content_info->media_meta.bitpersample,
-                       NULL);
-       }
+       return MS_MEDIA_ERR_NONE;
+}
 
-       mm_file_destroy_content_attrs(content);
+int _media_svc_extract_video_metadata(media_svc_content_info_s *content_info)
+{
+       content_info->media_meta.title = __media_svc_get_title(NULL, content_info->path);
+       content_info->media_meta.album = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
+       content_info->media_meta.artist = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
+       content_info->media_meta.album_artist = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
+       content_info->media_meta.genre = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
+       content_info->media_meta.track_num = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
+       content_info->media_meta.year = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
+       content_info->album_id = 0;
 
        return MS_MEDIA_ERR_NONE;
 }
@@ -1020,14 +869,10 @@ static gboolean __media_svc_get_xml_metadata(const xmlChar *buffer, gboolean is_
                return FALSE;
        }
 
-       content_info->media_meta.composer = __media_svc_find_and_get_value(root, "creator");
-       if (!content_info->media_meta.composer)
-               content_info->media_meta.composer = __media_svc_find_and_get_value(root, "author");
-
-       content_info->media_meta.copyright = __media_svc_find_and_get_value(root, "publisher");
-       content_info->media_meta.recorded_date = __media_svc_find_and_get_value(root, "date");
+       content_info->media_meta.artist = __media_svc_find_and_get_value(root, "creator");
+       if (!content_info->media_meta.artist)
+               content_info->media_meta.artist = __media_svc_find_and_get_value(root, "author");
        content_info->media_meta.genre = __media_svc_find_and_get_value(root, "subject");
-       content_info->media_meta.description = __media_svc_find_and_get_value(root, "description");
 
        xmlFreeDoc(doc);
 
@@ -1169,12 +1014,8 @@ void _media_svc_destroy_content_info(media_svc_content_info_s *content_info)
        g_free(content_info->media_meta.artist);
        g_free(content_info->media_meta.album_artist);
        g_free(content_info->media_meta.genre);
-       g_free(content_info->media_meta.composer);
        g_free(content_info->media_meta.year);
-       g_free(content_info->media_meta.recorded_date);
-       g_free(content_info->media_meta.copyright);
        g_free(content_info->media_meta.track_num);
-       g_free(content_info->media_meta.description);
        g_free(content_info->media_meta.datetaken);
 }
 
index a992f6e..1c5cad7 100755 (executable)
@@ -206,9 +206,11 @@ int media_svc_insert_item_bulk(sqlite3 *handle, const char *storage_id, const ch
                ret = _media_svc_extract_image_metadata(&content_info);
                break;
        case MEDIA_SVC_MEDIA_TYPE_VIDEO:
+               ret = _media_svc_extract_video_metadata(&content_info);
+               break;
        case MEDIA_SVC_MEDIA_TYPE_SOUND:
        case MEDIA_SVC_MEDIA_TYPE_MUSIC:
-               ret = _media_svc_extract_media_metadata(handle, true, &content_info, uid);
+               ret = _media_svc_extract_audio_metadata(handle, true, &content_info, uid);
                break;
        case MEDIA_SVC_MEDIA_TYPE_BOOK:
                ret = _media_svc_extract_book_metadata(&content_info);
@@ -277,9 +279,11 @@ int media_svc_insert_item_immediately(sqlite3 *handle, const char *storage_id, c
                ret = _media_svc_extract_image_metadata(&content_info);
                break;
        case MEDIA_SVC_MEDIA_TYPE_VIDEO:
+               ret = _media_svc_extract_video_metadata(&content_info);
+               break;
        case MEDIA_SVC_MEDIA_TYPE_SOUND:
        case MEDIA_SVC_MEDIA_TYPE_MUSIC:
-               ret = _media_svc_extract_media_metadata(handle, false, &content_info, uid);
+               ret = _media_svc_extract_audio_metadata(handle, false, &content_info, uid);
                break;
        case MEDIA_SVC_MEDIA_TYPE_BOOK:
                ret = _media_svc_extract_book_metadata(&content_info);
@@ -488,9 +492,11 @@ int media_svc_refresh_item(sqlite3 *handle, bool is_direct, const char *storage_
                ret = _media_svc_extract_image_metadata(&content_info);
                break;
        case MEDIA_SVC_MEDIA_TYPE_VIDEO:
+               ret = _media_svc_extract_video_metadata(&content_info);
+               break;
        case MEDIA_SVC_MEDIA_TYPE_SOUND:
        case MEDIA_SVC_MEDIA_TYPE_MUSIC:
-               ret = _media_svc_extract_media_metadata(handle, is_direct, &content_info, uid);
+               ret = _media_svc_extract_audio_metadata(handle, is_direct, &content_info, uid);
                break;
        case MEDIA_SVC_MEDIA_TYPE_BOOK:
                ret = _media_svc_extract_book_metadata(&content_info);
index 405833f..12f24e8 100755 (executable)
@@ -38,27 +38,17 @@ extern "C" {
  * Media meta data information
  */
 typedef struct {
-       char            *title;                         /**< track title*/
-       char            *album;                         /**< album name*/
-       char            *artist;                                /**< artist name*/
-       char            *album_artist;          /**< artist name*/
-       char            *genre;                         /**< genre of track*/
-       char            *composer;                      /**< composer name*/
-       char            *year;                          /**< year*/
-       char            *recorded_date;         /**< recorded date*/
-       char            *copyright;                     /**< copyright*/
-       char            *track_num;                     /**< track number*/
-       char            *description;                   /**< description*/
-       int             bitrate;                                /**< bitrate*/
-       int             samplerate;                     /**< samplerate*/
-       int             channel;                                /**< channel*/
-       int             duration;                       /**< duration*/
-       int             width;                          /**< width*/
-       int             height;                         /**< height*/
-       char            *datetaken;                     /**< datetaken*/
-       int             orientation;                    /**< orientation*/
-       int             rating;                         /**< user defined rating */
-       int             bitpersample;           /**< bitrate*/
+       char *title;                            /**< track title*/
+       char *album;                            /**< album name*/
+       char *artist;                           /**< artist name*/
+       char *album_artist;             /**< artist name*/
+       char *genre;                            /**< genre of track*/
+       char *year;                             /**< year*/
+       char *track_num;                        /**< track number*/
+       int width;                              /**< width*/
+       int height;                             /**< height*/
+       char *datetaken;                        /**< datetaken*/
+       int orientation;                        /**< orientation*/
 } media_svc_content_meta_s;
 
 /**
@@ -104,7 +94,8 @@ int _media_svc_get_file_time(const char *full_path);
 char * _media_svc_get_title_by_path(const char *path);
 int _media_svc_set_media_info(media_svc_content_info_s *content_info, const char *storage_id, const char *path, bool refresh);
 int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info);
-int _media_svc_extract_media_metadata(sqlite3 *handle, bool is_direct, media_svc_content_info_s *content_info, uid_t uid);
+int _media_svc_extract_audio_metadata(sqlite3 *handle, bool is_direct, media_svc_content_info_s *content_info, uid_t uid);
+int _media_svc_extract_video_metadata(media_svc_content_info_s *content_info);
 int _media_svc_extract_book_metadata(media_svc_content_info_s *content_info);
 void _media_svc_destroy_content_info(media_svc_content_info_s *content_info);
 int _media_svc_create_thumbnail(const char *path, char *thumb_path, media_svc_media_type_e media_type, uid_t uid);