From fb7a2a3cc2dabbdb691cae20ebf6d605313d245a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Piku=C5=82a?= Date: Mon, 14 Nov 2022 20:26:29 +0100 Subject: [PATCH] Fix uint64_t print format MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I55cc049f009fa12c81358b1b28dc047a436eee3d Signed-off-by: Marek Pikuła --- src/plusplayer-core/src/subtitle_attr_parser.cpp | 2 +- test/esplusplayer_test.c | 18 +++++++++--------- ut/src/ut_esplayer2.cpp | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/plusplayer-core/src/subtitle_attr_parser.cpp b/src/plusplayer-core/src/subtitle_attr_parser.cpp index 8daa6f5..14f16c5 100644 --- a/src/plusplayer-core/src/subtitle_attr_parser.cpp +++ b/src/plusplayer-core/src/subtitle_attr_parser.cpp @@ -547,7 +547,7 @@ SubtitleAttrListPtr SubtitleAttrParser::Parse() { GstClockTime timestamp = GST_CLOCK_TIME_NONE, duration = GST_CLOCK_TIME_NONE; duration = GST_TIME_AS_MSECONDS(GST_BUFFER_DURATION(gstbuf_)); timestamp = GST_TIME_AS_MSECONDS(GST_BUFFER_TIMESTAMP(gstbuf_)); - LOG_DEBUG("pts[%llu] duration[%llu]", timestamp, duration); + LOG_DEBUG("pts[%" PRIu64 "] duration[%" PRIu64 "]", timestamp, duration); internal::AddSubtitleAttribute(attr_list.get(), kSubAttrTimestamp, value, timestamp, timestamp + duration); diff --git a/test/esplusplayer_test.c b/test/esplusplayer_test.c index 8a36c10..8fd1412 100644 --- a/test/esplusplayer_test.c +++ b/test/esplusplayer_test.c @@ -308,7 +308,7 @@ static void __espp_buffer_status_cb(esplusplayer_stream_type type, esplusplayer_ static void __espp_ready_to_seek_cb(esplusplayer_stream_type type, uint64_t time, void *user_data) { - g_print("__espp_ready_to_seek_cb(type:%s, time:%llu)\n", + g_print("__espp_ready_to_seek_cb(type:%s, time:%" PRIu64 ")\n", type == ESPLUSPLAYER_STREAM_TYPE_AUDIO ? "Audio" : "Video", time); STREAM_SIGNAL(type); } @@ -831,7 +831,7 @@ void *_fetch_audio_data(void *ptr) __convert_espp_packet(pending, &pending_espp_packet); submit_status = esplusplayer_submit_packet(test_t->espp_h, &pending_espp_packet); #ifdef DEBUG_LOG - g_print("Audio pending packet[media:%p, es:%p][%llu ms] espp submit packet status[%d]\n", + g_print("Audio pending packet[media:%p, es:%p][%" PRIu64 " ms] espp submit packet status[%d]\n", pending, &pending_espp_packet, pending_espp_packet.pts ,submit_status); #endif media_packet_destroy(pending); @@ -876,7 +876,7 @@ void *_fetch_audio_data(void *ptr) __convert_espp_packet(audbuf, &espp_packet); submit_status = esplusplayer_submit_packet(test_t->espp_h, &espp_packet); #ifdef DEBUG_LOG - g_print("Audio packet[media:%p, es:%p][%llu ms] espp submit packet status[%d]\n", + g_print("Audio packet[media:%p, es:%p][%" PRIu64 " ms] espp submit packet status[%d]\n", audbuf, &espp_packet, espp_packet.pts ,submit_status); #endif media_packet_destroy(audbuf); @@ -902,7 +902,7 @@ void *_fetch_video_data(void *ptr) esplusplayer_es_packet pending_espp_packet; __convert_espp_packet(pending, &pending_espp_packet); submit_status = esplusplayer_submit_packet(test_t->espp_h, &pending_espp_packet); - g_print("Video pending packet[media:%p, es:%p][%llu ms] espp submit packet status[%d]\n", + g_print("Video pending packet[media:%p, es:%p][%" PRIu64 " ms] espp submit packet status[%d]\n", pending, &pending_espp_packet, pending_espp_packet.pts ,submit_status); media_packet_destroy(pending); test_t->streams[VIDEO_STREAM].pending_packet = NULL; @@ -946,7 +946,7 @@ void *_fetch_video_data(void *ptr) __convert_espp_packet(vidbuf, &espp_packet); submit_status = esplusplayer_submit_packet(test_t->espp_h, &espp_packet); #ifdef DEBUG_LOG - g_print("Video packet[media:%p, es:%p][%llu ms] espp submit packet status[%d]\n", vidbuf, &espp_packet, espp_packet.pts ,submit_status); + g_print("Video packet[media:%p, es:%p][%" PRIu64 " ms] espp submit packet status[%d]\n", vidbuf, &espp_packet, espp_packet.pts ,submit_status); #endif media_packet_destroy(vidbuf); } @@ -1053,15 +1053,15 @@ static void __test_seek(uint64_t time_ms) ret = mediademuxer_seek(g_test_h->demux_h, time_ms); if (ret != MEDIADEMUXER_ERROR_NONE) - g_print(" => failed to mediademuxer_seek(%llu)\n", time_ms); + g_print(" => failed to mediademuxer_seek(%" PRIu64 ")\n", time_ms); else - g_print(" => mediademuxer_seek(%llu) success\n", time_ms); + g_print(" => mediademuxer_seek(%" PRIu64 ") success\n", time_ms); ret = esplusplayer_seek(g_test_h->espp_h, time_ms); if (ret != ESPLUSPLAYER_ERROR_TYPE_NONE) - g_print(" => failed to esplusplayer_seek(%llu)\n", time_ms); + g_print(" => failed to esplusplayer_seek(%" PRIu64 ")\n", time_ms); else - g_print(" => esplusplayer_seek(%llu) success\n", time_ms); + g_print(" => esplusplayer_seek(%" PRIu64 ") success\n", time_ms); } static void __test_set_playback_rate(double playback_rate, bool audio_mute) diff --git a/ut/src/ut_esplayer2.cpp b/ut/src/ut_esplayer2.cpp index b40e42e..b428b0e 100755 --- a/ut/src/ut_esplayer2.cpp +++ b/ut/src/ut_esplayer2.cpp @@ -678,7 +678,7 @@ TEST_F(EsPlayerTest2, A_DeactivateActivate) { tracksource->Pause(); tracksource->SelectTrack(kTrackTypeAudio, 1, cur_pos_msec); tracksource->Seek(cur_pos_msec); - printf("activate tracktype : %d index : %d playingtime : %llu ms ", + printf("activate tracktype : %d index : %d playingtime : %" PRIu64 " ms ", static_cast(kTrackTypeAudio), 0, cur_pos_msec); track_list = tracksource->GetTrackInfo(); if (!track_util::GetActiveTrack(track_list, kTrackTypeAudio, @@ -769,4 +769,4 @@ TEST_F(EsPlayerTest2, VideoSeek) { esplayer->Close(); feeder->Stop(); tracksource->Stop(); -} \ No newline at end of file +} -- 2.7.4