Set default values ​​for unextracted metadata

Change-Id: I9d18f96d66a22827cc82524472efcabd259f43e7
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/include/media_info_private.h b/include/media_info_private.h
index 9fce66cd68ca7f93e67a5e3bd8b714eb3df67a8d..7eb6ef2a0ec897f1eefc13cc4ee7787d0d0b4f6a 100644 (file)
--- a/include/media_info_private.h
+++ b/include/media_info_private.h
@@ -52,7 +52,7 @@ extern "C" {
 * @file media_info_private.h
 * @brief This file contains the media info API and related structure and enumeration. \n
 *        Description of the audio, video,image content involves: album, artist, album_artist, genre and description tags. \n
-*        Parameters of the recording are also supported, as: format, bitrate, duration, size etc. \n
+*        Parameters of the recording are also supported, as: format, duration, size etc. \n
 *        Definitions of media DB fields and tables, operations with media data relating to DB and handling with media filter attributes.
 */
 
@@ -99,11 +99,7 @@ typedef enum {
        MEDIA_INFO_RECORDED_DATE,
        MEDIA_INFO_COPYRIGHT,
        MEDIA_INFO_TRACK_NUM,
-       MEDIA_INFO_BITRATE,
-       MEDIA_INFO_BITPERSAMPLE,
        MEDIA_INFO_DURATION,
-       MEDIA_INFO_SAMPLERATE,
-       MEDIA_INFO_CHANNEL,
        MEDIA_INFO_TIMELINE,
        MEDIA_INFO_STORAGE_UUID,
        MEDIA_INFO_IS_360,
@@ -204,7 +200,6 @@ typedef struct {
        char *recorded_date;
        char *copyright;
        char *track_num;
-       int bitrate;
        int duration;
        int width;
        int height;
@@ -222,10 +217,6 @@ typedef struct {
        char *recorded_date;
        char *copyright;
        char *track_num;
-       int bitrate;
-       int bitpersample;
-       int samplerate;
-       int channel;
        int duration;
 } audio_meta_s;
 
@@ -393,10 +384,9 @@ typedef struct _media_content_cb_data {
 
 /* Get Media list of Group */
 #define MEDIA_INFO_ITEM "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, media_thumbnail_path, media_description, \
-                                                       media_rating, media_favourite, media_is_drm, media_longitude, media_latitude, media_altitude, \
-                                                       media_width, media_height, media_datetaken, orientation, media_title, media_album, media_artist, media_album_artist, media_genre, \
-                                                       media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_bitrate, media_bitpersample, media_duration, media_samplerate, media_channel, \
-                                                       media_timeline, storage_uuid, media_360"
+       media_rating, media_favourite, media_is_drm, media_longitude, media_latitude, media_altitude, \
+       media_width, media_height, media_datetaken, orientation, media_title, media_album, media_artist, media_album_artist, media_genre, \
+       media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_duration, media_timeline, storage_uuid, media_360"
 
 /* Playlist Info */
 #define INSERT_PLAYLIST_TO_PLAYLIST    "INSERT INTO "DB_TABLE_PLAYLIST" (playlist_name) VALUES (%Q)"

diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h
index d71971669a36cb3d9651f1b3a7dab250a8ebedbc..debd02cf4a6dc0c534242fafd6a612c3e052263f 100644 (file)
--- a/include_product/media_info_private.h
+++ b/include_product/media_info_private.h
@@ -53,7 +53,7 @@ extern "C" {
 * @file media_info_private.h
 * @brief This file contains the media info API and related structure and enumeration. \n
 *        Description of the audio, video,image content involves: album, artist, album_artist, genre and description tags. \n
-*        Parameters of the recording are also supported, as: format, bitrate, duration, size etc. \n
+*        Parameters of the recording are also supported, as: format, duration, size etc. \n
 *        Definitions of media DB fields and tables, operations with media data relating to DB and handling with media filter attributes.
 */
 
@@ -100,11 +100,7 @@ typedef enum {
        MEDIA_INFO_RECORDED_DATE,
        MEDIA_INFO_COPYRIGHT,
        MEDIA_INFO_TRACK_NUM,
-       MEDIA_INFO_BITRATE,
-       MEDIA_INFO_BITPERSAMPLE,
        MEDIA_INFO_DURATION,
-       MEDIA_INFO_SAMPLERATE,
-       MEDIA_INFO_CHANNEL,
        MEDIA_INFO_TIMELINE,
        MEDIA_INFO_STORAGE_UUID,
        MEDIA_INFO_IS_360,
@@ -211,7 +207,6 @@ typedef struct {
        char *recorded_date;
        char *copyright;
        char *track_num;
-       int bitrate;
        int duration;
        int width;
        int height;
@@ -229,10 +224,6 @@ typedef struct {
        char *recorded_date;
        char *copyright;
        char *track_num;
-       int bitrate;
-       int bitpersample;
-       int samplerate;
-       int channel;
        int duration;
 } audio_meta_s;
 
@@ -430,10 +421,10 @@ typedef struct _media_content_scan_cb_data_v2 {
 
 /* Get Media list of Group */
 #define MEDIA_INFO_ITEM "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, media_thumbnail_path, media_description, \
-                                                       media_rating, media_favourite, media_is_drm, media_longitude, media_latitude, media_altitude, \
-                                                       media_width, media_height, media_datetaken, orientation, media_title, media_album, media_artist, media_album_artist, media_genre, \
-                                                       media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_bitrate, media_bitpersample, media_duration, media_samplerate, media_channel, \
-                                                       media_timeline, storage_uuid, media_360, played_count, last_played_time, last_played_position, stitched_info, extract_flag, modified_date"
+       media_rating, media_favourite, media_is_drm, media_longitude, media_latitude, media_altitude, \
+       media_width, media_height, media_datetaken, orientation, media_title, media_album, media_artist, media_album_artist, media_genre, \
+       media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_duration, \
+       media_timeline, storage_uuid, media_360, played_count, last_played_time, last_played_position, stitched_info, extract_flag, modified_date"
 
 /* Playlist Info */
 #define INSERT_PLAYLIST_TO_PLAYLIST                                            "INSERT INTO "DB_TABLE_PLAYLIST" (playlist_name) VALUES (%Q)"

diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec
index 6ff0178bc265c07eb4da219ed335f61e72f691a2..667159f121961a2f368ad3ffd0347ebaab984696 100644 (file)
--- a/packaging/capi-content-media-content.spec
+++ b/packaging/capi-content-media-content.spec
@@ -1,7 +1,7 @@
 Name:       capi-content-media-content
 Summary:    A Media content library in Tizen Native API
 Version:    0.6.5
-Release:    0
+Release:    1
 Group:      Multimedia/API
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz

diff --git a/src/media_audio.c b/src/media_audio.c
index c73e57813f164b22b5c7775d35b6f6d74e8bad9a..d9c81ed55ac0e8b3b24682f87fbf361e27eb1840 100644 (file)
--- a/src/media_audio.c
+++ b/src/media_audio.c
@@ -57,10 +57,6 @@ int audio_meta_clone(audio_meta_h *dst, audio_meta_h src)
        _dst->recorded_date = g_strdup(_src->recorded_date);
        _dst->copyright = g_strdup(_src->copyright);
        _dst->track_num = g_strdup(_src->track_num);
-       _dst->bitrate = _src->bitrate;
-       _dst->bitpersample = _src->bitpersample;
-       _dst->samplerate = _src->samplerate;
-       _dst->channel = _src->channel;
        _dst->duration = _src->duration;
 
        *dst = (audio_meta_h)_dst;
@@ -202,12 +198,10 @@ int audio_meta_get_copyright(audio_meta_h audio, char **copyright)
 int audio_meta_get_bit_rate(audio_meta_h audio, int *bit_rate)
 {
        content_warn("DEPRECATION WARNING: audio_meta_get_bit_rate() is deprecated and will be removed from next release.");
-       audio_meta_s *_audio = (audio_meta_s*)audio;
-
        content_retip_if_fail(audio);
        content_retip_if_fail(bit_rate);
 
-       *bit_rate = _audio->bitrate;
+       *bit_rate = 0;
 
        return MEDIA_CONTENT_ERROR_NONE;
 }
@@ -215,12 +209,10 @@ int audio_meta_get_bit_rate(audio_meta_h audio, int *bit_rate)
 int audio_meta_get_bitpersample(audio_meta_h audio, int *bitpersample)
 {
        content_warn("DEPRECATION WARNING: audio_meta_get_bitpersample() is deprecated and will be removed from next release.");
-       audio_meta_s *_audio = (audio_meta_s*)audio;
-
        content_retip_if_fail(audio);
        content_retip_if_fail(bitpersample);
 
-       *bitpersample = _audio->bitpersample;
+       *bitpersample = 0;
 
        return MEDIA_CONTENT_ERROR_NONE;
 }
@@ -228,12 +220,10 @@ int audio_meta_get_bitpersample(audio_meta_h audio, int *bitpersample)
 int audio_meta_get_sample_rate(audio_meta_h audio, int *sample_rate)
 {
        content_warn("DEPRECATION WARNING: audio_meta_get_sample_rate() is deprecated and will be removed from next release.");
-       audio_meta_s *_audio = (audio_meta_s*)audio;
-
        content_retip_if_fail(audio);
        content_retip_if_fail(sample_rate);
 
-       *sample_rate = _audio->samplerate;
+       *sample_rate = 0;
 
        return MEDIA_CONTENT_ERROR_NONE;
 }
@@ -241,12 +231,10 @@ int audio_meta_get_sample_rate(audio_meta_h audio, int *sample_rate)
 int audio_meta_get_channel(audio_meta_h audio, int *channel)
 {
        content_warn("DEPRECATION WARNING: audio_meta_get_channel() is deprecated and will be removed from next release.");
-       audio_meta_s *_audio = (audio_meta_s*)audio;
-
        content_retip_if_fail(audio);
        content_retip_if_fail(channel);
 
-       *channel = _audio->channel;
+       *channel = 0;
 
        return MEDIA_CONTENT_ERROR_NONE;
 }

diff --git a/src/media_info.c b/src/media_info.c
index 30a9f42fa4971e4ebf467aa9c829df5e7440dfab..363ce69f0e2aa85cf31851cc1eaa7e3067e409e2 100644 (file)
--- a/src/media_info.c
+++ b/src/media_info.c
@@ -203,7 +203,6 @@ void _media_info_item_get_detail(sqlite3_stmt *stmt, media_info_h media)
                _media->video_meta->recorded_date = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_RECORDED_DATE));
                _media->video_meta->copyright = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_COPYRIGHT));
                _media->video_meta->track_num = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_TRACK_NUM));
-               _media->video_meta->bitrate = sqlite3_column_int(stmt, MEDIA_INFO_BITRATE);
                _media->video_meta->duration = sqlite3_column_int(stmt, MEDIA_INFO_DURATION);
                _media->video_meta->rotation = sqlite3_column_int(stmt, MEDIA_INFO_ORIENTATION);
 
@@ -220,11 +219,7 @@ void _media_info_item_get_detail(sqlite3_stmt *stmt, media_info_h media)
                _media->audio_meta->recorded_date = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_RECORDED_DATE));
                _media->audio_meta->copyright = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_COPYRIGHT));
                _media->audio_meta->track_num = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_TRACK_NUM));
