From: hj kim Date: Fri, 30 Nov 2018 05:34:51 +0000 (+0900) Subject: Rearrange the code which is used only internally in media-svc-type.h. X-Git-Tag: accepted/tizen/unified/20190111.055201~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=146ca2ed0bdd8b1445c11470ce9e394725a6fc25;p=platform%2Fcore%2Fmultimedia%2Flibmedia-service.git Rearrange the code which is used only internally in media-svc-type.h. Change-Id: I5d5e062ccf2dcd4fb6791e2370e3389ad757f654 --- diff --git a/include/media-svc-types.h b/include/media-svc-types.h index 5a3efe7..6f26dca 100755 --- a/include/media-svc-types.h +++ b/include/media-svc-types.h @@ -24,92 +24,6 @@ #ifndef _MEDIA_SVC_TYPES_H_ #define _MEDIA_SVC_TYPES_H_ -#include - -/** - * Type definition for content type - */ -typedef enum { - MEDIA_SVC_MEDIA_TYPE_IMAGE = 0, /**< Image Content*/ - MEDIA_SVC_MEDIA_TYPE_VIDEO = 1, /**< Video Content*/ - MEDIA_SVC_MEDIA_TYPE_SOUND = 2, /**< Sound Content like Ringtone*/ - MEDIA_SVC_MEDIA_TYPE_MUSIC = 3, /**< Music Content like mp3*/ - MEDIA_SVC_MEDIA_TYPE_OTHER = 4, /**< Not media Content*/ - MEDIA_SVC_MEDIA_TYPE_PVR = 5, /**< PVR Content*/ - MEDIA_SVC_MEDIA_TYPE_UHD = 6, /**< UHD Content*/ - MEDIA_SVC_MEDIA_TYPE_SCSA = 7, /**< SCSA Content*/ -} media_svc_media_type_e; - -/** - * 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*/ - 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*/ - - char *file_name_pinyin; /**< pinyin for file_name*/ - char *title_pinyin; /**< pinyin for title*/ - char *album_pinyin; /**< pinyin for album*/ - char *artist_pinyin; /**< pinyin for artist*/ - char *album_artist_pinyin; /**< pinyin for album_artist*/ - char *genre_pinyin; /**< pinyin for genre*/ - char *composer_pinyin; /**< pinyin for composer*/ - char *copyright_pinyin; /**< pinyin for copyright*/ - char *description_pinyin; /**< pinyin for description*/ - int is_360; -} media_svc_content_meta_s; - -/** - * Media data information - */ -typedef struct { - char *media_uuid; /**< Unique ID of item */ - char *path; /**< Full path of media file */ - char *file_name; /**< File name of media file. Display name */ - char *file_name_pinyin; /**< File name pinyin of media file. Display name */ - int media_type; /**< Type of media file : internal/external */ - char *mime_type; /**< Full path and file name of media file */ - unsigned long long size; /**< size */ - time_t added_time; /**< added time, time_t */ - time_t modified_time; /**< modified time, time_t */ - time_t timeline; /**< timeline of media, time_t */ - char *folder_uuid; /**< Unique ID of folder */ - int album_id; /**< Unique ID of album */ - char *thumbnail_path; /**< Thumbnail image file path */ - time_t favourate; /**< time favourate set */ - int is_drm; /**< is_drm. o or 1 */ - int sync_status; /**< sync_status */ - int storage_type; /**< Storage of media file : internal/external */ - char *storage_uuid; /**< Unique ID of storage */ - media_svc_content_meta_s media_meta; /**< meta data structure for audio files */ -} media_svc_content_info_s; - /** * Type definition for scanning status */ @@ -121,6 +35,4 @@ typedef enum { MEDIA_SVC_SCAN_MAX = 4, /**< Invalid status*/ } media_svc_scan_status_type_e; -#define MEDIA_SVC_DEFAULT_GPS_VALUE -200 /**< Default GPS Value*/ - #endif /*_MEDIA_SVC_TYPES_H_*/ diff --git a/src/common/media-svc-localize_ch.c b/src/common/media-svc-localize_ch.c index 1171e82..6dc7435 100755 --- a/src/common/media-svc-localize_ch.c +++ b/src/common/media-svc-localize_ch.c @@ -24,7 +24,6 @@ #include #include "media-util-err.h" -#include "media-svc-types.h" #include "media-svc-debug.h" #include "media-svc-localize_ch.h" #include "media-svc-util.h" diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c index ffdf6e1..4b95468 100755 --- a/src/common/media-svc-util.c +++ b/src/common/media-svc-util.c @@ -75,6 +75,7 @@ #define MEDIA_SVC_ARTWORK_SIZE 2000 #define MEDIA_SVC_DEFAULT_FORMAT_LEN 19 +#define MEDIA_SVC_DEFAULT_GPS_VALUE -200 /**< Default GPS Value*/ static int media_svc_pinyin_support = -1; diff --git a/src/include/common/media-svc-env.h b/src/include/common/media-svc-env.h index d0ba6ca..3e52b33 100755 --- a/src/include/common/media-svc-env.h +++ b/src/include/common/media-svc-env.h @@ -24,7 +24,6 @@ #ifndef _MEDIA_SVC_ENV_H_ #define _MEDIA_SVC_ENV_H_ -#include #include #ifdef __cplusplus diff --git a/src/include/common/media-svc-media-folder.h b/src/include/common/media-svc-media-folder.h index f424b41..4f105e8 100755 --- a/src/include/common/media-svc-media-folder.h +++ b/src/include/common/media-svc-media-folder.h @@ -24,7 +24,6 @@ #include #include -#include "media-svc-types.h" #include int _media_svc_get_folder_id_by_foldername(sqlite3 *handle, const char *storage_id, const char *folder_name, char *folder_id, uid_t uid); diff --git a/src/include/common/media-svc-media.h b/src/include/common/media-svc-media.h index 36d2198..023b117 100755 --- a/src/include/common/media-svc-media.h +++ b/src/include/common/media-svc-media.h @@ -24,9 +24,9 @@ #include #include -#include "media-svc-types.h" #include "media-svc-env.h" #include "media-svc-noti.h" +#include "media-svc-util.h" int _media_svc_count_record_with_path(sqlite3 *handle, const char *storage_id, const char *path, int *count); int _media_svc_insert_item_with_data(sqlite3 *handle, const char *storage_id, media_svc_content_info_s *content_info, bool stack_query, uid_t uid); diff --git a/src/include/common/media-svc-noti.h b/src/include/common/media-svc-noti.h index 299a48c..05d194d 100755 --- a/src/include/common/media-svc-noti.h +++ b/src/include/common/media-svc-noti.h @@ -22,9 +22,10 @@ #ifndef _MEDIA_SVC_NOTI_H_ #define _MEDIA_SVC_NOTI_H_ -#include "media-svc-types.h" #include "media-svc-env.h" #include "media-svc-debug.h" +#include "media-svc-util.h" + #include typedef struct _media_svc_noti_item media_svc_noti_item; diff --git a/src/include/common/media-svc-util.h b/src/include/common/media-svc-util.h index adeb309..db42e8d 100755 --- a/src/include/common/media-svc-util.h +++ b/src/include/common/media-svc-util.h @@ -27,7 +27,7 @@ #include #include #include -#include "media-svc-types.h" +#include #include "media-svc-env.h" #ifdef __cplusplus @@ -49,6 +49,90 @@ extern "C" { #define SAFE_STRLCAT(dst, src, n) g_strlcat(dst, src, n); #define SAFE_STRLCPY(dst, src, n) g_strlcpy(dst, src, n); +/** + * 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*/ + 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*/ + + char *file_name_pinyin; /**< pinyin for file_name*/ + char *title_pinyin; /**< pinyin for title*/ + char *album_pinyin; /**< pinyin for album*/ + char *artist_pinyin; /**< pinyin for artist*/ + char *album_artist_pinyin; /**< pinyin for album_artist*/ + char *genre_pinyin; /**< pinyin for genre*/ + char *composer_pinyin; /**< pinyin for composer*/ + char *copyright_pinyin; /**< pinyin for copyright*/ + char *description_pinyin; /**< pinyin for description*/ + int is_360; +} media_svc_content_meta_s; + +/** + * Media data information + */ +typedef struct { + char *media_uuid; /**< Unique ID of item */ + char *path; /**< Full path of media file */ + char *file_name; /**< File name of media file. Display name */ + char *file_name_pinyin; /**< File name pinyin of media file. Display name */ + int media_type; /**< Type of media file : internal/external */ + char *mime_type; /**< Full path and file name of media file */ + unsigned long long size; /**< size */ + time_t added_time; /**< added time, time_t */ + time_t modified_time; /**< modified time, time_t */ + time_t timeline; /**< timeline of media, time_t */ + char *folder_uuid; /**< Unique ID of folder */ + int album_id; /**< Unique ID of album */ + char *thumbnail_path; /**< Thumbnail image file path */ + time_t favourate; /**< time favourate set */ + int is_drm; /**< is_drm. o or 1 */ + int sync_status; /**< sync_status */ + int storage_type; /**< Storage of media file : internal/external */ + char *storage_uuid; /**< Unique ID of storage */ + media_svc_content_meta_s media_meta; /**< meta data structure for audio files */ +} media_svc_content_info_s; + +/** + * Type definition for content type + */ +typedef enum { + MEDIA_SVC_MEDIA_TYPE_IMAGE = 0, /**< Image Content*/ + MEDIA_SVC_MEDIA_TYPE_VIDEO = 1, /**< Video Content*/ + MEDIA_SVC_MEDIA_TYPE_SOUND = 2, /**< Sound Content like Ringtone*/ + MEDIA_SVC_MEDIA_TYPE_MUSIC = 3, /**< Music Content like mp3*/ + MEDIA_SVC_MEDIA_TYPE_OTHER = 4, /**< Not media Content*/ + MEDIA_SVC_MEDIA_TYPE_PVR = 5, /**< PVR Content*/ + MEDIA_SVC_MEDIA_TYPE_UHD = 6, /**< UHD Content*/ + MEDIA_SVC_MEDIA_TYPE_SCSA = 7, /**< SCSA Content*/ +} media_svc_media_type_e; + char *_media_info_generate_uuid(void); int _media_svc_remove_file(const char *path); int _media_svc_get_thumbnail_path(media_svc_media_type_e media_type, char *thumb_path, const char *pathname, const char *img_format, uid_t uid); diff --git a/unittest/libmedia_service_unittest.cpp b/unittest/libmedia_service_unittest.cpp old mode 100644 new mode 100755 index 7a11bd0..982b575 --- a/unittest/libmedia_service_unittest.cpp +++ b/unittest/libmedia_service_unittest.cpp @@ -16,8 +16,9 @@ #include "libmedia_service_unittest.h" -#include "media-util.h" #include "media-svc.h" +#include + using ::testing::InitGoogleTest; using ::testing::Test;