move param for webaudio

Change-Id: I57bd4caa4663684b4050a462d2f8b10836efd3b7
Signed-off-by: Hyunil Park <hyunil46.park@samsung.com>

diff --git a/include/mobile/player_internal.h b/include/mobile/player_internal.h
index 34d07c51a2ffd4db0e78edb533d9eb2ca8d09194..c724bd0875020c023cc7b2aa86f3367060c411f4 100755 (executable)
--- a/include/mobile/player_internal.h
+++ b/include/mobile/player_internal.h
@@ -76,7 +76,7 @@ typedef void (*player_audio_pcm_extraction_cb)(player_audio_raw_data_s *audio_ra
  * @post player_audio_pcm_extraction_cb() will be invoked.
  * @see player_unset_audio_frame_decoded_cb_ex()
  */
-int player_set_pcm_extraction_mode(player_h player, bool sync, const char *format, player_audio_pcm_extraction_cb callback, void *user_data);
+int player_set_pcm_extraction_mode(player_h player, bool sync, player_audio_pcm_extraction_cb callback, void *user_data);
 
 /**
  * @brief Set pcm mode spec. Samplerate, channel is needed.
@@ -94,7 +94,7 @@ int player_set_pcm_extraction_mode(player_h player, bool sync, const char *forma
  * @pre The player state must be #PLAYER_STATE_IDLE by player_create() or player_unprepare().
  * @see player_set_pcm_extraction_mode()
  */
-int player_set_pcm_spec(player_h player, int samplerate, int channel);
+int player_set_pcm_spec(player_h player, const char *format, int samplerate, int channel);
 /**
  * @}
  */

diff --git a/include/wearable/player_internal.h b/include/wearable/player_internal.h
index 014ad4daad012528c91b14ff8e2171dc0401242b..31e4c171939d1222d7ed9a0edc4ab54886c487c1 100644 (file)
--- a/include/wearable/player_internal.h
+++ b/include/wearable/player_internal.h
@@ -75,7 +75,7 @@ typedef void (*player_audio_pcm_extraction_cb)(player_audio_raw_data_s *audio_ra
  * @pre The player state must be #PLAYER_STATE_IDLE by player_create() or player_unprepare().
  * @post player_audio_pcm_extraction_cb() will be invoked.
  */
-int player_set_pcm_extraction_mode(player_h player, bool sync, const char *format, player_audio_pcm_extraction_cb callback, void *user_data);
+int player_set_pcm_extraction_mode(player_h player, bool sync, player_audio_pcm_extraction_cb callback, void *user_data);
 /**
  * @brief Set pcm mode spec. Samplerate, channel is needed.
  * @since_tizen 2.4
@@ -92,7 +92,7 @@ int player_set_pcm_extraction_mode(player_h player, bool sync, const char *forma
  * @pre The player state must be #PLAYER_STATE_IDLE by player_create() or player_unprepare().
  * @see player_set_pcm_extraction_mode()
  */
-int player_set_pcm_spec(player_h player, int samplerate, int channel);
+int player_set_pcm_spec(player_h player, const char *format, int samplerate, int channel);
 
 /**
  * @}

diff --git a/src/player_internal.c b/src/player_internal.c
index a10288e313082e844bc6e712b6e21472be58526b..bef6e823634092cee50a3cd375608a05755e4651 100755 (executable)
--- a/src/player_internal.c
+++ b/src/player_internal.c
@@ -58,27 +58,42 @@ bool  __audio_stream_callback_ex(MMPlayerAudioStreamDataType *stream, void *user
        return TRUE;
 }
 
-int player_set_pcm_extraction_mode(player_h player, bool sync, const char *format, player_audio_pcm_extraction_cb callback, void *user_data)
+int player_set_pcm_extraction_mode(player_h player, bool sync, player_audio_pcm_extraction_cb callback, void *user_data)
 {
        PLAYER_INSTANCE_CHECK(player);
        PLAYER_NULL_ARG_CHECK(callback);
        player_s * handle = (player_s *) player;
        int ret = MM_ERROR_NONE;
+
        PLAYER_STATE_CHECK(handle, PLAYER_STATE_IDLE);
 
        ret = mm_player_set_attribute(handle->mm_handle, NULL, "pcm_extraction",TRUE, "pcm_extraction_start_msec", 0, "pcm_extraction_end_msec", 0, NULL);
        if(ret != MM_ERROR_NONE)
                return __player_convert_error_code(ret,(char*)__FUNCTION__);
 
+       ret = mm_player_set_audio_stream_callback_ex(handle->mm_handle, sync,  __audio_stream_callback_ex, (void*)handle);
+       if(ret != MM_ERROR_NONE)
+               return __player_convert_error_code(ret,(char*)__FUNCTION__);
+
+       PLAYER_SET_CALLBACK(_PLAYER_EVENT_TYPE_AUDIO_FRAME, handle, callback, user_data);
+       return PLAYER_ERROR_NONE;
+}
+
+int player_set_pcm_spec(player_h player, const char *format, int samplerate, int channel)
+{
+       PLAYER_INSTANCE_CHECK(player);
+
+       player_s * handle = (player_s *) player;
+       int ret = MM_ERROR_NONE;
+
+       LOGE("[%s] player_set_pcm_spec %s %d %d", __FUNCTION__, format, samplerate, channel);
        ret = mm_player_set_attribute(handle->mm_handle, NULL, "pcm_audioformat", format , strlen(format), NULL);
        if(ret != MM_ERROR_NONE)
                return __player_convert_error_code(ret,(char*)__FUNCTION__);
 
-       ret = mm_player_set_audio_stream_callback_ex(handle->mm_handle, sync,  __audio_stream_callback_ex, (void*)handle);
+       ret = mm_player_set_pcm_spec(handle->mm_handle, samplerate, channel);
        if(ret != MM_ERROR_NONE)
                return __player_convert_error_code(ret,(char*)__FUNCTION__);
 
-       PLAYER_SET_CALLBACK(_PLAYER_EVENT_TYPE_AUDIO_FRAME, handle, callback, user_data);
        return PLAYER_ERROR_NONE;
 }
-

diff --git a/test/player_test.c b/test/player_test.c
index 1239ba07a6d25060d887b54cdeffc69d6e695891..809564bd5880f092fe7f8ec56c586c666c78dd52 100644 (file)
--- a/test/player_test.c
+++ b/test/player_test.c
@@ -1067,7 +1067,7 @@ static void audio_frame_decoded_cb_ex()
     fp_out2 = fopen("/opt/usr/media/out2.pcm", "wb");
 #endif
 
-       ret = player_set_pcm_extraction_mode(g_player[0], false, "F32LE", _audio_frame_decoded_cb_ex, &ret);
+       ret = player_set_pcm_extraction_mode(g_player[0], false, _audio_frame_decoded_cb_ex, &ret);
        g_print("                                                            ==> [Player_Test] player_set_audio_frame_decoded_cb_ex return: %d\n", ret);
 }
 
@@ -1075,7 +1075,7 @@ static void set_pcm_spec()
 {
        int ret;
 
-       ret = player_set_pcm_spec(g_player[0], 44100, 2);
+       ret = player_set_pcm_spec(g_player[0], "F32LE", 44100, 2);
        g_print("[Player_Test] set_pcm_spec return: %d\n", ret);
 }