From c5d3c356e30002b42b1a671db18ba923ab4c0bbd Mon Sep 17 00:00:00 2001 From: Gilbok Lee Date: Thu, 16 Jun 2016 15:17:56 +0900 Subject: [PATCH] [UTC][mediademuxer][Non-ACR][Remove LOGI, fix memory leak and apply coding rule] Change-Id: I790d73ef481e8ec2897293288ae4d6395a505c3c Signed-off-by: Gilbok Lee --- src/utc/mediademuxer/utc-mediademuxer.c | 296 ++++++++------------------------ 1 file changed, 73 insertions(+), 223 deletions(-) diff --git a/src/utc/mediademuxer/utc-mediademuxer.c b/src/utc/mediademuxer/utc-mediademuxer.c index 79a3f9f..92558f1 100755 --- a/src/utc/mediademuxer/utc-mediademuxer.c +++ b/src/utc/mediademuxer/utc-mediademuxer.c @@ -1,41 +1,28 @@ - #include "assert.h" #include #include #include #include #include -#include -// #include #include "tct_common.h" #define API_NAMESPACE "[MEDIAMUXER]" -//& set: Mediamuxer - -#ifdef LOG_TAG -#undef LOG_TAG -#endif - -#define LOG_TAG "UTC_DEMUX" -//#include - //& set: Mediademuxer static mediademuxer_h g_media_demuxer = NULL; static bool _is_broken = false; -// static bool _is_positive = false; -static char* file_path = NULL; +static char *file_path = NULL; static char file_name[] = "sample.mp4"; static char *file; static char *uri = NULL; static bool error_cb(mediademuxer_error_e error, void *user_data) { - g_print("error_cb is called\n"); - return true; + g_print("error_cb is called\n"); + return true; } void eos_cb(int track_index, void *user_data) @@ -53,58 +40,32 @@ void eos_cb(int track_index, void *user_data) void utc_mediademuxer_startup(void) { int ret; - LOGI("%s ENTER\n",__func__); mediademuxer_state state; - if(uri == NULL){ - char pszValue[CONFIG_VALUE_LEN_MAX] = {0,}; - if ( true == GetValueForTCTSetting("DEVICE_SUITE_TARGET_30", pszValue, API_NAMESPACE )) - { - PRINT_UTC_LOG("[Line : %d][%s] 'DEVICE_SUITE_TARGET_30' Values Received = %s\\n", __LINE__, API_NAMESPACE, pszValue); - file_path = (char*)malloc(strlen(pszValue) + strlen("sample.mp4") + 6); - snprintf(file_path, strlen(pszValue) + strlen("sample.mp4") + 6, "%s/res/%s", pszValue, "sample.mp4" ); - } - else - { + _is_broken = false; + if (uri == NULL) { + char pszValue[CONFIG_VALUE_LEN_MAX] = { 0, }; + if (true == GetValueForTCTSetting("DEVICE_SUITE_TARGET_30", pszValue, API_NAMESPACE)) { + PRINT_UTC_LOG("[Line : %d][%s] 'DEVICE_SUITE_TARGET_30' Values Received = %s\\n", __LINE__, API_NAMESPACE, pszValue); + file_path = (char *)malloc(strlen(pszValue) + strlen("sample.mp4") + 6); + snprintf(file_path, strlen(pszValue) + strlen("sample.mp4") + 6, "%s/res/%s", pszValue, "sample.mp4"); + } else { PRINT_UTC_LOG("[Line : %d][%s] GetValueForTCTSetting returned error for 'DEVICE_SUITE_TARGET_30'\\n", __LINE__, API_NAMESPACE); } - LOGI("file_path=%s\n",file_path); uri = file_path; - LOGI("uri is set to %s\n",uri); } - if(g_media_demuxer == NULL) { - LOGI("Call create\n"); + if (g_media_demuxer == NULL) { ret = mediademuxer_create(&g_media_demuxer); - //assert_eq(ret, MEDIADEMUXER_ERROR_NONE); - if (ret != MEDIADEMUXER_ERROR_NONE) - { + if (ret != MEDIADEMUXER_ERROR_NONE) { _is_broken = true; - LOGI("mediamuxer create is failed\n"); return; } } - ret = mediademuxer_set_eos_cb(g_media_demuxer,(mediademuxer_eos_cb) eos_cb,g_media_demuxer); - if (ret != MEDIADEMUXER_ERROR_NONE) { + ret = mediademuxer_set_eos_cb(g_media_demuxer, (mediademuxer_eos_cb)eos_cb, g_media_demuxer); + if (ret != MEDIADEMUXER_ERROR_NONE) { _is_broken = true; - LOGI("mediamuxer set_eos_cb is failed\n"); return; } - -#if 0 - if(mediademuxer_get_state(g_media_demuxer, &state) == MEDIADEMUXER_ERROR_NONE) { - if(state != MEDIADEMUXER_READY) { - ret = mediademuxer_set_data_source(g_media_demuxer, uri); - assert_eq(ret, MEDIADEMUXER_ERROR_NONE); - - ret = mediademuxer_prepare(g_media_demuxer); - assert_eq(ret, MEDIADEMUXER_ERROR_NONE); - } - } - else{ - LOGI("get state call failed\n"); - } -#endif - LOGI("%s EXIT\n",__func__); } /** @@ -117,39 +78,40 @@ void utc_mediademuxer_cleanup(void) { int ret; mediademuxer_state state; - LOGI("%s ENTER\n",__func__); - /* if(storage_foreach_device_supported(storage_device_cb, NULL) != STORAGE_ERROR_NONE) - { - fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__); - } */ - if(mediademuxer_get_state(g_media_demuxer, &state) == MEDIADEMUXER_ERROR_NONE) { - if(state == MEDIADEMUXER_DEMUXING){ - ret = mediademuxer_stop(g_media_demuxer); + /* if(storage_foreach_device_supported(storage_device_cb, NULL) != STORAGE_ERROR_NONE) + { + fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__); + } */ + if (g_media_demuxer != NULL) { + if (mediademuxer_get_state(g_media_demuxer, &state) == MEDIADEMUXER_ERROR_NONE) { + if (state == MEDIADEMUXER_DEMUXING) { + ret = mediademuxer_stop(g_media_demuxer); + } } - } - if(mediademuxer_get_state(g_media_demuxer, &state) == MEDIADEMUXER_ERROR_NONE) { - if(state == MEDIADEMUXER_READY) { - ret = mediademuxer_unprepare(g_media_demuxer); + if (mediademuxer_get_state(g_media_demuxer, &state) == MEDIADEMUXER_ERROR_NONE) { + if (state == MEDIADEMUXER_READY) { + ret = mediademuxer_unprepare(g_media_demuxer); + } } - } - ret = mediademuxer_unset_eos_cb(g_media_demuxer); + ret = mediademuxer_unset_eos_cb(g_media_demuxer); - if(g_media_demuxer != NULL) { - LOGI("Call create\n"); ret = mediademuxer_destroy(g_media_demuxer); g_media_demuxer = NULL; } - LOGI("%s EXIT\n",__func__); -} + if (file_path) { + free(file_path); + file_path = NULL; + uri = NULL; + } -//& purpose: A purpose of a first positive TC. +} +//& purpose: A purpose of a first positive TC. //& purpose: A purpose of a first negative TC. - /** * @testcase utc_mediademuxer_create_p * @since_tizen 3.0 @@ -158,15 +120,13 @@ void utc_mediademuxer_cleanup(void) int utc_mediademuxer_create_p(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; - if(g_media_demuxer){ + if (g_media_demuxer) { ret = mediademuxer_destroy(g_media_demuxer); g_media_demuxer = NULL; } ret = mediademuxer_create(&g_media_demuxer); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); assert_neq(g_media_demuxer, NULL); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); @@ -181,17 +141,14 @@ int utc_mediademuxer_create_p(void) int utc_mediademuxer_create_n(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; ret = mediademuxer_create(NULL); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; } - /** * @testcase utc_mediademuxer_set_data_source_p * @since_tizen 3.0 @@ -200,17 +157,14 @@ int utc_mediademuxer_create_n(void) int utc_mediademuxer_set_data_source_p(void) { assert(!_is_broken); - LOGI("%s ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; ret = mediademuxer_set_data_source(g_media_demuxer, uri); - LOGI("%s compare %d %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; } - /** * @testcase utc_mediademuxer_set_data_source_n * @since_tizen 3.0 @@ -219,11 +173,9 @@ int utc_mediademuxer_set_data_source_p(void) int utc_mediademuxer_set_data_source_n(void) { assert(!_is_broken) - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; ret = mediademuxer_set_data_source(g_media_demuxer, NULL); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PATH); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PATH); return 0; } @@ -238,15 +190,11 @@ int utc_mediademuxer_prepare_p(void) mediademuxer_state state; assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; - ret = mediademuxer_set_data_source(g_media_demuxer, uri); - ret = mediademuxer_prepare(g_media_demuxer); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; } @@ -262,12 +210,10 @@ int utc_mediademuxer_prepare_n(void) int ret = MEDIADEMUXER_ERROR_NONE; ret = mediademuxer_prepare(NULL); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; } - /** * @testcase utc_mediademuxer_get_track_count_p * @since_tizen 3.0 @@ -277,17 +223,11 @@ int utc_mediademuxer_get_track_count_p(void) { int count; assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; - mediademuxer_state state; ret = mediademuxer_set_data_source(g_media_demuxer, uri); ret = mediademuxer_prepare(g_media_demuxer); - - - ret = mediademuxer_get_track_count(g_media_demuxer, &count); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; } @@ -301,11 +241,9 @@ int utc_mediademuxer_get_track_count_n(void) { int count; assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; ret = mediademuxer_get_track_count(NULL, &count); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; } @@ -319,22 +257,20 @@ int utc_mediademuxer_get_track_info_p(void) { int count; int ret; - int track_index=0; + int track_index = 0; mediademuxer_state state; media_format_h media_format = NULL; - LOGI("%s: ENTER\n",__func__); - if(g_media_demuxer == NULL) { + if (g_media_demuxer == NULL) { ret = mediademuxer_create(&g_media_demuxer); } ret = mediademuxer_set_data_source(g_media_demuxer, uri); ret = mediademuxer_prepare(g_media_demuxer); - ret = mediademuxer_get_track_count(g_media_demuxer,&count); - ret = mediademuxer_get_track_info(g_media_demuxer,track_index,&media_format); + ret = mediademuxer_get_track_count(g_media_demuxer, &count); + ret = mediademuxer_get_track_info(g_media_demuxer, track_index, &media_format); media_format_unref(media_format); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; } @@ -348,10 +284,8 @@ int utc_mediademuxer_get_track_info_n(void) { int count; assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; ret = mediademuxer_get_track_info(NULL, NULL, NULL); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; } @@ -363,19 +297,16 @@ int utc_mediademuxer_get_track_info_n(void) */ int utc_mediademuxer_select_track_p(void) { - int track_index=0; + int track_index = 0; mediademuxer_state state; assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; ret = mediademuxer_set_data_source(g_media_demuxer, uri); - ret = mediademuxer_prepare(g_media_demuxer); - ret = mediademuxer_select_track(g_media_demuxer,track_index); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); + ret = mediademuxer_select_track(g_media_demuxer, track_index); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; } @@ -389,16 +320,13 @@ int utc_mediademuxer_select_track_n(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; ret = mediademuxer_select_track(NULL, 0); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; } - /** * @testcase utc_mediademuxer_start_p * @since_tizen 3.0 @@ -407,23 +335,18 @@ int utc_mediademuxer_select_track_n(void) int utc_mediademuxer_start_p(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; ret = mediademuxer_set_data_source(g_media_demuxer, uri); - ret = mediademuxer_prepare(g_media_demuxer); - - + ret = mediademuxer_select_track(g_media_demuxer, 0); ret = mediademuxer_start(g_media_demuxer); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; } - /** * @testcase utc_mediademuxer_start_n * @since_tizen 3.0 @@ -432,14 +355,11 @@ int utc_mediademuxer_start_p(void) int utc_mediademuxer_start_n(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; ret = mediademuxer_set_data_source(g_media_demuxer, uri); - ret = mediademuxer_prepare(g_media_demuxer); ret = mediademuxer_start(NULL); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; } @@ -452,7 +372,6 @@ int utc_mediademuxer_start_n(void) int utc_mediademuxer_read_sample_p(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); media_packet_h audbuf; media_format_h audfmt; @@ -462,11 +381,11 @@ int utc_mediademuxer_read_sample_p(void) ret = mediademuxer_set_data_source(g_media_demuxer, uri); ret = mediademuxer_prepare(g_media_demuxer); ret = mediademuxer_get_track_info(g_media_demuxer, track_index, &audfmt); - ret = mediademuxer_select_track(g_media_demuxer,0); + ret = mediademuxer_select_track(g_media_demuxer, 0); ret = mediademuxer_start(g_media_demuxer); - ret = mediademuxer_read_sample(g_media_demuxer,track_index,&audbuf); - - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); + ret = mediademuxer_read_sample(g_media_demuxer, track_index, &audbuf); + media_packet_destroy(audbuf); + media_format_unref(audfmt); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; } @@ -484,18 +403,17 @@ int utc_mediademuxer_read_sample_n(void) int track_index = 0; int ret = MEDIADEMUXER_ERROR_NONE; - LOGI("%s: ENTER\n",__func__); media_format_create(&audfmt); media_format_set_audio_mime(audfmt, MEDIA_FORMAT_AAC); media_packet_create_alloc(audfmt, NULL, NULL, &audbuf); - ret = mediademuxer_read_sample(g_media_demuxer,-1, NULL); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); + ret = mediademuxer_read_sample(g_media_demuxer, -1, NULL); + media_packet_destroy(audbuf); + media_format_unref(audfmt); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; } - /** * @testcase utc_mediademuxer_seek_p * @since_tizen 3.0 @@ -504,26 +422,21 @@ int utc_mediademuxer_read_sample_n(void) int utc_mediademuxer_seek_p(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; - ret = mediademuxer_set_data_source(g_media_demuxer, uri); - - + assert_eq(ret, MEDIADEMUXER_ERROR_NONE); ret = mediademuxer_prepare(g_media_demuxer); - - - ret = mediademuxer_select_track(g_media_demuxer,0); - + assert_eq(ret, MEDIADEMUXER_ERROR_NONE); + ret = mediademuxer_select_track(g_media_demuxer, 0); + assert_eq(ret, MEDIADEMUXER_ERROR_NONE); ret = mediademuxer_start(g_media_demuxer); - ret = mediademuxer_seek(g_media_demuxer,100); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); + assert_eq(ret, MEDIADEMUXER_ERROR_NONE); + ret = mediademuxer_seek(g_media_demuxer, 100); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; } - /** * @testcase utc_mediademuxer_seek_n * @since_tizen 3.0 @@ -532,11 +445,9 @@ int utc_mediademuxer_seek_p(void) int utc_mediademuxer_seek_n(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; - ret = mediademuxer_seek(NULL,100); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); + ret = mediademuxer_seek(NULL, 100); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; } @@ -549,16 +460,13 @@ int utc_mediademuxer_seek_n(void) int utc_mediademuxer_set_error_cb_p(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; - ret = mediademuxer_set_error_cb(g_media_demuxer,(mediademuxer_error_cb) error_cb,g_media_demuxer); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); + ret = mediademuxer_set_error_cb(g_media_demuxer, (mediademuxer_error_cb) error_cb, g_media_demuxer); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; } - /** * @testcase utc_mediademuxer_set_error_cb_n * @since_tizen 3.0 @@ -567,11 +475,9 @@ int utc_mediademuxer_set_error_cb_p(void) int utc_mediademuxer_set_error_cb_n(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; - ret = mediademuxer_set_error_cb(NULL,NULL,NULL); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); + ret = mediademuxer_set_error_cb(NULL, NULL, NULL); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; } @@ -584,16 +490,13 @@ int utc_mediademuxer_set_error_cb_n(void) int utc_mediademuxer_unset_error_cb_p(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; - ret = mediademuxer_set_error_cb(NULL,NULL,NULL); + ret = mediademuxer_set_error_cb(NULL, NULL, NULL); ret = mediademuxer_unset_error_cb(g_media_demuxer); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; } - /** * @testcase utc_mediademuxer_unset_error_cb_n * @since_tizen 3.0 @@ -602,11 +505,9 @@ int utc_mediademuxer_unset_error_cb_p(void) int utc_mediademuxer_unset_error_cb_n(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; ret = mediademuxer_unset_error_cb(NULL); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; } @@ -619,11 +520,9 @@ int utc_mediademuxer_unset_error_cb_n(void) int utc_mediademuxer_set_eos_cb_p(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; - ret = mediademuxer_set_eos_cb(g_media_demuxer,(mediademuxer_eos_cb) eos_cb,g_media_demuxer); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); + ret = mediademuxer_set_eos_cb(g_media_demuxer, (mediademuxer_eos_cb) eos_cb, g_media_demuxer); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; } @@ -636,11 +535,9 @@ int utc_mediademuxer_set_eos_cb_p(void) int utc_mediademuxer_set_eos_cb_n(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; - ret = mediademuxer_set_eos_cb(NULL,NULL,NULL); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); + ret = mediademuxer_set_eos_cb(NULL, NULL, NULL); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; } @@ -653,11 +550,9 @@ int utc_mediademuxer_set_eos_cb_n(void) int utc_mediademuxer_unset_eos_cb_p(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; - ret = mediademuxer_set_eos_cb(g_media_demuxer,(mediademuxer_eos_cb) eos_cb,g_media_demuxer); + ret = mediademuxer_set_eos_cb(g_media_demuxer, (mediademuxer_eos_cb) eos_cb, g_media_demuxer); ret = mediademuxer_unset_eos_cb(g_media_demuxer); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; } @@ -670,11 +565,9 @@ int utc_mediademuxer_unset_eos_cb_p(void) int utc_mediademuxer_unset_eos_cb_n(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; ret = mediademuxer_unset_eos_cb(NULL); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; } @@ -687,16 +580,13 @@ int utc_mediademuxer_unset_eos_cb_n(void) int utc_mediademuxer_get_state_p(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); mediademuxer_state state; int ret = MEDIADEMUXER_ERROR_NONE; - ret = mediademuxer_set_data_source(g_media_demuxer, uri); - + ret = mediademuxer_set_data_source(g_media_demuxer, uri); - ret = mediademuxer_prepare(g_media_demuxer); +// ret = mediademuxer_prepare(g_media_demuxer); ret = mediademuxer_get_state(g_media_demuxer, &state); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; } @@ -709,15 +599,14 @@ int utc_mediademuxer_get_state_p(void) int utc_mediademuxer_get_state_n(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); mediademuxer_state state; int ret = MEDIADEMUXER_ERROR_NONE; ret = mediademuxer_get_state(NULL, &state); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; } + /** * @testcase utc_mediademuxer_unselect_track_p * @since_tizen 3.0 @@ -725,21 +614,17 @@ int utc_mediademuxer_get_state_n(void) */ int utc_mediademuxer_unselect_track_p(void) { - int track_index=0; + int track_index = 0; assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; - ret = mediademuxer_set_data_source(g_media_demuxer, uri); - ret = mediademuxer_prepare(g_media_demuxer); -ret = mediademuxer_select_track(g_media_demuxer,track_index); - ret = mediademuxer_unselect_track(g_media_demuxer,track_index); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); + ret = mediademuxer_select_track(g_media_demuxer, track_index); + ret = mediademuxer_unselect_track(g_media_demuxer, track_index); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; } @@ -753,14 +638,11 @@ int utc_mediademuxer_unselect_track_n(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; - ret = mediademuxer_set_data_source(g_media_demuxer, uri); - + ret = mediademuxer_set_data_source(g_media_demuxer, uri); ret = mediademuxer_prepare(g_media_demuxer); ret = mediademuxer_unselect_track(NULL, 0); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; } @@ -773,25 +655,16 @@ int utc_mediademuxer_unselect_track_n(void) int utc_mediademuxer_stop_p(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; - ret = mediademuxer_set_data_source(g_media_demuxer, uri); - - ret = mediademuxer_prepare(g_media_demuxer); - - ret = mediademuxer_start(g_media_demuxer); - - ret = mediademuxer_stop(g_media_demuxer); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); + ret = mediademuxer_stop(g_media_demuxer); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; } - /** * @testcase utc_mediademuxer_stop_n * @since_tizen 3.0 @@ -800,16 +673,13 @@ int utc_mediademuxer_stop_p(void) int utc_mediademuxer_stop_n(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; ret = mediademuxer_stop(NULL); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; } - /** * @testcase utc_mediademuxer_unprepare_p * @since_tizen 3.0 @@ -818,16 +688,10 @@ int utc_mediademuxer_stop_n(void) int utc_mediademuxer_unprepare_p(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; -ret = mediademuxer_set_data_source(g_media_demuxer, uri); - - + ret = mediademuxer_set_data_source(g_media_demuxer, uri); ret = mediademuxer_prepare(g_media_demuxer); - - ret = mediademuxer_unprepare(g_media_demuxer); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; } @@ -840,22 +704,12 @@ ret = mediademuxer_set_data_source(g_media_demuxer, uri); int utc_mediademuxer_unprepare_n(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; -ret = mediademuxer_set_data_source(g_media_demuxer, uri); - - - ret = mediademuxer_prepare(g_media_demuxer); - - ret = mediademuxer_unprepare(NULL); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; } - - /** * @testcase utc_mediademuxer_destroy_p * @since_tizen 3.0 @@ -864,12 +718,10 @@ ret = mediademuxer_set_data_source(g_media_demuxer, uri); int utc_mediademuxer_destroy_p(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; ret = mediademuxer_destroy(g_media_demuxer); g_media_demuxer = NULL; - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_NONE); assert_eq(ret, MEDIADEMUXER_ERROR_NONE); return 0; @@ -883,11 +735,9 @@ int utc_mediademuxer_destroy_p(void) int utc_mediademuxer_destroy_n(void) { assert(!_is_broken); - LOGI("%s: ENTER\n",__func__); int ret = MEDIADEMUXER_ERROR_NONE; ret = mediademuxer_destroy(NULL); - LOGI("%s compare %d to %d\n",__func__,ret,MEDIADEMUXER_ERROR_INVALID_PARAMETER); assert_eq(ret, MEDIADEMUXER_ERROR_INVALID_PARAMETER); return 0; -- 2.7.4