[0.6.87] add err handling about setting codec_type

- add err handling
- add audio codec type setting

Change-Id: I359da0571e3d3da17417a59d8c5dc8806e61c623

1 files changed, 32 insertions, 7 deletions

diff --git a/src/mm_player_ini.c b/src/mm_player_ini.c
index 8662314..91c1efa 100644
--- a/src/mm_player_ini.c
+++ b/src/mm_player_ini.c
@@ -152,15 +152,20 @@ mm_player_ini_load(mm_player_ini_t* ini)
 		ini->num_of_video_bo = iniparser_getint(dict, "general:video bo max", DEFAULT_NUM_OF_VIDEO_BO);
 		ini->video_bo_timeout = iniparser_getint(dict, "general:video bo timeout", DEFAULT_TIMEOUT_OF_VIDEO_BO);
 
-		MMPLAYER_INI_GET_STRING(dict, ini->videosink_element_overlay, "general:videosink element overlay", DEFAULT_VIDEOSINK_OVERLAY);
-		MMPLAYER_INI_GET_STRING(dict, ini->videosink_element_fake, "general:videosink element fake", DEFAULT_VIDEOSINK_FAKE);
 		MMPLAYER_INI_GET_STRING(dict, ini->audioresampler_element, "general:audio resampler element", DEFAULT_AUDIORESAMPLER);
+		MMPLAYER_INI_GET_STRING(dict, ini->audiocodec_element_hw, "general:audio codec element hw", DEFAULT_CODEC_HW);
 		MMPLAYER_INI_GET_STRING(dict, ini->audiosink_element, "general:audiosink element", DEFAULT_AUDIOSINK);
-		MMPLAYER_INI_GET_STRING(dict, ini->videocodec_element_hw, "general:video codec element hw", DEFAULT_VIDEOCODEC_HW);
+
+		MMPLAYER_INI_GET_STRING(dict, ini->videosink_element_overlay, "general:videosink element overlay", DEFAULT_VIDEOSINK_OVERLAY);
+		MMPLAYER_INI_GET_STRING(dict, ini->videosink_element_fake, "general:videosink element fake", DEFAULT_VIDEOSINK_FAKE);
+		MMPLAYER_INI_GET_STRING(dict, ini->videocodec_element_hw, "general:video codec element hw", DEFAULT_CODEC_HW);
 		MMPLAYER_INI_GET_STRING(dict, ini->videoconverter_element, "general:video converter element", DEFAULT_VIDEO_CONVERTER);
 
 		__get_element_list(ini,
-			iniparser_getstring(dict, "general:video codec element sw", DEFAULT_VIDEOCODEC_SW), KEYWORD_SW_CODEC);
+			iniparser_getstring(dict, "general:audio codec element sw", DEFAULT_CODEC_SW), KEYWORD_A_SW_CODEC);
+
+		__get_element_list(ini,
+			iniparser_getstring(dict, "general:video codec element sw", DEFAULT_CODEC_SW), KEYWORD_V_SW_CODEC);
 
 		__get_element_list(ini,
 			iniparser_getstring(dict, "general:element exclude keyword", DEFAULT_EXCLUDE_KEYWORD), KEYWORD_EXCLUDE);
@@ -208,10 +213,12 @@ mm_player_ini_load(mm_player_ini_t* ini)
 
 		strncpy(ini->audioresampler_element, DEFAULT_AUDIORESAMPLER, PLAYER_INI_MAX_STRLEN -1);
 		strncpy(ini->audiosink_element, DEFAULT_AUDIOSINK, PLAYER_INI_MAX_STRLEN -1);
-		strncpy(ini->videocodec_element_hw, DEFAULT_VIDEOCODEC_HW, PLAYER_INI_MAX_STRLEN - 1);
+		strncpy(ini->audiocodec_element_hw, DEFAULT_CODEC_HW, PLAYER_INI_MAX_STRLEN - 1);
+		strncpy(ini->videocodec_element_hw, DEFAULT_CODEC_HW, PLAYER_INI_MAX_STRLEN - 1);
 		strncpy(ini->videoconverter_element, DEFAULT_VIDEO_CONVERTER, PLAYER_INI_MAX_STRLEN -1);
 
-		__get_element_list(ini, DEFAULT_VIDEOCODEC_SW, KEYWORD_SW_CODEC);
+		__get_element_list(ini, DEFAULT_CODEC_SW, KEYWORD_A_SW_CODEC);
+		__get_element_list(ini, DEFAULT_CODEC_SW, KEYWORD_V_SW_CODEC);
 		__get_element_list(ini, DEFAULT_EXCLUDE_KEYWORD, KEYWORD_EXCLUDE);
 
 		strncpy(ini->gst_param[0], DEFAULT_GST_PARAM, PLAYER_INI_MAX_PARAM_STRLEN - 1);
@@ -249,6 +256,9 @@ mm_player_ini_load(mm_player_ini_t* ini)
 	LOGD("video codec element(hw) : %s\n", ini->videocodec_element_hw);
 	for (idx = 0; ini->videocodec_element_sw[idx][0] != '\0'; idx++)
 		LOGD("video codec element(sw%d) %s\n", idx, ini->videocodec_element_sw[idx]);
+	LOGD("audio codec element(hw) : %s\n", ini->audiocodec_element_hw);
+	for (idx = 0; ini->audiocodec_element_sw[idx][0] != '\0'; idx++)
+		LOGD("audio codec element(sw%d) %s\n", idx, ini->audiocodec_element_sw[idx]);
 	LOGD("audio resampler element : %s\n", ini->audioresampler_element);
 	LOGD("audiosink element : %s\n", ini->audiosink_element);
 	LOGD("generate dot : %d\n", ini->generate_dot);
@@ -495,7 +505,7 @@ void __get_element_list(mm_player_ini_t* ini, gchar* str, int keyword_type)
 
 		break;
 	}
-	case KEYWORD_SW_CODEC:
+	case KEYWORD_V_SW_CODEC:
 	{
 		for (walk = list; *walk; walk++) {
 			strncpy(ini->videocodec_element_sw[i], *walk, (PLAYER_INI_MAX_STRLEN - 1));
@@ -510,6 +520,21 @@ void __get_element_list(mm_player_ini_t* ini, gchar* str, int keyword_type)
 		ini->videocodec_element_sw[i][0] = '\0';
 		break;
 	}
+	case KEYWORD_A_SW_CODEC:
+	{
+		for (walk = list; *walk; walk++) {
+			strncpy(ini->audiocodec_element_sw[i], *walk, (PLAYER_INI_MAX_STRLEN - 1));
+
+			g_strstrip(ini->audiocodec_element_sw[i]);
+
+			ini->audiocodec_element_sw[i][PLAYER_INI_MAX_STRLEN -1] = '\0';
+
+			i++;
+		}
+		/* mark last item to NULL */
+		ini->audiocodec_element_sw[i][0] = '\0';
+		break;
+	}
 
 	default:
 		break;