* modules/demux/mkv.cpp, modules/mux/avi.c, modules/mux/mpeg/ts.c, modules/packetizer...

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 8d79b005601f1b7a251fd0260828c67572f3aef0..09af1053890475579a80fff6e6015e9fd7256dee 100644 (file)
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -2,7 +2,7 @@
  * mkv.cpp : matroska demuxer
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: mkv.cpp,v 1.18 2003/08/01 00:05:07 gbazin Exp $
+ * $Id: mkv.cpp,v 1.19 2003/08/10 14:21:15 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -398,7 +398,8 @@ static int Activate( vlc_object_t * p_this )
                     tcs.ReadData( p_sys->es->I_O() );
                     p_sys->i_timescale = uint64(tcs);
 
-                    msg_Dbg( p_input, "|   |   + TimecodeScale=%lld", p_sys->i_timescale );
+                    msg_Dbg( p_input, "|   |   + TimecodeScale="I64Fd,
+                             p_sys->i_timescale );
                 }
                 else if( EbmlId( *el2 ) == KaxDuration::ClassInfos.GlobalId )
                 {
@@ -603,7 +604,7 @@ static int Activate( vlc_object_t * p_this )
                             defd.ReadData( p_sys->es->I_O() );
 
                             tk.i_default_duration = uint64(defd);
-                            msg_Dbg( p_input, "|   |   |   + Track Default Duration=%lld", uint64(defd) );
+                            msg_Dbg( p_input, "|   |   |   + Track Default Duration="I64Fd, uint64(defd) );
                         }
                         else  if( EbmlId( *el3 ) == KaxTrackTimecodeScale::ClassInfos.GlobalId )
                         {
@@ -649,7 +650,7 @@ static int Activate( vlc_object_t * p_this )
                                 tk.p_extra_data = (uint8_t*)malloc( tk.i_extra_data );
                                 memcpy( tk.p_extra_data, cpriv.GetBuffer(), tk.i_extra_data );
                             }
-                            msg_Dbg( p_input, "|   |   |   + Track CodecPrivate size=%lld", cpriv.GetSize() );
+                            msg_Dbg( p_input, "|   |   |   + Track CodecPrivate size="I64Fd, cpriv.GetSize() );
                         }
                         else if( EbmlId( *el3 ) == KaxCodecName::ClassInfos.GlobalId )
                         {
@@ -892,17 +893,17 @@ static int Activate( vlc_object_t * p_this )
                     {
                         if( id == KaxCues::ClassInfos.GlobalId )
                         {
-                            msg_Dbg( p_input, "|   |   |   = cues at %lld", i_pos );
+                            msg_Dbg( p_input, "|   |   |   = cues at "I64Fd, i_pos );
                             p_sys->i_cues_position = p_sys->segment->GetGlobalPosition( i_pos );
                         }
                         else if( id == KaxChapters::ClassInfos.GlobalId )
                         {
-                            msg_Dbg( p_input, "|   |   |   = chapters at %lld", i_pos );
+                            msg_Dbg( p_input, "|   |   |   = chapters at "I64Fd, i_pos );
                             p_sys->i_chapters_position = p_sys->segment->GetGlobalPosition( i_pos );
                         }
                         else if( id == KaxTags::ClassInfos.GlobalId )
                         {
-                            msg_Dbg( p_input, "|   |   |   = tags at %lld", i_pos );
+                            msg_Dbg( p_input, "|   |   |   = tags at "I64Fd, i_pos );
                             p_sys->i_tags_position = p_sys->segment->GetGlobalPosition( i_pos );
                         }
 
@@ -1661,7 +1662,7 @@ static void Seek( input_thread_t *p_input, mtime_t i_date, int i_percent)
     int         i_track_skipping;
     int         i_track;
 
-    msg_Dbg( p_input, "seek request to %lld (%d%%)", i_date, i_percent );
+    msg_Dbg( p_input, "seek request to "I64Fd" (%d%%)", i_date, i_percent );
     if( i_date < 0 && i_percent < 0 )
     {
         return;
@@ -1732,7 +1733,7 @@ static void Seek( input_thread_t *p_input, mtime_t i_date, int i_percent)
             i_index--;
         }
 
-        msg_Dbg( p_input, "seek got %lld (%d%%)",
+        msg_Dbg( p_input, "seek got "I64Fd" (%d%%)",
                  p_sys->index[i_index].i_time, (int)(100 * p_sys->index[i_index].i_position /p_input->stream.p_selected_area->i_size ) );
 
         p_sys->in->setFilePointer( p_sys->index[i_index].i_position, seek_beginning );
@@ -1934,7 +1935,7 @@ void vlc_stream_io_callback::setFilePointer(int64_t i_offset, seek_mode mode )
     if( i_pos < 0 ||
         ( i_pos > p_input->stream.p_selected_area->i_size && p_input->stream.p_selected_area->i_size != 0 ) )
     {
-        msg_Err( p_input, "seeking to wrong place (i_pos=%lld)", i_pos );
+        msg_Err( p_input, "seeking to wrong place (i_pos="I64Fd")", i_pos );
         vlc_mutex_unlock( &p_input->stream.stream_lock );
 
         mb_eof = VLC_TRUE;
@@ -1949,7 +1950,8 @@ void vlc_stream_io_callback::setFilePointer(int64_t i_offset, seek_mode mode )
         return;
     }
 
-    msg_Dbg( p_input, "####################seek new=%lld old=%lld", i_pos, getFilePointer() );
+    msg_Dbg( p_input, "####################seek new="I64Fd" old="I64Fd,
+             i_pos, getFilePointer() );
 
     if( p_input->stream.b_seekable &&
         ( /*p_input->stream.i_method == INPUT_METHOD_FILE ||*/ i_pos < i_last || i_pos - i_last > p_input->i_bufsize / 4 ) )
@@ -1992,7 +1994,8 @@ void vlc_stream_io_callback::setFilePointer(int64_t i_offset, seek_mode mode )
     }
     else
     {
-        msg_Err( p_input, "cannot seek or emulate seek to %lld from %lld", i_pos, i_last );
+        msg_Err( p_input, "cannot seek or emulate seek to "I64Fd" from "I64Fd,
+                 i_pos, i_last );
         mb_eof = VLC_TRUE;
     }
 }
@@ -2221,8 +2224,9 @@ static void LoadCues( input_thread_t *p_input )
             }
             ep->Up();
 
