Merge branch 'tizen' into tizen_3.0

[platform/core/api/player.git] / test / player_es_push_test.c

diff --git a/test/player_es_push_test.c b/test/player_es_push_test.c
index 9185d85..1f02f86 100644 (file)
--- a/test/player_es_push_test.c
+++ b/test/player_es_push_test.c
@@ -21,15 +21,13 @@
 #include <player_internal.h>
 #include <glib.h>
 #include <appcore-efl.h>
-#ifdef HAVE_WAYLAND
 #include <Ecore.h>
 #include <Ecore_Wayland.h>
-#endif
 
 #define KEY_END "XF86Stop"
 
-#define ES_DEFAULT_DIR_PATH                    "/home/owner/content/"
-#define ES_DEFAULT_H264_VIDEO_PATH             ES_DEFAULT_DIR_PATH"Simpsons.h264"
+#define ES_DEFAULT_DIR_PATH                    "/home/owner/"
+#define ES_DEFAULT_H264_VIDEO_PATH             ES_DEFAULT_DIR_PATH"test.h264"
 #define ES_DEFAULT_VIDEO_FORMAT_TYPE   MEDIA_FORMAT_H264_SP
 #define ES_DEFAULT_VIDEO_FORMAT_WIDTH  1280
 #define ES_DEFAULT_VIDEO_FORMAT_HEIGHT 544
@@ -121,9 +119,7 @@ static Evas_Object *create_win(const char *name)
                g_print("window size :%d,%d", w, h);
                evas_object_resize(eo, w, h);
                elm_win_autodel_set(eo, EINA_TRUE);
-#ifdef HAVE_WAYLAND
                elm_win_alpha_set(eo, EINA_TRUE);
-#endif
        }
        return eo;
 }
@@ -455,20 +451,18 @@ static void feed_video_data_thread_func(void *data)
 
 void _video_buffer_status_cb_ex(player_media_stream_buffer_status_e status, unsigned long long bytes, void *user_data)
 {
-       if (status == PLAYER_MEDIA_STREAM_BUFFER_UNDERRUN) {
+       if (status == PLAYER_MEDIA_STREAM_BUFFER_UNDERRUN)
                LOGE("video buffer is underrun state, current level byte = %llu", bytes);
-       } else if (status == PLAYER_MEDIA_STREAM_BUFFER_OVERFLOW) {
+       else if (status == PLAYER_MEDIA_STREAM_BUFFER_OVERFLOW)
                LOGE("video buffer is overrun state, current level byte = %llu", bytes);
-       }
 }
 
 void _audio_buffer_status_cb_ex(player_media_stream_buffer_status_e status, unsigned long long bytes, void *user_data)
 {
-       if (status == PLAYER_MEDIA_STREAM_BUFFER_UNDERRUN) {
+       if (status == PLAYER_MEDIA_STREAM_BUFFER_UNDERRUN)
                LOGE("audio buffer is underrun state, current level byte = %llu", bytes);
-       } else if (status == PLAYER_MEDIA_STREAM_BUFFER_OVERFLOW) {
+       else if (status == PLAYER_MEDIA_STREAM_BUFFER_OVERFLOW)
                LOGE("audio buffer is overrun state, current level byte = %llu", bytes);
-       }
 }
 
 void _video_seek_data_cb(unsigned long long offset, void *user_data)