From: Eunhae Choi Date: Wed, 8 Mar 2017 06:43:30 +0000 (+0900) Subject: [0.3.51] fix typo of _set_uri API reference X-Git-Tag: submit/tizen/20170403.050513~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b550011dd9e3bc6ebdcb22fb0ddcd316885ce14c;p=platform%2Fcore%2Fapi%2Fplayer.git [0.3.51] fix typo of _set_uri API reference Change-Id: I02278459fd8a3d1289e301d07580514365cd7cd1 --- diff --git a/include/player.h b/include/player.h index a469b2f..f8f02a4 100644 --- a/include/player.h +++ b/include/player.h @@ -515,12 +515,12 @@ int player_prepare_async(player_h player, player_prepared_cb callback, void* use int player_unprepare(player_h player); /** - * @brief Sets the data source (file-path, HTTP or RSTP URI) to use. + * @brief Sets the data source (file-path, HTTP or RTSP URI) to use. * * @details Associates media contents, referred to by the URI, with the player. * If the function call is successful, subsequent calls to player_prepare() and player_start() will start playing the media. * @since_tizen @if WEARABLE 2.3.1 @else 2.3 @endif - * @remarks If you use HTTP or RSTP, URI must start with "http://" or "rtsp://". The default protocol is "file://". + * @remarks If you use HTTP or RTSP, URI must start with "http://" or "rtsp://". The default protocol is "file://". * If you provide an invalid URI, you won't receive an error message until you call player_start(). * @remarks This API must be called before calling the player_prepare() or player_prepare_async() to build the player based on the uri information. * @remarks The mediastorage privilege(http://tizen.org/privilege/mediastorage) must be added if any video/audio files are used to play located in the internal storage. @@ -528,7 +528,7 @@ int player_unprepare(player_h player); * @remarks The internet privilege(http://tizen.org/privilege/internet) must be added if any URLs are used to play from network. * * @param[in] player The handle to the media player - * @param[in] uri The content location, such as the file path, the URI of the HTTP or RSTP stream you want to play + * @param[in] uri The content location, such as the file path, the URI of the HTTP or RTSP stream you want to play * * @return @c 0 on success, * otherwise a negative error value diff --git a/test/player_test.c b/test/player_test.c index d53b185..473e031 100644 --- a/test/player_test.c +++ b/test/player_test.c @@ -576,6 +576,11 @@ static void interrupted_cb(player_interrupted_code_e code, void *user_data) g_print("[Player_Test] interrupted_cb!!!! code : %d\n", code); } +static void video_changed_cb(int width, int height, int fps, int bit_rate, void *user_data) +{ + g_print("[Player_Test] video_changed_cb!!!! %d x %d, %d, %d \n", width, height, fps, bit_rate); +} + #if 0 static void audio_frame_decoded_cb(unsigned char *data, unsigned int size, void *user_data) { @@ -949,6 +954,7 @@ static void _player_prepare(bool async) player_set_completed_cb(g_player[0], completed_cb, (void *)g_player[0]); player_set_interrupted_cb(g_player[0], interrupted_cb, (void *)g_player[0]); player_set_error_cb(g_player[0], error_cb, (void *)g_player[0]); + player_set_video_stream_changed_cb(g_player[0], video_changed_cb, (void *)g_player[0]); if (g_memory_playback) player_set_memory_buffer_test(); else @@ -960,6 +966,7 @@ static void _player_prepare(bool async) player_set_completed_cb(g_player[i], completed_cb, (void *)g_player[i]); player_set_interrupted_cb(g_player[i], interrupted_cb, (void *)g_player[i]); player_set_error_cb(g_player[i], error_cb, (void *)g_player[i]); + player_set_video_stream_changed_cb(g_player[0], video_changed_cb, (void *)g_player[0]); if (g_memory_playback) player_set_memory_buffer_test(); else