-            msg_Dbg( p_input, " * added time=%lld pos=%lld track=%d bnum=%d",
-                     idx.i_time, idx.i_position, idx.i_track, idx.i_block_number );
+            msg_Dbg( p_input, " * added time="I64Fd" pos="I64Fd
+                     " track=%d bnum=%d", idx.i_time, idx.i_position,
+                     idx.i_track, idx.i_block_number );
 
             p_sys->i_index++;
             if( p_sys->i_index >= p_sys->i_index_max )

diff --git a/modules/mux/avi.c b/modules/mux/avi.c
index 60a7ea22ec32cce0b5a21b7238520e7e89e09b9e..a28a3b38b942c7cfab4c49f3c73260a8abfa3b86 100644 (file)
--- a/modules/mux/avi.c
+++ b/modules/mux/avi.c
@@ -2,7 +2,7 @@
  * avi.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: avi.c,v 1.13 2003/05/02 00:33:42 fenrir Exp $
+ * $Id: avi.c,v 1.14 2003/08/10 14:21:16 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -231,7 +231,8 @@ static void Close( vlc_object_t * p_this )
                     (uint64_t)p_stream->i_totalsize /
                     (uint64_t)p_stream->i_duration;
         }
-        msg_Info( p_mux, "stream[%d] duration:%lld totalsize:%lld frames:%d fps:%f kb/s:%d",
+        msg_Info( p_mux, "stream[%d] duration:"I64Fd" totalsize:"I64Fd
+                  " frames:%d fps:%f kb/s:%d",
                   i_stream,
                   (int64_t)p_stream->i_duration / (int64_t)1000000,
                   p_stream->i_totalsize,

diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index 8ec5cb0ff2c0c1113cec951c06ee912f9a0b3945..247f14c7d5542b43b87208a97b14b7116b3b0a8c 100644 (file)
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -2,7 +2,7 @@
  * ts.c: MPEG-II TS Muxer
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: ts.c,v 1.24 2003/08/04 22:49:02 fenrir Exp $
+ * $Id: ts.c,v 1.25 2003/08/10 14:21:16 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
@@ -300,7 +300,8 @@ static int Open( vlc_object_t *p_this )
     if( p_sys->i_bitrate_min > 0 && p_sys->i_bitrate_max > 0 &&
         p_sys->i_bitrate_min > p_sys->i_bitrate_max )
     {
-        msg_Err( p_mux, "incompatible minimum and maximum bitrate, disabling bitrate control" );
+        msg_Err( p_mux, "incompatible minimum and maximum bitrate, "
+                 "disabling bitrate control" );
         p_sys->i_bitrate_min = 0;
         p_sys->i_bitrate_max = 0;
     }
@@ -311,7 +312,7 @@ static int Open( vlc_object_t *p_this )
         if( p_sys->i_pcr_delay <= 0 )
         {
             msg_Err( p_mux,
-                     "invalid pcr delay (%lldms) reseting to 100ms",
+                     "invalid pcr delay ("I64Fd"ms) reseting to 100ms",
                      p_sys->i_pcr_delay / 1000 );
             p_sys->i_pcr_delay = 100000;
         }
@@ -324,14 +325,15 @@ static int Open( vlc_object_t *p_this )
             p_sys->i_pcr_soft_delay >= p_sys->i_pcr_delay )
         {
             msg_Err( p_mux,
-                     "invalid pcr-soft delay (%lldms) disabled",
+                     "invalid pcr-soft delay ("I64Fd"ms) disabled",
                      p_sys->i_pcr_soft_delay / 1000 );
             p_sys->i_pcr_soft_delay = 0;
         }
     }
 
