From f0c83daa831d070058e04142791eb9d9d0423e0b Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 1 May 2008 21:50:55 +0300 Subject: [PATCH] NIH desyndromization --- src/audio_output/dec.c | 2 +- src/audio_output/input.c | 14 +++++++------- src/audio_output/mixer.c | 10 +++++----- src/audio_output/output.c | 8 ++++---- src/input/control.c | 4 ++-- src/input/decoder_synchro.c | 16 ++++++++-------- src/input/input.c | 4 ++-- src/input/stream.c | 26 +++++++++++++------------- src/misc/threads.c | 2 +- src/stream_output/sdp.c | 2 +- src/stream_output/stream_output.c | 2 +- src/video_output/video_output.c | 4 ++-- 12 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c index 694957e0b7..8a543fc5a8 100644 --- a/src/audio_output/dec.c +++ b/src/audio_output/dec.c @@ -333,7 +333,7 @@ int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input, if ( p_buffer->start_date > mdate() + p_input->i_pts_delay + AOUT_MAX_ADVANCE_TIME ) { - msg_Warn( p_aout, "received buffer in the future ("I64Fd")", + msg_Warn( p_aout, "received buffer in the future (%"PRId64")", p_buffer->start_date - mdate()); if( p_input->p_input_thread ) { diff --git a/src/audio_output/input.c b/src/audio_output/input.c index 6a93b9b584..c4fcb2eaf2 100644 --- a/src/audio_output/input.c +++ b/src/audio_output/input.c @@ -523,7 +523,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, /* The decoder is _very_ late. This can only happen if the user * pauses the stream (or if the decoder is buggy, which cannot * happen :). */ - msg_Warn( p_aout, "computed PTS is out of range ("I64Fd"), " + msg_Warn( p_aout, "computed PTS is out of range (%"PRId64"), " "clearing out", mdate() - start_date ); vlc_mutex_lock( &p_aout->input_fifos_lock ); aout_FifoSet( p_aout, &p_input->fifo, 0 ); @@ -539,7 +539,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, { /* The decoder gives us f*cked up PTS. It's its business, but we * can't present it anyway, so drop the buffer. */ - msg_Warn( p_aout, "PTS is out of range ("I64Fd"), dropping buffer", + msg_Warn( p_aout, "PTS is out of range (%"PRId64"), dropping buffer", mdate() - p_buffer->start_date ); inputDrop( p_aout, p_input, p_buffer ); @@ -552,7 +552,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, if ( start_date != 0 && ( start_date < p_buffer->start_date - 3 * AOUT_PTS_TOLERANCE ) ) { - msg_Warn( p_aout, "audio drift is too big ("I64Fd"), clearing out", + msg_Warn( p_aout, "audio drift is too big (%"PRId64"), clearing out", start_date - p_buffer->start_date ); vlc_mutex_lock( &p_aout->input_fifos_lock ); aout_FifoSet( p_aout, &p_input->fifo, 0 ); @@ -566,7 +566,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, else if ( start_date != 0 && ( start_date > p_buffer->start_date + 3 * AOUT_PTS_TOLERANCE ) ) { - msg_Warn( p_aout, "audio drift is too big ("I64Fd"), dropping buffer", + msg_Warn( p_aout, "audio drift is too big (%"PRId64"), dropping buffer", start_date - p_buffer->start_date ); inputDrop( p_aout, p_input, p_buffer ); return 0; @@ -604,7 +604,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, else p_input->i_resampling_type = AOUT_RESAMPLING_UP; - msg_Warn( p_aout, "buffer is "I64Fd" %s, triggering %ssampling", + msg_Warn( p_aout, "buffer is %"PRId64" %s, triggering %ssampling", drift > 0 ? drift : -drift, drift > 0 ? "in advance" : "late", drift > 0 ? "down" : "up"); @@ -630,8 +630,8 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, if( p_input->pp_resamplers[0]->input.i_rate == 1000 * p_input->input.i_rate / i_input_rate ) { p_input->i_resampling_type = AOUT_RESAMPLING_NONE; - msg_Warn( p_aout, "resampling stopped after "I64Fi" usec " - "(drift: "I64Fi")", + msg_Warn( p_aout, "resampling stopped after %"PRIi64" usec " + "(drift: %"PRIi64")", mdate() - p_input->i_resamp_start_date, p_buffer->start_date - start_date); } diff --git a/src/audio_output/mixer.c b/src/audio_output/mixer.c index 8952bc1259..7f1c2ad2eb 100644 --- a/src/audio_output/mixer.c +++ b/src/audio_output/mixer.c @@ -111,7 +111,7 @@ static int MixBuffer( aout_instance_t * p_aout ) /* The output is _very_ late. This can only happen if the user * pauses the stream (or if the decoder is buggy, which cannot * happen :). */ - msg_Warn( p_aout, "output PTS is out of range ("I64Fd"), clearing out", + msg_Warn( p_aout, "output PTS is out of range (%"PRId64"), clearing out", mdate() - start_date ); aout_FifoSet( p_aout, &p_aout->output.fifo, 0 ); aout_DateSet( &exact_start_date, 0 ); @@ -136,7 +136,7 @@ static int MixBuffer( aout_instance_t * p_aout ) p_buffer = p_fifo->p_first; while ( p_buffer != NULL && p_buffer->start_date < mdate() ) { - msg_Warn( p_aout, "input PTS is out of range ("I64Fd"), " + msg_Warn( p_aout, "input PTS is out of range (%"PRId64"), " "trashing", mdate() - p_buffer->start_date ); p_buffer = aout_FifoPop( p_aout, p_fifo ); aout_BufferFree( p_buffer ); @@ -199,7 +199,7 @@ static int MixBuffer( aout_instance_t * p_aout ) /* We authorize a +-1 because rounding errors get compensated * regularly. */ aout_buffer_t * p_next = p_buffer->p_next; - msg_Warn( p_aout, "the mixer got a packet in the past ("I64Fd")", + msg_Warn( p_aout, "the mixer got a packet in the past (%"PRId64")", start_date - p_buffer->end_date ); aout_BufferFree( p_buffer ); if( p_input->p_input_thread ) @@ -232,7 +232,7 @@ static int MixBuffer( aout_instance_t * p_aout ) if ( prev_date != p_buffer->start_date ) { msg_Warn( p_aout, - "buffer hole, dropping packets ("I64Fd")", + "buffer hole, dropping packets (%"PRId64")", p_buffer->start_date - prev_date ); b_drop_buffers = 1; break; @@ -278,7 +278,7 @@ static int MixBuffer( aout_instance_t * p_aout ) (i_nb_bytes < p_aout->mixer.mixer.i_bytes_per_frame + mixer_nb_bytes)) ) { - msg_Warn( p_aout, "mixer start isn't output start ("I64Fd")", + msg_Warn( p_aout, "mixer start isn't output start (%"PRId64")", i_nb_bytes - mixer_nb_bytes ); /* Round to the nearest multiple */ diff --git a/src/audio_output/output.c b/src/audio_output/output.c index e389824f77..dd9ff19bc6 100644 --- a/src/audio_output/output.c +++ b/src/audio_output/output.c @@ -286,8 +286,8 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout, while ( p_buffer && p_buffer->start_date < (b_can_sleek ? start_date : mdate()) - AOUT_PTS_TOLERANCE ) { - msg_Dbg( p_aout, "audio output is too slow ("I64Fd"), " - "trashing "I64Fd"us", mdate() - p_buffer->start_date, + msg_Dbg( p_aout, "audio output is too slow (%"PRId64"), " + "trashing %"PRId64"us", mdate() - p_buffer->start_date, p_buffer->end_date - p_buffer->start_date ); p_buffer = p_buffer->p_next; aout_BufferFree( p_aout->output.fifo.p_first ); @@ -330,7 +330,7 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout, vlc_mutex_unlock( &p_aout->output_fifo_lock ); if ( !p_aout->output.b_starving ) - msg_Dbg( p_aout, "audio output is starving ("I64Fd"), " + msg_Dbg( p_aout, "audio output is starving (%"PRId64"), " "playing silence", i_delta ); p_aout->output.b_starving = 1; return NULL; @@ -346,7 +346,7 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout, int i; mtime_t difference = start_date - p_buffer->start_date; msg_Warn( p_aout, "output date isn't PTS date, requesting " - "resampling ("I64Fd")", difference ); + "resampling (%"PRId64")", difference ); vlc_mutex_lock( &p_aout->input_fifos_lock ); for ( i = 0; i < p_aout->i_nb_inputs; i++ ) diff --git a/src/input/control.c b/src/input/control.c index 0609c60a5e..5d120fffb5 100644 --- a/src/input/control.c +++ b/src/input/control.c @@ -618,7 +618,7 @@ static void UpdateBookmarksOption( input_thread_t *p_input ) vlc_mutex_lock( &p_input->p->input.p_item->lock ); for( i = 0; i < p_input->p->i_bookmark; i++ ) { - i_len += snprintf( NULL, 0, "{name=%s,bytes="I64Fd",time="I64Fd"}", + i_len += snprintf( NULL, 0, "{name=%s,bytes=%"PRId64",time=%"PRId64"}", p_input->p->bookmark[i]->psz_name, p_input->p->bookmark[i]->i_byte_offset, p_input->p->bookmark[i]->i_time_offset/1000000 ); @@ -627,7 +627,7 @@ static void UpdateBookmarksOption( input_thread_t *p_input ) { if( !i ) psz_value = psz_next = malloc( i_len + p_input->p->i_bookmark ); - sprintf( psz_next, "{name=%s,bytes="I64Fd",time="I64Fd"}", + sprintf( psz_next, "{name=%s,bytes=%"PRId64",time=%"PRId64"}", p_input->p->bookmark[i]->psz_name, p_input->p->bookmark[i]->i_byte_offset, p_input->p->bookmark[i]->i_time_offset/1000000 ); diff --git a/src/input/decoder_synchro.c b/src/input/decoder_synchro.c index ba108d14c1..4b12a268a1 100644 --- a/src/input/decoder_synchro.c +++ b/src/input/decoder_synchro.c @@ -265,7 +265,7 @@ bool decoder_SynchroChoose( decoder_synchro_t * p_synchro, int i_coding_type, if( !b_decode && !p_synchro->b_quiet ) { msg_Warn( p_synchro->p_dec, - "synchro trashing I ("I64Fd")", pts - now ); + "synchro trashing I (%"PRId64")", pts - now ); } break; @@ -434,8 +434,8 @@ void decoder_SynchroNewPicture( decoder_synchro_t * p_synchro, int i_coding_type #if 0 if( !p_synchro->b_quiet ) - msg_Dbg( p_synchro->p_dec, "I("I64Fd") P("I64Fd")[%d] B("I64Fd")" - "[%d] YUV("I64Fd") : trashed %d:%d/%d", + msg_Dbg( p_synchro->p_dec, "I(%"PRId64") P(%"PRId64")[%d] B(%"PRId64")" + "[%d] YUV(%"PRId64") : trashed %d:%d/%d", p_synchro->p_tau[I_CODING_TYPE], p_synchro->p_tau[P_CODING_TYPE], p_synchro->i_n_p, @@ -506,7 +506,7 @@ void decoder_SynchroNewPicture( decoder_synchro_t * p_synchro, int i_coding_type > PTS_THRESHOLD) && !p_synchro->b_quiet ) { msg_Warn( p_synchro->p_dec, "decoder synchro warning: pts != " - "current_date ("I64Fd")", + "current_date (%"PRId64")", p_synchro->current_pts - next_pts ); } @@ -526,7 +526,7 @@ void decoder_SynchroNewPicture( decoder_synchro_t * p_synchro, int i_coding_type || p_synchro->backward_pts - next_dts > PTS_THRESHOLD) && !p_synchro->b_quiet ) { - msg_Warn( p_synchro->p_dec, "backward_pts != dts ("I64Fd")", + msg_Warn( p_synchro->p_dec, "backward_pts != dts (%"PRId64")", next_dts - p_synchro->backward_pts ); } @@ -536,7 +536,7 @@ void decoder_SynchroNewPicture( decoder_synchro_t * p_synchro, int i_coding_type > PTS_THRESHOLD) && !p_synchro->b_quiet ) { msg_Warn( p_synchro->p_dec, - "backward_pts != current_pts ("I64Fd")", + "backward_pts != current_pts (%"PRId64")", p_synchro->current_pts - p_synchro->backward_pts ); } @@ -550,7 +550,7 @@ void decoder_SynchroNewPicture( decoder_synchro_t * p_synchro, int i_coding_type || p_synchro->current_pts - next_dts > PTS_THRESHOLD) && !p_synchro->b_quiet ) { - msg_Warn( p_synchro->p_dec, "dts != current_pts ("I64Fd")", + msg_Warn( p_synchro->p_dec, "dts != current_pts (%"PRId64")", p_synchro->current_pts - next_dts ); } @@ -575,7 +575,7 @@ void decoder_SynchroNewPicture( decoder_synchro_t * p_synchro, int i_coding_type /* We cannot be _that_ late, something must have happened, reinit * the dates. */ if( !p_synchro->b_quiet ) - msg_Warn( p_synchro->p_dec, "PTS << now ("I64Fd"), resetting", + msg_Warn( p_synchro->p_dec, "PTS << now (%"PRId64"), resetting", now - p_synchro->current_pts - DEFAULT_PTS_DELAY ); p_synchro->current_pts = now + DEFAULT_PTS_DELAY; } diff --git a/src/input/input.c b/src/input/input.c index 6121f717d6..6433bd67d7 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -273,7 +273,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, } psz_start = psz_end + 1; } - msg_Dbg( p_input, "adding bookmark: %s, bytes="I64Fd", time="I64Fd, + msg_Dbg( p_input, "adding bookmark: %s, bytes=%"PRId64", time=%"PRId64, p_seekpoint->psz_name, p_seekpoint->i_byte_offset, p_seekpoint->i_time_offset ); input_Control( p_input, INPUT_ADD_BOOKMARK, p_seekpoint ); @@ -1617,7 +1617,7 @@ static bool Control( input_thread_t *p_input, int i_type, } if( i_ret ) { - msg_Warn( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) "I64Fd + msg_Warn( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) %"PRId64 " failed or not possible", i_time ); } else diff --git a/src/input/stream.c b/src/input/stream.c index f41d7413bf..63c810227f 100644 --- a/src/input/stream.c +++ b/src/input/stream.c @@ -293,7 +293,7 @@ stream_t *stream_AccessNew( access_t *p_access, bool b_quick ) goto error; } TAB_APPEND( p_sys->i_list, p_sys->list, p_entry ); - msg_Dbg( p_access, "adding file `%s', ("I64Fd" bytes)", + msg_Dbg( p_access, "adding file `%s', (%"PRId64" bytes)", p_entry->psz_path, p_access->info.i_size ); while( psz_name && *psz_name ) @@ -314,7 +314,7 @@ stream_t *stream_AccessNew( access_t *p_access, bool b_quick ) continue; } - msg_Dbg( p_access, "adding file `%s', ("I64Fd" bytes)", + msg_Dbg( p_access, "adding file `%s', (%"PRId64" bytes)", psz_name, p_tmp->info.i_size ); p_entry = malloc( sizeof(access_entry_t) ); @@ -634,7 +634,7 @@ static void AStreamPrebufferBlock( stream_t *s ) i_byterate = ( I64C(1000000) * p_sys->stat.i_bytes ) / (p_sys->stat.i_read_time + 1); - msg_Dbg( s, "prebuffering done "I64Fd" bytes in "I64Fd"s - " + msg_Dbg( s, "prebuffering done %"PRId64" bytes in %"PRId64"s - " I64Fd" kbytes/s", p_sys->stat.i_bytes, p_sys->stat.i_read_time / I64C(1000000), @@ -879,7 +879,7 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) else b_seek = true; - msg_Dbg( s, "b_seek=%d th*avg=%d skip="I64Fd, + msg_Dbg( s, "b_seek=%d th*avg=%d skip=%"PRId64, b_seek, i_th*i_avg, i_skip ); } } @@ -1032,8 +1032,8 @@ static int AStreamReadStream( stream_t *s, void *p_read, int i_read ) } #ifdef STREAM_DEBUG - msg_Dbg( s, "AStreamReadStream: %d pos="I64Fd" tk=%d start="I64Fd - " offset=%d end="I64Fd, + msg_Dbg( s, "AStreamReadStream: %d pos=%"PRId64" tk=%d start=%"PRId64 + " offset=%d end=%"PRId64, i_read, p_sys->i_pos, p_sys->stream.i_tk, tk->i_start, p_sys->stream.i_offset, tk->i_end ); #endif @@ -1087,8 +1087,8 @@ static int AStreamPeekStream( stream_t *s, const uint8_t **pp_peek, int i_read ) if( tk->i_start >= tk->i_end ) return 0; /* EOF */ #ifdef STREAM_DEBUG - msg_Dbg( s, "AStreamPeekStream: %d pos="I64Fd" tk=%d " - "start="I64Fd" offset=%d end="I64Fd, + msg_Dbg( s, "AStreamPeekStream: %d pos=%"PRId64" tk=%d " + "start=%"PRId64" offset=%d end=%"PRId64, i_read, p_sys->i_pos, p_sys->stream.i_tk, tk->i_start, p_sys->stream.i_offset, tk->i_end ); #endif @@ -1150,8 +1150,8 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) int i; #ifdef STREAM_DEBUG - msg_Dbg( s, "AStreamSeekStream: to "I64Fd" pos="I64Fd - " tk=%d start="I64Fd" offset=%d end="I64Fd, + msg_Dbg( s, "AStreamSeekStream: to %"PRId64" pos=%"PRId64 + " tk=%d start=%"PRId64" offset=%d end=%"PRId64, i_pos, p_sys->i_pos, p_sys->stream.i_tk, p_sys->stream.tk[p_sys->stream.i_tk].i_start, p_sys->stream.i_offset, @@ -1206,8 +1206,8 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) if( i_pos >= tk->i_start && i_pos <= tk->i_end ) { #ifdef STREAM_DEBUG - msg_Dbg( s, "AStreamSeekStream: reusing %d start="I64Fd - " end="I64Fd, i, tk->i_start, tk->i_end ); + msg_Dbg( s, "AStreamSeekStream: reusing %d start=%"PRId64 + " end=%"PRId64, i, tk->i_start, tk->i_end ); #endif /* Seek at the end of the buffer */ @@ -1379,7 +1379,7 @@ static void AStreamPrebufferStream( stream_t *s ) i_byterate = ( I64C(1000000) * p_sys->stat.i_bytes ) / (p_sys->stat.i_read_time+1); - msg_Dbg( s, "pre-buffering done "I64Fd" bytes in "I64Fd"s - " + msg_Dbg( s, "pre-buffering done %"PRId64" bytes in %"PRId64"s - " I64Fd" kbytes/s", p_sys->stat.i_bytes, p_sys->stat.i_read_time / I64C(1000000), diff --git a/src/misc/threads.c b/src/misc/threads.c index 31a22cb3e8..534c806ae7 100644 --- a/src/misc/threads.c +++ b/src/misc/threads.c @@ -692,7 +692,7 @@ void __vlc_thread_join( vlc_object_t *p_this, const char * psz_file, int i_line user_ft.dwLowDateTime) / 10; msg_Dbg( p_this, "thread times: " - "real "I64Fd"m%fs, kernel "I64Fd"m%fs, user "I64Fd"m%fs", + "real %"PRId64"m%fs, kernel %"PRId64"m%fs, user %"PRId64"m%fs", real_time/60/1000000, (double)((real_time%(60*1000000))/1000000.0), kernel_time/60/1000000, diff --git a/src/stream_output/sdp.c b/src/stream_output/sdp.c index ff33bbec51..826c259d9d 100644 --- a/src/stream_output/sdp.c +++ b/src/stream_output/sdp.c @@ -132,7 +132,7 @@ char *sdp_Start (const char *name, const char *description, const char *url, } if (asprintf (&sdp, "v=0" - "\r\no=- "I64Fu" "I64Fu" IN IP%c %s" + "\r\no=- %"PRIu64" %"PRIu64" IN IP%c %s" "\r\ns=%s" "\r\ni=%s" "%s%s" // optional URL diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c index 5077f06c06..4a49351845 100644 --- a/src/stream_output/stream_output.c +++ b/src/stream_output/stream_output.c @@ -595,7 +595,7 @@ void sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input, { mtime_t current_date = mdate(); if ( current_date > p_buffer->i_dts ) - msg_Warn( p_mux, "late buffer for mux input ("I64Fd")", + msg_Warn( p_mux, "late buffer for mux input (%"PRId64")", current_date - p_buffer->i_dts ); } diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 606a213ee6..67f16216e0 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -883,7 +883,7 @@ static void RunThread( vout_thread_t *p_vout) p_picture->i_status = DESTROYED_PICTURE; p_vout->i_heap_size--; } - msg_Warn( p_vout, "late picture skipped ("I64Fd")", + msg_Warn( p_vout, "late picture skipped (%"PRId64")", current_date - display_date ); i_lost++; vlc_mutex_unlock( &p_vout->picture_lock ); @@ -910,7 +910,7 @@ static void RunThread( vout_thread_t *p_vout) } i_lost++; msg_Warn( p_vout, "vout warning: early picture skipped " - "("I64Fd")", display_date - current_date + "(%"PRId64")", display_date - current_date - p_vout->i_pts_delay ); vlc_mutex_unlock( &p_vout->picture_lock ); -- 2.39.2