summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/metronom.c44
-rw-r--r--src/xine-engine/video_out.c23
2 files changed, 34 insertions, 33 deletions
diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c
index acf96cab7..708efc222 100644
--- a/src/xine-engine/metronom.c
+++ b/src/xine-engine/metronom.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: metronom.c,v 1.135 2004/02/16 20:19:09 uid86226 Exp $
+ * $Id: metronom.c,v 1.136 2004/02/19 02:50:26 rockyb Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -204,7 +204,7 @@ static scr_plugin_t* unixscr_init () {
static void metronom_start_clock (metronom_clock_t *this, int64_t pts) {
scr_plugin_t** scr;
- lprintf("start_clock (at %lld)\n", pts);
+ lprintf("start_clock (at %" PRId64 ")\n", pts);
for (scr = this->scr_list; scr < this->scr_list+MAX_SCR_PROVIDERS; scr++)
if (*scr) (*scr)->start(*scr, pts);
@@ -260,7 +260,7 @@ static void metronom_set_audio_rate (metronom_t *this, int64_t pts_per_smpls) {
pthread_mutex_unlock (&this->lock);
- lprintf("%lld pts per %d samples\n", pts_per_smpls, AUDIO_SAMPLE_NUM);
+ lprintf("%" PRId64 " pts per %d samples\n", pts_per_smpls, AUDIO_SAMPLE_NUM);
}
static int64_t metronom_got_spu_packet (metronom_t *this, int64_t pts) {
@@ -314,7 +314,7 @@ static void metronom_handle_discontinuity (metronom_t *this, int type,
this->force_video_jump = 1;
this->video_drift = 0;
xprintf(this->xine, XINE_VERBOSITY_DEBUG,
- "vpts adjusted with prebuffer to %lld\n", this->video_vpts);
+ "vpts adjusted with prebuffer to %" PRId64 "\n", this->video_vpts);
break;
case DISC_ABSOLUTE:
@@ -332,7 +332,7 @@ static void metronom_handle_discontinuity (metronom_t *this, int type,
this->force_video_jump = 1;
this->force_audio_jump = 1;
this->video_drift = 0;
- xprintf(this->xine, XINE_VERBOSITY_DEBUG, "vpts adjusted with prebuffer to %lld\n",
+ xprintf(this->xine, XINE_VERBOSITY_DEBUG, "vpts adjusted with prebuffer to %" PRId64 "\n",
this->video_vpts);
}
} else {
@@ -348,7 +348,7 @@ static void metronom_handle_discontinuity (metronom_t *this, int type,
break;
}
- lprintf("video_vpts: %lld, audio_vpts: %lld\n", this->video_vpts, this->audio_vpts);
+ lprintf("video_vpts: %" PRId64 ", audio_vpts: %" PRId64 "\n", this->video_vpts, this->audio_vpts);
/* vpts_offset adjustements */
switch (type) {
@@ -388,7 +388,7 @@ static void metronom_handle_video_discontinuity (metronom_t *this, int type,
this->video_discontinuity_count++;
pthread_cond_signal (&this->video_discontinuity_reached);
- xprintf(this->xine, XINE_VERBOSITY_DEBUG, "video discontinuity #%d, type is %d, disc_off %lld\n",
+ xprintf(this->xine, XINE_VERBOSITY_DEBUG, "video discontinuity #%d, type is %d, disc_off %" PRId64 "\n",
this->video_discontinuity_count, type, disc_off);
if (this->have_audio) {
@@ -449,7 +449,7 @@ static void metronom_got_video_frame (metronom_t *this, vo_frame_t *img) {
return;
}
- lprintf("got_video_frame pts = %lld, duration = %d\n", pts, img->duration);
+ lprintf("got_video_frame pts = %" PRId64 ", duration = %d\n", pts, img->duration);
this->img_cpt++;
@@ -462,7 +462,7 @@ static void metronom_got_video_frame (metronom_t *this, vo_frame_t *img) {
if (!img->duration) {
if (this->last_video_pts && this->img_cpt) {
this->img_duration = (pts - this->last_video_pts) / this->img_cpt;
- lprintf("computed frame_duration = %lld\n", this->img_duration );
+ lprintf("computed frame_duration = %" PRId64 "\n", this->img_duration );
}
img->duration = this->img_duration;
} else {
@@ -483,7 +483,7 @@ static void metronom_got_video_frame (metronom_t *this, vo_frame_t *img) {
diff = this->video_vpts - vpts;
- lprintf("video diff is %lld (predicted %lld, given %lld)\n", diff, this->video_vpts, vpts);
+ lprintf("video diff is %" PRId64 " (predicted %" PRId64 ", given %" PRId64 ")\n", diff, this->video_vpts, vpts);
if ((abs (diff) > VIDEO_DRIFT_TOLERANCE) || (this->force_video_jump)) {
this->force_video_jump = 0;
@@ -499,7 +499,7 @@ static void metronom_got_video_frame (metronom_t *this, vo_frame_t *img) {
/* this will fix video drift with a constant compensation each
frame for about 1 second of video. */
- if (diff) lprintf("video drift, drift is %lld\n", this->video_drift);
+ if (diff) lprintf("video drift, drift is %" PRId64 "\n", this->video_drift);
}
} else {
if (!img->duration) {
@@ -512,7 +512,7 @@ static void metronom_got_video_frame (metronom_t *this, vo_frame_t *img) {
img->vpts = this->video_vpts + this->av_offset;
- lprintf("video vpts for %10lld : %10lld (duration:%d drift:%lld step:%lld)\n",
+ lprintf("video vpts for %10lld : %10lld (duration:%d drift:%" PRId64 " step:%" PRId64 ")\n",
pts, this->video_vpts, img->duration, this->video_drift, this->video_drift_step );
if( this->video_drift * this->video_drift_step > 0 )
@@ -541,7 +541,7 @@ static void metronom_handle_audio_discontinuity (metronom_t *this, int type,
this->audio_discontinuity_count++;
pthread_cond_signal (&this->audio_discontinuity_reached);
- xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio discontinuity #%d, type is %d, disc_off %lld\n",
+ xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio discontinuity #%d, type is %d, disc_off %" PRId64 "\n",
this->audio_discontinuity_count, type, disc_off);
if (this->have_video) {
@@ -571,8 +571,8 @@ static int64_t metronom_got_audio_samples (metronom_t *this, int64_t pts,
int64_t vpts;
int64_t diff;
- lprintf("got %d audio samples, pts is %lld, last pts = %lld\n", nsamples, pts, this->last_audio_pts);
- lprintf("AUDIO pts from last= %lld\n", pts-this->last_audio_pts);
+ lprintf("got %d audio samples, pts is %" PRId64 ", last pts = %" PRId64 "\n", nsamples, pts, this->last_audio_pts);
+ lprintf("AUDIO pts from last= %" PRId64 "\n", pts-this->last_audio_pts);
pthread_mutex_lock (&this->lock);
@@ -616,11 +616,11 @@ static int64_t metronom_got_audio_samples (metronom_t *this, int64_t pts,
this->force_audio_jump = 0;
this->audio_vpts = vpts;
this->audio_drift_step = 0;
- xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio jump, diff=%lld\n", diff);
+ xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio jump, diff=%" PRId64 "\n", diff);
} else {
if( this->audio_samples ) {
/* calculate drift_step to recover vpts errors */
- lprintf("audio diff = %lld \n", diff );
+ lprintf("audio diff = %" PRId64 " \n", diff );
diff *= AUDIO_SAMPLE_NUM;
diff /= this->audio_samples * 4;
@@ -633,7 +633,7 @@ static int64_t metronom_got_audio_samples (metronom_t *this, int64_t pts,
this->audio_drift_step = diff;
- lprintf("audio_drift = %lld, pts_per_smpls = %lld\n", diff, this->pts_per_smpls);
+ lprintf("audio_drift = %" PRId64 ", pts_per_smpls = %" PRId64 "\n", diff, this->pts_per_smpls);
}
}
this->audio_samples = 0;
@@ -671,11 +671,11 @@ static void metronom_set_option (metronom_t *this, int option, int64_t value) {
switch (option) {
case METRONOM_AV_OFFSET:
this->av_offset = value;
- xprintf(this->xine, XINE_VERBOSITY_LOG, "av_offset=%lld pts\n", this->av_offset);
+ xprintf(this->xine, XINE_VERBOSITY_LOG, "av_offset=%" PRId64 " pts\n", this->av_offset);
break;
case METRONOM_SPU_OFFSET:
this->spu_offset = value;
- xprintf(this->xine, XINE_VERBOSITY_LOG, "spu_offset=%lld pts\n", this->spu_offset);
+ xprintf(this->xine, XINE_VERBOSITY_LOG, "spu_offset=%" PRId64 " pts\n", this->spu_offset);
break;
case METRONOM_ADJ_VPTS_OFFSET:
this->audio_vpts += value;
@@ -685,11 +685,11 @@ static void metronom_set_option (metronom_t *this, int option, int64_t value) {
* once in a while means a small sound card drift (or system
* clock drift -- who knows?). nothing to worry about.
*/
- xprintf(this->xine, XINE_VERBOSITY_LOG, "fixing sound card drift by %lld pts\n", value);
+ xprintf(this->xine, XINE_VERBOSITY_LOG, "fixing sound card drift by %" PRId64 " pts\n", value);
break;
case METRONOM_PREBUFFER:
this->prebuffer = value;
- xprintf(this->xine, XINE_VERBOSITY_LOG, "prebuffer=%lld pts\n", this->prebuffer);
+ xprintf(this->xine, XINE_VERBOSITY_LOG, "prebuffer=%" PRId64 " pts\n", this->prebuffer);
break;
default:
xprintf(this->xine, XINE_VERBOSITY_NONE, "unknown option in set_option: %d\n", option);
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index c23ceb651..706dfeb80 100644
--- a/src/xine-engine/video_out.c
+++ b/src/xine-engine/video_out.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out.c,v 1.185 2004/01/07 22:22:54 jstembridge Exp $
+ * $Id: video_out.c,v 1.186 2004/02/19 02:50:26 rockyb Exp $
*
* frame allocation / queuing / scheduling / output functions
*/
@@ -34,6 +34,7 @@
#include <string.h>
#include <zlib.h>
#include <pthread.h>
+#include <inttypes.h>
#include <assert.h>
#define XINE_ENABLE_EXPERIMENTAL_FEATURES
@@ -344,7 +345,7 @@ static int vo_frame_draw (vo_frame_t *img, xine_stream_t *stream) {
cur_vpts = this->clock->get_current_time(this->clock);
this->last_delivery_pts = cur_vpts;
- lprintf ("got image at master vpts %lld. vpts for picture is %lld (pts was %lld)\n",
+ lprintf ("got image oat master vpts %" PRId64 ". vpts for picture is %" PRId64 " (pts was %" PRId64 ")\n",
cur_vpts, pic_vpts, img->pts);
this->num_frames_delivered++;
@@ -385,7 +386,7 @@ static int vo_frame_draw (vo_frame_t *img, xine_stream_t *stream) {
}
- lprintf ("delivery diff : %lld, current vpts is %lld, %d frames to skip\n",
+ lprintf ("delivery diff : %" PRId64 ", current vpts is %" PRId64 ", %d frames to skip\n",
diff, cur_vpts, frames_to_skip);
if (!img->bad_frame) {
@@ -629,7 +630,7 @@ static void expire_frames (vos_t *this, int64_t cur_vpts) {
if( !this->discard_frames ) {
xine_log(this->xine, XINE_LOG_MSG,
- _("video_out: throwing away image with pts %lld because it's too old (diff : %lld).\n"), pts, diff);
+ _("video_out: throwing away image with pts %" PRId64 " because it's too old (diff : %" PRId64 ").\n"), pts, diff);
this->num_frames_discarded++;
}
@@ -705,7 +706,7 @@ static vo_frame_t *get_next_frame (vos_t *this, int64_t cur_vpts) {
if (this->img_backup && (this->redraw_needed==1)) {
- lprintf("generating still frame (cur_vpts = %lld) \n", cur_vpts);
+ lprintf("generating still frame (cur_vpts = %" PRId64 ") \n", cur_vpts);
/* keep playing still frames */
pthread_mutex_lock( &this->free_img_buf_queue->mutex );
@@ -738,7 +739,7 @@ static vo_frame_t *get_next_frame (vos_t *this, int64_t cur_vpts) {
* time to display frame "img" ?
*/
- lprintf ("diff %lld\n", diff);
+ lprintf ("diff %" PRId64 "\n", diff);
if (diff < 0) {
pthread_mutex_unlock(&this->display_img_buf_queue->mutex);
@@ -784,7 +785,7 @@ static void overlay_and_display_frame (vos_t *this,
vo_frame_t *img, int64_t vpts) {
xine_stream_t *stream;
- lprintf ("displaying image with vpts = %lld\n", img->vpts);
+ lprintf ("displaying image with vpts = %" PRId64 "\n", img->vpts);
/* no, this is not were proc_*() is usually called.
* it's just to catch special cases like late or duplicated frames.
@@ -939,7 +940,7 @@ static void *video_out_loop (void *this_gen) {
vpts = this->clock->get_current_time (this->clock);
- lprintf ("loop iteration at %lld\n", vpts);
+ lprintf ("loop iteration at %" PRId64 "\n", vpts);
expire_frames (this, vpts);
img = get_next_frame (this, vpts);
@@ -1000,7 +1001,7 @@ static void *video_out_loop (void *this_gen) {
next_frame_vpts += 1000;
}
- lprintf ("next_frame_vpts is %lld\n", next_frame_vpts);
+ lprintf ("next_frame_vpts is %" PRId64 "\n", next_frame_vpts);
do {
vpts = this->clock->get_current_time (this->clock);
@@ -1010,11 +1011,11 @@ static void *video_out_loop (void *this_gen) {
usec_to_sleep = (next_frame_vpts - vpts) * 100 / 9;
- lprintf ("%lld usec to sleep at master vpts %lld\n", usec_to_sleep, vpts);
+ lprintf ("%" PRId64 " usec to sleep at master vpts %" PRId64 "\n", usec_to_sleep, vpts);
if ( (next_frame_vpts - vpts) > 2*90000 )
xprintf(this->xine, XINE_VERBOSITY_DEBUG,
- "video_out: vpts/clock error, next_vpts=%lld cur_vpts=%lld\n", next_frame_vpts,vpts);
+ "video_out: vpts/clock error, next_vpts=%" PRId64 " cur_vpts=%" PRId64 "\n", next_frame_vpts,vpts);
if (usec_to_sleep>0)
xine_usec_sleep (usec_to_sleep);
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-26 18:39:06 +0000