-               _media->audio_meta->bitrate = sqlite3_column_int(stmt, MEDIA_INFO_BITRATE);
-               _media->audio_meta->bitpersample = sqlite3_column_int(stmt, MEDIA_INFO_BITPERSAMPLE);
                _media->audio_meta->duration = sqlite3_column_int(stmt, MEDIA_INFO_DURATION);
-               _media->audio_meta->samplerate = sqlite3_column_int(stmt, MEDIA_INFO_SAMPLERATE);
-               _media->audio_meta->channel = sqlite3_column_int(stmt, MEDIA_INFO_CHANNEL);
        } else if (_media->media_type == MEDIA_CONTENT_TYPE_BOOK) {
                _media->book_meta = g_new0(book_meta_s, 1);
 
@@ -522,7 +517,6 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                _dst->video_meta->width = _src->video_meta->width;
                _dst->video_meta->height = _src->video_meta->height;
                _dst->video_meta->duration = _src->video_meta->duration;
-               _dst->video_meta->bitrate = _src->video_meta->bitrate;
                _dst->video_meta->rotation = _src->video_meta->rotation;
 
        } else if ((_src->media_type == MEDIA_CONTENT_TYPE_MUSIC || _src->media_type == MEDIA_CONTENT_TYPE_SOUND) && _src->audio_meta) {
@@ -538,11 +532,7 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                _dst->audio_meta->recorded_date = g_strdup(_src->audio_meta->recorded_date);
                _dst->audio_meta->copyright = g_strdup(_src->audio_meta->copyright);
                _dst->audio_meta->track_num = g_strdup(_src->audio_meta->track_num);
-               _dst->audio_meta->channel = _src->audio_meta->channel;
-               _dst->audio_meta->samplerate = _src->audio_meta->samplerate;
                _dst->audio_meta->duration = _src->audio_meta->duration;
-               _dst->audio_meta->bitrate = _src->audio_meta->bitrate;
-               _dst->audio_meta->bitpersample = _src->audio_meta->bitpersample;
        } else if (_src->media_type == MEDIA_CONTENT_TYPE_BOOK && _src->book_meta) {
                _dst->book_meta = g_new0(book_meta_s, 1);
 
@@ -678,7 +668,6 @@ int media_info_get_video(media_info_h media, video_meta_h *video)
        _video->width = _media->video_meta->width;
        _video->height = _media->video_meta->height;
        _video->duration = _media->video_meta->duration;
-       _video->bitrate = _media->video_meta->bitrate;
        _video->rotation = _media->video_meta->rotation;
 
        *video = (video_meta_h)_video;
@@ -711,10 +700,6 @@ int media_info_get_audio(media_info_h media, audio_meta_h *audio)
        _audio->track_num = g_strdup(_media->audio_meta->track_num);
 
        _audio->duration = _media->audio_meta->duration;
-       _audio->bitrate = _media->audio_meta->bitrate;
-       _audio->bitpersample = _media->audio_meta->bitpersample;
-       _audio->samplerate = _media->audio_meta->samplerate;
-       _audio->channel = _media->audio_meta->channel;
 
        *audio = (audio_meta_h)_audio;
 

diff --git a/src/media_video.c b/src/media_video.c
index 38b2277db981ac178b419008850c169839b90df0..16e969acb6844f598351c7f1cf9179edc406774b 100644 (file)
--- a/src/media_video.c
+++ b/src/media_video.c
@@ -59,7 +59,6 @@ int video_meta_clone(video_meta_h *dst, video_meta_h src)
        _dst->recorded_date = g_strdup(_src->recorded_date);
        _dst->copyright = g_strdup(_src->copyright);
        _dst->track_num = g_strdup(_src->track_num);
-       _dst->bitrate = _src->bitrate;
        _dst->duration = _src->duration;
        _dst->width = _src->width;
        _dst->height = _src->height;
@@ -203,12 +202,10 @@ int video_meta_get_track_num(video_meta_h video, char **track_num)
 int video_meta_get_bit_rate(video_meta_h video, int *bit_rate)
 {
        content_warn("DEPRECATION WARNING: video_meta_get_bit_rate() is deprecated and will be removed from next release.");
-       video_meta_s *_video = (video_meta_s*)video;
-
        content_retip_if_fail(video);
        content_retip_if_fail(bit_rate);
 
-       *bit_rate = _video->bitrate;
+       *bit_rate = 0;
 
        return MEDIA_CONTENT_ERROR_NONE;
 }