mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-21 07:46:38 +00:00
Compilation fixes on 64-bit architectures
Original commit message from CVS: Compilation fixes on 64-bit architectures
This commit is contained in:
parent
dd67a01ad2
commit
9f42b5fa14
5 changed files with 16 additions and 16 deletions
|
@ -250,7 +250,7 @@ AC3Stream::Close ()
|
|||
{
|
||||
stream_length = AU_start >> 3;
|
||||
mjpeg_info ("AUDIO_STATISTICS: %02x", stream_id);
|
||||
mjpeg_info ("Audio stream length %lld bytes.", stream_length);
|
||||
mjpeg_info ("Audio stream length %d bytes.", (int)stream_length);
|
||||
mjpeg_info ("Syncwords : %8u", num_syncword);
|
||||
mjpeg_info ("Frames : %8u padded", num_frames[0]);
|
||||
mjpeg_info ("Frames : %8u unpadded", num_frames[1]);
|
||||
|
|
|
@ -165,7 +165,7 @@ LPCMStream::Close ()
|
|||
{
|
||||
stream_length = AU_start / 8;
|
||||
mjpeg_info ("AUDIO_STATISTICS: %02x", stream_id);
|
||||
mjpeg_info ("Audio stream length %lld bytes.", stream_length);
|
||||
mjpeg_info ("Audio stream length %d bytes.", (int)stream_length);
|
||||
mjpeg_info ("Frames : %8u ", num_frames[0]);
|
||||
bs.close ();
|
||||
}
|
||||
|
|
|
@ -214,8 +214,8 @@ MPAStream::FillAUbuffer (unsigned int frames_to_buffer)
|
|||
AU_start = bs.bitcount () - 11;
|
||||
syncword = syncword | next;
|
||||
if (syncword != AUDIO_SYNCWORD) {
|
||||
mjpeg_warn ("Failed to find start of next stream at %lld prev %lld !", AU_start / 8,
|
||||
prev_offset / 8);
|
||||
mjpeg_warn ("Failed to find start of next stream at %d prev %d !", (int) AU_start / 8,
|
||||
(int)prev_offset / 8);
|
||||
break;
|
||||
}
|
||||
} else
|
||||
|
@ -267,7 +267,7 @@ MPAStream::Close ()
|
|||
{
|
||||
stream_length = AU_start >> 3;
|
||||
mjpeg_info ("AUDIO_STATISTICS: %02x", stream_id);
|
||||
mjpeg_info ("Audio stream length %lld bytes.", stream_length);
|
||||
mjpeg_info ("Audio stream length %d bytes.", (int)stream_length);
|
||||
mjpeg_info ("Syncwords : %8u", num_syncword);
|
||||
mjpeg_info ("Frames : %8u padded", num_frames[0]);
|
||||
mjpeg_info ("Frames : %8u unpadded", num_frames[1]);
|
||||
|
|
|
@ -445,8 +445,8 @@ OutputStream::Init (vector < ElementaryStream * >*strms, PS_Stream *strm)
|
|||
|
||||
video_delay = delay + static_cast < clockticks > (opt_video_offset * CLOCKS / 1000);
|
||||
audio_delay = delay + static_cast < clockticks > (opt_audio_offset * CLOCKS / 1000);
|
||||
mjpeg_info ("Sectors = %d Video delay = %lld Audio delay = %lld",
|
||||
sectors_delay, video_delay / 300, audio_delay / 300);
|
||||
mjpeg_info ("Sectors = %d Video delay = %d Audio delay = %d",
|
||||
sectors_delay, (int)video_delay / 300, (int)audio_delay / 300);
|
||||
|
||||
|
||||
//
|
||||
|
@ -804,8 +804,8 @@ OutputStream::OutputMultiplex ()
|
|||
if (master->NextAUType () == IFRAME) {
|
||||
seg_state = runout_segment;
|
||||
runout_PTS = master->NextRequiredPTS ();
|
||||
mjpeg_debug ("Running out to (raw) PTS %lld SCR=%lld",
|
||||
runout_PTS / 300, current_SCR / 300);
|
||||
mjpeg_debug ("Running out to (raw) PTS %d SCR=%d",
|
||||
(int)runout_PTS / 300, (int)current_SCR / 300);
|
||||
running_out = true;
|
||||
seg_state = runout_segment;
|
||||
}
|
||||
|
@ -818,7 +818,7 @@ OutputStream::OutputMultiplex ()
|
|||
}
|
||||
|
||||
runout_PTS = master->NextRequiredPTS ();
|
||||
mjpeg_debug ("Running out to %lld SCR=%lld", runout_PTS / 300, current_SCR / 300);
|
||||
mjpeg_debug ("Running out to %d SCR=%d", (int)runout_PTS / 300, (int)current_SCR / 300);
|
||||
MuxStatus (LOG_INFO);
|
||||
running_out = true;
|
||||
seg_state = runout_segment;
|
||||
|
@ -869,8 +869,8 @@ OutputStream::OutputMultiplex ()
|
|||
despatch->OutputSector ();
|
||||
video_first = false;
|
||||
if (current_SCR >= earliest && underrun_ignore == 0) {
|
||||
mjpeg_warn ("Stream %02x: data will arrive too late sent(SCR)=%lld required(DTS)=%d",
|
||||
despatch->stream_id, current_SCR / 300, (int) earliest / 300);
|
||||
mjpeg_warn ("Stream %02x: data will arrive too late sent(SCR)=%d required(DTS)=%d",
|
||||
despatch->stream_id, (int) current_SCR / 300, (int) earliest / 300);
|
||||
MuxStatus (LOG_WARN);
|
||||
// Give the stream a chance to recover
|
||||
underrun_ignore = 300;
|
||||
|
@ -955,7 +955,7 @@ OutputStream::Close ()
|
|||
// Tidy up
|
||||
OutputSuffix ();
|
||||
psstrm->Close ();
|
||||
mjpeg_info ("Multiplex completion at SCR=%lld.", current_SCR / 300);
|
||||
mjpeg_info ("Multiplex completion at SCR=%d.", (int) current_SCR / 300);
|
||||
MuxStatus (LOG_INFO);
|
||||
for (str = estreams->begin (); str < estreams->end (); ++str) {
|
||||
(*str)->Close ();
|
||||
|
|
|
@ -32,8 +32,8 @@ static void
|
|||
marker_bit (IBitStream & bs, unsigned int what)
|
||||
{
|
||||
if (what != bs.get1bit ()) {
|
||||
mjpeg_error ("Illegal MPEG stream at offset (bits) %lld: supposed marker bit not found.",
|
||||
bs.bitcount ());
|
||||
mjpeg_error ("Illegal MPEG stream at offset (bits) %d: supposed marker bit not found.",
|
||||
(int)bs.bitcount ());
|
||||
exit (1);
|
||||
}
|
||||
}
|
||||
|
@ -312,7 +312,7 @@ VideoStream::Close ()
|
|||
/* Peak bit rate in 50B/sec units... */
|
||||
peak_bit_rate = ((max_bits_persec / 8) / 50);
|
||||
mjpeg_info ("VIDEO_STATISTICS: %02x", stream_id);
|
||||
mjpeg_info ("Video Stream length: %11llu bytes", stream_length / 8);
|
||||
mjpeg_info ("Video Stream length: %11u bytes", (int)stream_length / 8);
|
||||
mjpeg_info ("Sequence headers: %8u", num_sequence);
|
||||
mjpeg_info ("Sequence ends : %8u", num_seq_end);
|
||||
mjpeg_info ("No. Pictures : %8u", num_pictures);
|
||||
|
|
Loading…
Reference in a new issue