From e385f5255394a90c6910dce4088d7a9719b787a1 Mon Sep 17 00:00:00 2001 From: Eunhae Choi Date: Thu, 18 Feb 2016 18:20:26 +0900 Subject: [PATCH] fix 64bit build error Change-Id: Ie406d0858b1c6ce0eb58223bde628dcf23b3bcba --- CMakeLists.txt | 3 ++- packaging/capi-media-player.spec | 1 + test/player_es_push_test.c | 2 +- test/player_test.c | 12 ++++++------ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7e37d6..5dda046 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,8 @@ SET(INC_COM_DIR include) INCLUDE_DIRECTORIES(${INC_DIR}, ${INC_COM_DIR}) -SET(dependents "dlog libtbm capi-media-tool mused mmsvc-player mm-common tizen-extension-client evas elementary") +SET(dependents "dlog glib-2.0 libtbm capi-media-tool capi-media-sound-manager capi-base-common mused mmsvc-player mm-common tizen-extension-client evas ecore elementary") +SET(pc_dependents "libtbm capi-media-tool capi-base-common capi-media-sound-manager") INCLUDE(FindPkgConfig) pkg_check_modules(${fw_name} REQUIRED ${dependents}) diff --git a/packaging/capi-media-player.spec b/packaging/capi-media-player.spec index 92d99c1..f8c34d6 100644 --- a/packaging/capi-media-player.spec +++ b/packaging/capi-media-player.spec @@ -11,6 +11,7 @@ Source0: %{name}-%{version}.tar.gz Source1001: capi-media-player.manifest BuildRequires: cmake BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(mused) BuildRequires: pkgconfig(mm-common) BuildRequires: pkgconfig(capi-base-common) diff --git a/test/player_es_push_test.c b/test/player_es_push_test.c index 9159719..4407024 100644 --- a/test/player_es_push_test.c +++ b/test/player_es_push_test.c @@ -376,7 +376,7 @@ static bool feed_video_data(appdata_s *appdata) { bool ret = FALSE; int read = 0; - static unsigned long long pts = 0L; + static guint64 pts = 0L; void *buf_data_ptr = NULL; appdata_s *ad = appdata; diff --git a/test/player_test.c b/test/player_test.c index 63ccd53..2ce8c92 100644 --- a/test/player_test.c +++ b/test/player_test.c @@ -504,7 +504,7 @@ static void _audio_frame_decoded_cb_ex(player_audio_raw_data_s *audio_raw_frame, if (!audio_raw) return; - g_print("[Player_Test] decoded_cb_ex! channel: %d channel_mask: %" G_GUINT64_FORMAT "\n", audio_raw->channel, audio_raw->channel_mask); + g_print("[Player_Test] decoded_cb_ex! channel: %d channel_mask: %llu\n", audio_raw->channel, audio_raw->channel_mask); #ifdef DUMP_OUTBUF if (audio_raw->channel_mask == 1 && fp_out1) @@ -684,7 +684,7 @@ static void buffer_need_video_data_cb(unsigned int size, void *user_data) int real_read_len = 0; char fname[128]; char fptsname[128]; - static unsigned long long pts = 0L; + static guint64 pts = 0L; FILE *fp = NULL; guint8 *buff_ptr = NULL; @@ -711,8 +711,8 @@ static void buffer_need_video_data_cb(unsigned int size, void *user_data) fp = fopen(fptsname, "rb"); if (fp) { int pts_len = 0; - pts_len = fread(&pts, 1, sizeof(unsigned long long), fp); - if (pts_len != sizeof(unsigned long long)) + pts_len = fread(&pts, 1, sizeof(guint64), fp); + if (pts_len != sizeof(guint64)) g_print("Warning, pts value can be wrong.\n"); fclose(fp); fp = NULL; @@ -789,8 +789,8 @@ static void buffer_need_audio_data_cb(unsigned int size, void *user_data) /* snprintf(fname, 128, "/opt/storage/usb/test/audio_packet/packet_%d.dat", audio_packet_count); */ snprintf(fname, 128, "/home/developer/test/audio_packet/packet_%d.dat", audio_packet_count); - static unsigned long long audio_pts = 0; - unsigned long long audio_dur = 21333333; + static guint64 audio_pts = 0; + guint64 audio_dur = 21333333; fp = fopen(fname, "rb"); if (fp) { -- 2.7.4