From: Sangchul Lee Date: Wed, 22 Mar 2023 07:07:15 +0000 (+0900) Subject: webrtc_test_espp: Remove unnecessary function call X-Git-Tag: accepted/tizen/unified/20230405.153341~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6f81336ccc49ca6b858b9a58d5441a1406cabd7;p=platform%2Fcore%2Fapi%2Fwebrtc.git webrtc_test_espp: Remove unnecessary function call Codes to call esplusplayer_activate() are removed. Some variable names are changed. [Version] 0.4.5 [Issue Type] Improvement Change-Id: Id3d7f1c841b4e155a2a0cfa0e18033fc3c8d2bec Signed-off-by: Sangchul Lee --- diff --git a/packaging/capi-media-webrtc.spec b/packaging/capi-media-webrtc.spec index 22bb7be1..f49b87a5 100644 --- a/packaging/capi-media-webrtc.spec +++ b/packaging/capi-media-webrtc.spec @@ -1,6 +1,6 @@ Name: capi-media-webrtc Summary: A WebRTC library in Tizen Native API -Version: 0.4.4 +Version: 0.4.5 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/test/webrtc_test_espp.c b/test/webrtc_test_espp.c index 2a886e94..5e9853a1 100644 --- a/test/webrtc_test_espp.c +++ b/test/webrtc_test_espp.c @@ -47,8 +47,8 @@ void _espp_init(int index) !get_appdata()->conns[index].encoded_video_frame_cb_is_set) return; - get_appdata()->conns[index].render.espp.audio_track_activated = false; - get_appdata()->conns[index].render.espp.video_track_activated = false; + get_appdata()->conns[index].render.espp.audio_stream_info_set = false; + get_appdata()->conns[index].render.espp.video_stream_info_set = false; get_appdata()->conns[index].render.espp.audio_ready_to_prepare = false; get_appdata()->conns[index].render.espp.video_ready_to_prepare = false; @@ -70,8 +70,8 @@ void _espp_deinit(int index) esplusplayer_destroy(get_appdata()->conns[index].render.espp.handle); get_appdata()->conns[index].render.espp.handle = NULL; - get_appdata()->conns[index].render.espp.audio_track_activated = false; - get_appdata()->conns[index].render.espp.video_track_activated = false; + get_appdata()->conns[index].render.espp.audio_stream_info_set = false; + get_appdata()->conns[index].render.espp.video_stream_info_set = false; get_appdata()->conns[index].render.espp.audio_ready_to_prepare = false; get_appdata()->conns[index].render.espp.video_ready_to_prepare = false; } @@ -197,9 +197,9 @@ espp_info_s espp_infos[] = { bool _espp_activate_and_prepare_async(connection_s *conn, media_packet_h packet, webrtc_media_type_e type) { bool is_audio = (type == WEBRTC_MEDIA_TYPE_AUDIO) ? true : false; - bool *track_activated = is_audio ? &conn->render.espp.audio_track_activated : &conn->render.espp.video_track_activated; - bool *opposite_track_activated = is_audio ? &conn->render.espp.video_track_activated : &conn->render.espp.audio_track_activated; - bool *opposite_type_exist = is_audio ? &conn->encoded_video_frame_cb_is_set : &conn->encoded_audio_frame_cb_is_set; + bool *is_stream_info_set = is_audio ? &conn->render.espp.audio_stream_info_set : &conn->render.espp.video_stream_info_set; + bool opposite_type_stream_info_set = is_audio ? conn->render.espp.video_stream_info_set : conn->render.espp.audio_stream_info_set; + bool opposite_type_exist = is_audio ? conn->encoded_video_frame_cb_is_set : conn->encoded_audio_frame_cb_is_set; if (!conn) return false; @@ -209,7 +209,7 @@ bool _espp_activate_and_prepare_async(connection_s *conn, media_packet_h packet, g_printerr("render.espp.handle is NULL\n"); return false; } - if (*track_activated) + if (*is_stream_info_set) return false; /* Get format and set espp audiostream & prepare async */ @@ -218,11 +218,9 @@ bool _espp_activate_and_prepare_async(connection_s *conn, media_packet_h packet, (void *)&conn->render.espp.audio_info : (void *)&conn->render.espp.video_info); - g_print("espp activate stream_type[%u]\n", espp_infos[type].stream_type); - esplusplayer_activate(conn->render.espp.handle, espp_infos[type].stream_type); - *track_activated = true; + *is_stream_info_set = true; - if (!*opposite_type_exist || *opposite_track_activated) { + if (!opposite_type_exist || opposite_type_stream_info_set) { g_print("espp prepare async\n"); esplusplayer_prepare_async(conn->render.espp.handle); } diff --git a/test/webrtc_test_priv.h b/test/webrtc_test_priv.h index b608d4b5..163544f8 100644 --- a/test/webrtc_test_priv.h +++ b/test/webrtc_test_priv.h @@ -238,8 +238,8 @@ typedef struct _connection_s { esplusplayer_handle handle; esplusplayer_audio_stream_info audio_info; esplusplayer_video_stream_info video_info; - bool audio_track_activated; - bool video_track_activated; + bool audio_stream_info_set; + bool video_stream_info_set; bool audio_ready_to_prepare; bool video_ready_to_prepare; } espp;