-    msg_Dbg( p_mux, "pcr_delay=%lld pcr_soft_delay=%lld",
+    msg_Dbg( p_mux, "pcr_delay="I64d" pcr_soft_delay="I64Fd,
              p_sys->i_pcr_delay, p_sys->i_pcr_soft_delay );
+
     /* for TS génération */
     p_sys->i_pcr    = 0;
     p_sys->i_dts    = 0;
@@ -764,10 +766,11 @@ static int TSFill( sout_mux_t *p_mux, sout_input_t *p_input )
             break;
         }
 
-        if( ( p_sys->i_dts +p_sys->i_length ) - i_dts > 2000000 ||
+        if( ( p_sys->i_dts + p_sys->i_length ) - i_dts > 2000000 ||
             ( p_sys->i_dts + p_sys->i_length ) - i_dts < -2000000 )
         {
-            msg_Err( p_mux, "| buffer_dts - pcr_pts | > 2s empting pcr TS buffers" );
+            msg_Err( p_mux, "| buffer_dts - pcr_pts | > 2s ("I64Fd") empting "
+                     "pcr TS buffers", p_sys->i_dts + p_sys->i_length - i_dts);
 
             sout_BufferDelete( p_mux->p_sout, p_data );
 
@@ -787,9 +790,8 @@ static int TSFill( sout_mux_t *p_mux, sout_input_t *p_input )
             break;
         }
 
-        msg_Dbg( p_mux,
-                 "dropping buffer size=%d dts=%lld pcr_dts=%lld",
-                 p_data->i_size, i_dts, p_sys->i_dts );
+        msg_Dbg( p_mux, "dropping buffer size=%d dts="I64Fd" pcr_dts="I64Fd
+                 " diff="I64Fd, p_data->i_size, i_dts, p_sys->i_dts );
         sout_BufferDelete( p_mux->p_sout, p_data );
     }
 

diff --git a/modules/packetizer/copy.c b/modules/packetizer/copy.c
index 8ca80568cc91877886454532fcfcd5b8febaaa51..815f84b57ed0bae9f73ba51b744cc6d31f7eeaed 100644 (file)
--- a/modules/packetizer/copy.c
+++ b/modules/packetizer/copy.c
@@ -2,7 +2,7 @@
  * copy.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: copy.c,v 1.13 2003/08/08 16:50:27 gbazin Exp $
+ * $Id: copy.c,v 1.14 2003/08/10 14:21:16 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
@@ -494,8 +494,7 @@ static void PacketizeStd( packetizer_thread_t *p_pack )
         return;
     }
 
-    msg_Dbg( p_pack->p_fifo,
-             "pes size:%d dts=%lld pts=%lld",
+    msg_Dbg( p_pack->p_fifo, "pes size:%d dts="I64Fd" pts="I64Fd,
              p_pes->i_pes_size, p_pes->i_dts, p_pes->i_pts );
 
 
@@ -544,8 +543,7 @@ static void PacketizeSPU( packetizer_thread_t *p_pack )
             return;
         }
 
-        msg_Dbg( p_pack->p_fifo,
-                 "pes size:%d dts=%lld pts=%lld",
+        msg_Dbg( p_pack->p_fifo, "pes size:%d dts="I64Fd" pts="I64Fd,
                  p_pes->i_pes_size, p_pes->i_dts, p_pes->i_pts );
 
         if( p_out == NULL &&