Remove CDIS

Removed MX CDIS feature

Change-Id: I927a24414023aba62a0256658c697992e6dc42f6
Signed-off-by: minje.ahn <minje.ahn@samsung.com>

diff --git a/packaging/libmedia-thumbnail.spec b/packaging/libmedia-thumbnail.spec
index ec50ef8..11a1f2d 100644 (file)
--- a/packaging/libmedia-thumbnail.spec
+++ b/packaging/libmedia-thumbnail.spec
@@ -1,6 +1,6 @@
 Name:       libmedia-thumbnail
 Summary:    Media thumbnail service library for multimedia applications
-Version:    0.4.4
+Version:    0.4.5
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/media-thumbnail.c b/src/media-thumbnail.c
index b66af36..13086cf 100755 (executable)
--- a/src/media-thumbnail.c
+++ b/src/media-thumbnail.c
@@ -43,13 +43,12 @@ typedef enum {
     MEDIA_THUMB_VIDEO,
 } thumbnail_media_type_e;
 
-static void __get_rotation_and_cdis(const char *path, mm_util_rotate_type_e *rot_type, int *cdis_value)
+static void __get_rotation(const char *path, mm_util_rotate_type_e *rot_type)
 {
        int err = MS_MEDIA_ERR_NONE;
        MMHandleType tag = (MMHandleType) NULL;
        char *p = NULL;
        int size = 0;
-       int _cdis_value = 0;
        mm_util_rotate_type_e _rot_type = MM_UTIL_ROTATE_0;
 
        /* Get Content Tag attribute for orientation */
@@ -71,17 +70,12 @@ static void __get_rotation_and_cdis(const char *path, mm_util_rotate_type_e *rot
                thumb_dbg("There is tag rotate : %d", _rot_type);
        }
 
-       err = mm_file_get_attrs(tag, MM_FILE_TAG_CDIS, &_cdis_value, NULL);
-       if (err != FILEINFO_ERROR_NONE)
-               _cdis_value = 0;
-
        *rot_type = _rot_type;
-       *cdis_value = _cdis_value;
 
        mm_file_destroy_tag_attrs(tag);
 }
 
-static int __get_video_meta(int cdis_value, const char *path, int *video_track_num, unsigned int *width, unsigned int *height, void **frame, size_t *frame_size)
+static int __get_video_meta(const char *path, int *video_track_num, unsigned int *width, unsigned int *height, void **frame, size_t *frame_size)
 {
        int err = MS_MEDIA_ERR_NONE;
        MMHandleType content = (MMHandleType) NULL;
@@ -91,12 +85,7 @@ static int __get_video_meta(int cdis_value, const char *path, int *video_track_n
        size_t _frame_size = 0;
        void *_frame = NULL;
 
-       if (cdis_value == 1) {
-               thumb_warn("This is CDIS value 1");
-               err = mm_file_create_content_attrs_safe(&content, path);
-       } else {
-               err = mm_file_create_content_attrs(&content, path);
-       }
+       err = mm_file_create_content_attrs(&content, path);
        thumb_retvm_if(err != FILEINFO_ERROR_NONE, MS_MEDIA_ERR_INTERNAL, "mm_file_create_content_attrs fails : %d", err);
 
        err = mm_file_get_attrs(content,
@@ -139,11 +128,10 @@ static int __get_video_meta(int cdis_value, const char *path, int *video_track_n
 static int __get_video_info(const char *path, int *video_track_num, unsigned int *width, unsigned int *height, void **frame, size_t *frame_size, mm_util_rotate_type_e *rot_type)
 {
        int err = MS_MEDIA_ERR_NONE;
-       int _cdis_value = 0;
        mm_util_rotate_type_e _rot_type = MM_UTIL_ROTATE_0;
 
-       __get_rotation_and_cdis(path, &_rot_type, &_cdis_value);
-       err = __get_video_meta(_cdis_value, path, video_track_num, width, height, frame, frame_size);
+       __get_rotation(path, &_rot_type);
+       err = __get_video_meta(path, video_track_num, width, height, frame, frame_size);
 
        if (rot_type)
                *rot_type = _rot_type;