From 356594ddd50d9d29556f11a3413a284743d375a6 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Tue, 7 Jun 2016 10:09:00 +0900 Subject: [PATCH] [UTC][media-content][ACR-644][Add 360 content feature] Change-Id: I61295f28c43c8f92219018a9c342e9bb831540e7 Signed-off-by: Minje Ahn --- src/utc/media-content/public.list | 1 + .../tct-media-content-core_common_iot.h | 62 ++++++++++++++++++++++ .../media-content/tct-media-content-core_mobile.h | 4 ++ src/utc/media-content/tct-media-content-core_tv.h | 4 ++ .../tct-media-content-core_wearable.h | 4 ++ src/utc/media-content/utc-media-info.c | 36 +++++++++++++ 6 files changed, 111 insertions(+) diff --git a/src/utc/media-content/public.list b/src/utc/media-content/public.list index 2fa23cd..3fc906e 100755 --- a/src/utc/media-content/public.list +++ b/src/utc/media-content/public.list @@ -156,6 +156,7 @@ media_info_get_timeline media_info_get_title media_info_get_video media_info_get_weather +media_info_is_360_content media_info_insert_batch_to_db media_info_insert_burst_shot_to_db media_info_insert_to_db diff --git a/src/utc/media-content/tct-media-content-core_common_iot.h b/src/utc/media-content/tct-media-content-core_common_iot.h index 5e627d5..7031505 100755 --- a/src/utc/media-content/tct-media-content-core_common_iot.h +++ b/src/utc/media-content/tct-media-content-core_common_iot.h @@ -30,6 +30,8 @@ extern void utc_media_bookmark_startup(void); extern void utc_media_bookmark_cleanup(void); extern void utc_media_content_startup(void); extern void utc_media_content_cleanup(void); +extern void utc_media_face_startup(void); +extern void utc_media_face_cleanup(void); extern void utc_media_filter_destroy_startup(void); extern void utc_media_filter_destroy_cleanup(void); extern void utc_media_filter_startup(void); @@ -135,6 +137,34 @@ extern int utc_media_content_add_db_updated_cb_n(void); extern int utc_media_content_add_db_updated_cb_p(void); extern int utc_media_content_remove_db_updated_cb_n(void); extern int utc_media_content_remove_db_updated_cb_p(void); +extern int utc_media_face_clone_p(void); +extern int utc_media_face_clone_n(void); +extern int utc_media_face_destroy_p(void); +extern int utc_media_face_destroy_n(void); +extern int utc_media_face_get_face_id_p(void); +extern int utc_media_face_get_face_id_n(void); +extern int utc_media_face_get_media_id_p(void); +extern int utc_media_face_get_media_id_n(void); +extern int utc_media_face_get_face_rect_p(void); +extern int utc_media_face_get_face_rect_n(void); +extern int utc_media_face_get_orientation_p(void); +extern int utc_media_face_get_orientation_n(void); +extern int utc_media_face_get_tag_p(void); +extern int utc_media_face_get_tag_n(void); +extern int utc_media_face_create_p(void); +extern int utc_media_face_create_n(void); +extern int utc_media_face_set_face_rect_p(void); +extern int utc_media_face_set_face_rect_n(void); +extern int utc_media_face_set_orientation_p(void); +extern int utc_media_face_set_orientation_n(void); +extern int utc_media_face_set_tag_p(void); +extern int utc_media_face_set_tag_n(void); +extern int utc_media_face_insert_to_db_p(void); +extern int utc_media_face_insert_to_db_n(void); +extern int utc_media_face_update_to_db_p(void); +extern int utc_media_face_update_to_db_n(void); +extern int utc_media_face_delete_from_db_p(void); +extern int utc_media_face_delete_from_db_n(void); extern int utc_media_filter_destroy_n(void); extern int utc_media_filter_destroy_p(void); extern int utc_media_filter_set_offset_n(void); @@ -397,6 +427,8 @@ extern int utc_media_info_get_timeline_n(void); extern int utc_media_info_get_timeline_p(void); extern int utc_media_info_get_title_n(void); extern int utc_media_info_get_title_p(void); +extern int utc_media_info_is_360_content_n(void); +extern int utc_media_info_is_360_content_p(void); extern int utc_media_info_cancel_thumbnail_n(void); extern int utc_media_info_cancel_thumbnail_p(void); extern int utc_media_info_insert_burst_shot_to_db_n(void); @@ -635,6 +667,34 @@ testcase tc_array[] = { {"utc_media_content_add_db_updated_cb_p", utc_media_content_add_db_updated_cb_p, utc_media_content_startup, utc_media_content_cleanup}, {"utc_media_content_remove_db_updated_cb_n", utc_media_content_remove_db_updated_cb_n, utc_media_content_startup, utc_media_content_cleanup}, {"utc_media_content_remove_db_updated_cb_p", utc_media_content_remove_db_updated_cb_p, utc_media_content_startup, utc_media_content_cleanup}, + {"utc_media_face_clone_p", utc_media_face_clone_p, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_clone_n", utc_media_face_clone_n, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_destroy_p", utc_media_face_destroy_p, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_destroy_n", utc_media_face_destroy_n, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_get_face_id_p", utc_media_face_get_face_id_p, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_get_face_id_n", utc_media_face_get_face_id_n, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_get_media_id_p", utc_media_face_get_media_id_p, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_get_media_id_n", utc_media_face_get_media_id_n, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_get_face_rect_p", utc_media_face_get_face_rect_p, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_get_face_rect_n", utc_media_face_get_face_rect_n, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_get_orientation_p", utc_media_face_get_orientation_p, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_get_orientation_n", utc_media_face_get_orientation_n, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_get_tag_p", utc_media_face_get_tag_p, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_get_tag_n", utc_media_face_get_tag_n, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_create_p", utc_media_face_create_p, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_create_n", utc_media_face_create_n, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_set_face_rect_p", utc_media_face_set_face_rect_p, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_set_face_rect_n", utc_media_face_set_face_rect_n, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_set_orientation_p", utc_media_face_set_orientation_p, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_set_orientation_n", utc_media_face_set_orientation_n, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_set_tag_p", utc_media_face_set_tag_p, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_set_tag_n", utc_media_face_set_tag_n, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_insert_to_db_p", utc_media_face_insert_to_db_p, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_insert_to_db_n", utc_media_face_insert_to_db_n, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_update_to_db_p", utc_media_face_update_to_db_p, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_update_to_db_n", utc_media_face_update_to_db_n, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_delete_from_db_p", utc_media_face_delete_from_db_p, utc_media_face_startup, utc_media_face_cleanup}, + {"utc_media_face_delete_from_db_n", utc_media_face_delete_from_db_n, utc_media_face_startup, utc_media_face_cleanup}, {"utc_media_filter_destroy_n", utc_media_filter_destroy_n, utc_media_filter_destroy_startup, utc_media_filter_destroy_cleanup}, {"utc_media_filter_destroy_p", utc_media_filter_destroy_p, utc_media_filter_destroy_startup, utc_media_filter_destroy_cleanup}, {"utc_media_filter_set_offset_n", utc_media_filter_set_offset_n, utc_media_filter_startup, utc_media_filter_cleanup}, @@ -897,6 +957,8 @@ testcase tc_array[] = { {"utc_media_info_get_timeline_p", utc_media_info_get_timeline_p, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_get_title_n", utc_media_info_get_title_n, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_get_title_p", utc_media_info_get_title_p, utc_media_info_startup, utc_media_info_cleanup}, + {"utc_media_info_is_360_content_n", utc_media_info_is_360_content_n, utc_media_info_startup, utc_media_info_cleanup}, + {"utc_media_info_is_360_content_p", utc_media_info_is_360_content_p, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_cancel_thumbnail_n", utc_media_info_cancel_thumbnail_n, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_cancel_thumbnail_p", utc_media_info_cancel_thumbnail_p, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_insert_burst_shot_to_db_n", utc_media_info_insert_burst_shot_to_db_n, utc_media_info_startup, utc_media_info_cleanup}, diff --git a/src/utc/media-content/tct-media-content-core_mobile.h b/src/utc/media-content/tct-media-content-core_mobile.h index 2c84f5d..7031505 100755 --- a/src/utc/media-content/tct-media-content-core_mobile.h +++ b/src/utc/media-content/tct-media-content-core_mobile.h @@ -427,6 +427,8 @@ extern int utc_media_info_get_timeline_n(void); extern int utc_media_info_get_timeline_p(void); extern int utc_media_info_get_title_n(void); extern int utc_media_info_get_title_p(void); +extern int utc_media_info_is_360_content_n(void); +extern int utc_media_info_is_360_content_p(void); extern int utc_media_info_cancel_thumbnail_n(void); extern int utc_media_info_cancel_thumbnail_p(void); extern int utc_media_info_insert_burst_shot_to_db_n(void); @@ -955,6 +957,8 @@ testcase tc_array[] = { {"utc_media_info_get_timeline_p", utc_media_info_get_timeline_p, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_get_title_n", utc_media_info_get_title_n, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_get_title_p", utc_media_info_get_title_p, utc_media_info_startup, utc_media_info_cleanup}, + {"utc_media_info_is_360_content_n", utc_media_info_is_360_content_n, utc_media_info_startup, utc_media_info_cleanup}, + {"utc_media_info_is_360_content_p", utc_media_info_is_360_content_p, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_cancel_thumbnail_n", utc_media_info_cancel_thumbnail_n, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_cancel_thumbnail_p", utc_media_info_cancel_thumbnail_p, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_insert_burst_shot_to_db_n", utc_media_info_insert_burst_shot_to_db_n, utc_media_info_startup, utc_media_info_cleanup}, diff --git a/src/utc/media-content/tct-media-content-core_tv.h b/src/utc/media-content/tct-media-content-core_tv.h index 2c84f5d..7031505 100755 --- a/src/utc/media-content/tct-media-content-core_tv.h +++ b/src/utc/media-content/tct-media-content-core_tv.h @@ -427,6 +427,8 @@ extern int utc_media_info_get_timeline_n(void); extern int utc_media_info_get_timeline_p(void); extern int utc_media_info_get_title_n(void); extern int utc_media_info_get_title_p(void); +extern int utc_media_info_is_360_content_n(void); +extern int utc_media_info_is_360_content_p(void); extern int utc_media_info_cancel_thumbnail_n(void); extern int utc_media_info_cancel_thumbnail_p(void); extern int utc_media_info_insert_burst_shot_to_db_n(void); @@ -955,6 +957,8 @@ testcase tc_array[] = { {"utc_media_info_get_timeline_p", utc_media_info_get_timeline_p, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_get_title_n", utc_media_info_get_title_n, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_get_title_p", utc_media_info_get_title_p, utc_media_info_startup, utc_media_info_cleanup}, + {"utc_media_info_is_360_content_n", utc_media_info_is_360_content_n, utc_media_info_startup, utc_media_info_cleanup}, + {"utc_media_info_is_360_content_p", utc_media_info_is_360_content_p, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_cancel_thumbnail_n", utc_media_info_cancel_thumbnail_n, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_cancel_thumbnail_p", utc_media_info_cancel_thumbnail_p, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_insert_burst_shot_to_db_n", utc_media_info_insert_burst_shot_to_db_n, utc_media_info_startup, utc_media_info_cleanup}, diff --git a/src/utc/media-content/tct-media-content-core_wearable.h b/src/utc/media-content/tct-media-content-core_wearable.h index d217e51..8ea4236 100755 --- a/src/utc/media-content/tct-media-content-core_wearable.h +++ b/src/utc/media-content/tct-media-content-core_wearable.h @@ -425,6 +425,8 @@ extern int utc_media_info_get_timeline_n(void); extern int utc_media_info_get_timeline_p(void); extern int utc_media_info_get_title_n(void); extern int utc_media_info_get_title_p(void); +extern int utc_media_info_is_360_content_n(void); +extern int utc_media_info_is_360_content_p(void); extern int utc_media_info_cancel_thumbnail_n(void); extern int utc_media_info_cancel_thumbnail_p(void); extern int utc_media_info_insert_burst_shot_to_db_n(void); @@ -931,6 +933,8 @@ testcase tc_array[] = { {"utc_media_info_get_timeline_p", utc_media_info_get_timeline_p, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_get_title_n", utc_media_info_get_title_n, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_get_title_p", utc_media_info_get_title_p, utc_media_info_startup, utc_media_info_cleanup}, + {"utc_media_info_is_360_content_n", utc_media_info_is_360_content_n, utc_media_info_startup, utc_media_info_cleanup}, + {"utc_media_info_is_360_content_p", utc_media_info_is_360_content_p, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_cancel_thumbnail_n", utc_media_info_cancel_thumbnail_n, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_cancel_thumbnail_p", utc_media_info_cancel_thumbnail_p, utc_media_info_startup, utc_media_info_cleanup}, {"utc_media_info_insert_burst_shot_to_db_n", utc_media_info_insert_burst_shot_to_db_n, utc_media_info_startup, utc_media_info_cleanup}, diff --git a/src/utc/media-content/utc-media-info.c b/src/utc/media-content/utc-media-info.c index b0659b3..f5099d1 100644 --- a/src/utc/media-content/utc-media-info.c +++ b/src/utc/media-content/utc-media-info.c @@ -4529,6 +4529,42 @@ int utc_media_info_get_title_p(void) return 0; } +/** + * @testcase utc_media_info_is_360_content_n + * @since_tizen 3.0 + * @description Negative test case of media_info_is_360_content() + */ +int utc_media_info_is_360_content_n(void) +{ + assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); + + int ret = MEDIA_CONTENT_ERROR_NONE; + + ret = media_info_is_360_content(NULL, NULL); + assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + + return 0; +} + + +/** + * @testcase utc_media_info_is_360_content_p + * @since_tizen 2.3 + * @description Positive test case of media_info_is_360_content() + */ +int utc_media_info_is_360_content_p(void) +{ + assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); + + bool is_360 = 0; + int ret = MEDIA_CONTENT_ERROR_NONE; + + ret = media_info_is_360_content(g_item, &is_360); + assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); + + return 0; +} + /** * @testcase utc_media_info_cancel_thumbnail_n -- 2.7.4