gst/: Use proper print statements.
Original commit message from CVS: * gst/multifile/gstmultifilesink.c: (gst_multi_file_sink_class_init): * gst/multifile/gstmultifilesrc.c: (gst_multi_file_src_class_init): * gst/mve/gstmvedemux.c: (gst_mve_video_create_buffer), (gst_mve_video_palette), (gst_mve_video_code_map), (gst_mve_audio_init), (gst_mve_audio_data), (gst_mve_timer_create), (gst_mve_demux_chain): * gst/mve/gstmvemux.c: (gst_mve_mux_push_chunk): * gst/mve/mveaudioenc.c: (mve_compress_audio): * gst/mve/mvevideodec16.c: (ipvideo_copy_block): * gst/mve/mvevideodec8.c: (ipvideo_copy_block): * gst/mve/mvevideoenc16.c: (mve_encode_frame16): * gst/mve/mvevideoenc8.c: (mve_encode_frame8): Use proper print statements. Fixes build on mac os x. <wingo> oo look at me my name is edward i'm hacking on macos wooo
This commit is contained in:
parent
2ba135f614
commit
ca6a88a8fc
19
ChangeLog
19
ChangeLog
@ -1,3 +1,22 @@
|
|||||||
|
2007-01-25 Edward Hervey <edward@fluendo.com>
|
||||||
|
|
||||||
|
* gst/multifile/gstmultifilesink.c:
|
||||||
|
(gst_multi_file_sink_class_init):
|
||||||
|
* gst/multifile/gstmultifilesrc.c: (gst_multi_file_src_class_init):
|
||||||
|
* gst/mve/gstmvedemux.c: (gst_mve_video_create_buffer),
|
||||||
|
(gst_mve_video_palette), (gst_mve_video_code_map),
|
||||||
|
(gst_mve_audio_init), (gst_mve_audio_data), (gst_mve_timer_create),
|
||||||
|
(gst_mve_demux_chain):
|
||||||
|
* gst/mve/gstmvemux.c: (gst_mve_mux_push_chunk):
|
||||||
|
* gst/mve/mveaudioenc.c: (mve_compress_audio):
|
||||||
|
* gst/mve/mvevideodec16.c: (ipvideo_copy_block):
|
||||||
|
* gst/mve/mvevideodec8.c: (ipvideo_copy_block):
|
||||||
|
* gst/mve/mvevideoenc16.c: (mve_encode_frame16):
|
||||||
|
* gst/mve/mvevideoenc8.c: (mve_encode_frame8):
|
||||||
|
Use proper print statements.
|
||||||
|
Fixes build on mac os x.
|
||||||
|
<wingo> oo look at me my name is edward i'm hacking on macos wooo
|
||||||
|
|
||||||
2007-01-24 Wim Taymans <wim@fluendo.com>
|
2007-01-24 Wim Taymans <wim@fluendo.com>
|
||||||
|
|
||||||
* gst/qtdemux/gstrtpxqtdepay.c:
|
* gst/qtdemux/gstrtpxqtdepay.c:
|
||||||
|
@ -156,7 +156,8 @@ gst_multi_file_sink_class_init (GstMultiFileSinkClass * klass)
|
|||||||
//gstbasesink_class->event = GST_DEBUG_FUNCPTR (gst_multi_file_sink_event);
|
//gstbasesink_class->event = GST_DEBUG_FUNCPTR (gst_multi_file_sink_event);
|
||||||
|
|
||||||
if (sizeof (off_t) < 8) {
|
if (sizeof (off_t) < 8) {
|
||||||
GST_LOG ("No large file support, sizeof (off_t) = %u", sizeof (off_t));
|
GST_LOG ("No large file support, sizeof (off_t) = %" G_GSIZE_FORMAT,
|
||||||
|
sizeof (off_t));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -144,7 +144,8 @@ gst_multi_file_src_class_init (GstMultiFileSrcClass * klass)
|
|||||||
gstbasesrc_class->get_caps = gst_multi_file_src_getcaps;
|
gstbasesrc_class->get_caps = gst_multi_file_src_getcaps;
|
||||||
|
|
||||||
if (sizeof (off_t) < 8) {
|
if (sizeof (off_t) < 8) {
|
||||||
GST_LOG ("No large file support, sizeof (off_t) = %u", sizeof (off_t));
|
GST_LOG ("No large file support, sizeof (off_t) = %" G_GSIZE_FORMAT,
|
||||||
|
sizeof (off_t));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -379,7 +379,7 @@ gst_mve_video_create_buffer (GstMveDemux * mve, guint8 version,
|
|||||||
}
|
}
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (mve,
|
GST_DEBUG_OBJECT (mve,
|
||||||
"allocating video buffer, w:%ld, h:%ld, n:%ld, true_color:%ld", w, h, n,
|
"allocating video buffer, w:%u, h:%u, n:%u, true_color:%u", w, h, n,
|
||||||
true_color);
|
true_color);
|
||||||
|
|
||||||
/* we need a buffer to keep the last 2 frames, since those may be
|
/* we need a buffer to keep the last 2 frames, since those may be
|
||||||
@ -423,7 +423,7 @@ gst_mve_video_palette (GstMveDemux * mve, const guint8 * data, guint16 len)
|
|||||||
|
|
||||||
start = GST_READ_UINT16_LE (data);
|
start = GST_READ_UINT16_LE (data);
|
||||||
count = GST_READ_UINT16_LE (data + 2);
|
count = GST_READ_UINT16_LE (data + 2);
|
||||||
GST_DEBUG_OBJECT (mve, "found palette start:%ld, count:%ld", start, count);
|
GST_DEBUG_OBJECT (mve, "found palette start:%u, count:%u", start, count);
|
||||||
|
|
||||||
/* need more bytes */
|
/* need more bytes */
|
||||||
if (len < count * 3)
|
if (len < count * 3)
|
||||||
@ -536,7 +536,7 @@ gst_mve_video_code_map (GstMveDemux * mve, const guint8 * data, guint16 len)
|
|||||||
return GST_FLOW_ERROR;
|
return GST_FLOW_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (mve, "found code map, size:%ld", len);
|
GST_DEBUG_OBJECT (mve, "found code map, size:%u", len);
|
||||||
|
|
||||||
/* decoding is done in 8x8 blocks using 4-bit opcodes */
|
/* decoding is done in 8x8 blocks using 4-bit opcodes */
|
||||||
min = (mve->video_stream->width * mve->video_stream->height) / (8 * 8 * 2);
|
min = (mve->video_stream->width * mve->video_stream->height) / (8 * 8 * 2);
|
||||||
@ -687,8 +687,8 @@ gst_mve_audio_init (GstMveDemux * mve, guint8 version, const guint8 * data,
|
|||||||
stream->compression = ((version > 0) && (flags & MVE_AUDIO_COMPRESSED)) ?
|
stream->compression = ((version > 0) && (flags & MVE_AUDIO_COMPRESSED)) ?
|
||||||
TRUE : FALSE;
|
TRUE : FALSE;
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (mve, "audio init, sample_rate:%ld, channels:%ld, "
|
GST_DEBUG_OBJECT (mve, "audio init, sample_rate:%d, channels:%d, "
|
||||||
"bits_per_sample:%ld, compression:%ld, buffer:%ld",
|
"bits_per_sample:%d, compression:%d, buffer:%u",
|
||||||
stream->sample_rate, stream->n_channels,
|
stream->sample_rate, stream->n_channels,
|
||||||
stream->sample_size, stream->compression, requested_buffer);
|
stream->sample_size, stream->compression, requested_buffer);
|
||||||
|
|
||||||
@ -779,7 +779,7 @@ gst_mve_audio_data (GstMveDemux * mve, guint8 type, const guint8 * data,
|
|||||||
GST_BUFFER_DURATION (buf) = duration;
|
GST_BUFFER_DURATION (buf) = duration;
|
||||||
GST_BUFFER_OFFSET_END (buf) = s->offset + n_samples;
|
GST_BUFFER_OFFSET_END (buf) = s->offset + n_samples;
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (mve, "created audio buffer, size:%ld, stream_mask:%lx",
|
GST_DEBUG_OBJECT (mve, "created audio buffer, size:%u, stream_mask:%x",
|
||||||
size, stream_mask);
|
size, stream_mask);
|
||||||
|
|
||||||
*output = buf;
|
*output = buf;
|
||||||
@ -824,7 +824,7 @@ gst_mve_timer_create (GstMveDemux * mve, const guint8 * data, guint16 len,
|
|||||||
t_rate = GST_READ_UINT32_LE (data);
|
t_rate = GST_READ_UINT32_LE (data);
|
||||||
t_subdiv = GST_READ_UINT16_LE (data + 4);
|
t_subdiv = GST_READ_UINT16_LE (data + 4);
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (mve, "found timer:%ldx%d", t_rate, t_subdiv);
|
GST_DEBUG_OBJECT (mve, "found timer:%ux%u", t_rate, t_subdiv);
|
||||||
mve->frame_duration = t_rate * t_subdiv * GST_USECOND;
|
mve->frame_duration = t_rate * t_subdiv * GST_USECOND;
|
||||||
|
|
||||||
/* now really start rolling... */
|
/* now really start rolling... */
|
||||||
@ -984,7 +984,7 @@ gst_mve_demux_chain (GstPad * sinkpad, GstBuffer * inbuf)
|
|||||||
|
|
||||||
gst_adapter_push (mve->adapter, inbuf);
|
gst_adapter_push (mve->adapter, inbuf);
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (mve, "queuing buffer, needed:%ld, available:%ld",
|
GST_DEBUG_OBJECT (mve, "queuing buffer, needed:%d, available:%u",
|
||||||
mve->needed_bytes, gst_adapter_available (mve->adapter));
|
mve->needed_bytes, gst_adapter_available (mve->adapter));
|
||||||
|
|
||||||
while ((gst_adapter_available (mve->adapter) >= mve->needed_bytes) &&
|
while ((gst_adapter_available (mve->adapter) >= mve->needed_bytes) &&
|
||||||
@ -1044,7 +1044,7 @@ gst_mve_demux_chain (GstPad * sinkpad, GstBuffer * inbuf)
|
|||||||
/* send buffer */
|
/* send buffer */
|
||||||
GST_DEBUG_OBJECT (mve,
|
GST_DEBUG_OBJECT (mve,
|
||||||
"pushing buffer with time %" GST_TIME_FORMAT
|
"pushing buffer with time %" GST_TIME_FORMAT
|
||||||
" (%ld bytes) on pad %s",
|
" (%u bytes) on pad %s",
|
||||||
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)),
|
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)),
|
||||||
GST_BUFFER_SIZE (outbuf), GST_PAD_NAME (stream->pad));
|
GST_BUFFER_SIZE (outbuf), GST_PAD_NAME (stream->pad));
|
||||||
|
|
||||||
|
@ -931,7 +931,7 @@ gst_mve_mux_push_chunk (GstMveMux * mvemux)
|
|||||||
|
|
||||||
if (size > G_MAXUINT16) {
|
if (size > G_MAXUINT16) {
|
||||||
GST_ELEMENT_ERROR (mvemux, STREAM, ENCODE, (NULL),
|
GST_ELEMENT_ERROR (mvemux, STREAM, ENCODE, (NULL),
|
||||||
("encoding frame %d failed: maximum block size exceeded (%lu)",
|
("encoding frame %d failed: maximum block size exceeded (%u)",
|
||||||
mvemux->video_frames + 1, size));
|
mvemux->video_frames + 1, size));
|
||||||
return GST_FLOW_ERROR;
|
return GST_FLOW_ERROR;
|
||||||
}
|
}
|
||||||
|
@ -105,7 +105,7 @@ mve_compress_audio (guint8 * dest, const guint8 * src, guint16 len,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (G_UNLIKELY (abs (real_res - s) > 32767)) {
|
if (G_UNLIKELY (abs (real_res - s) > 32767)) {
|
||||||
GST_ERROR ("sign loss left unfixed in audio stream, deviation:%ld",
|
GST_ERROR ("sign loss left unfixed in audio stream, deviation:%d",
|
||||||
real_res - s);
|
real_res - s);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -46,10 +46,10 @@ ipvideo_copy_block (const GstMveDemuxStream * s, unsigned short *frame,
|
|||||||
frame_offset = frame - (unsigned short *) s->back_buf1 + offset;
|
frame_offset = frame - (unsigned short *) s->back_buf1 + offset;
|
||||||
|
|
||||||
if (G_UNLIKELY (frame_offset < 0)) {
|
if (G_UNLIKELY (frame_offset < 0)) {
|
||||||
GST_ERROR ("frame offset < 0 (%ld)", frame_offset);
|
GST_ERROR ("frame offset < 0 (%d)", frame_offset);
|
||||||
return -1;
|
return -1;
|
||||||
} else if (G_UNLIKELY (frame_offset > s->max_block_offset)) {
|
} else if (G_UNLIKELY (frame_offset > s->max_block_offset)) {
|
||||||
GST_ERROR ("frame offset above limit (%ld > %ld)",
|
GST_ERROR ("frame offset above limit (%d > %u)",
|
||||||
frame_offset, s->max_block_offset);
|
frame_offset, s->max_block_offset);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -48,7 +48,7 @@ ipvideo_copy_block (const GstMveDemuxStream * s, unsigned char *frame,
|
|||||||
GST_ERROR ("frame offset < 0 (%ld)", frame_offset);
|
GST_ERROR ("frame offset < 0 (%ld)", frame_offset);
|
||||||
return -1;
|
return -1;
|
||||||
} else if (G_UNLIKELY (frame_offset > s->max_block_offset)) {
|
} else if (G_UNLIKELY (frame_offset > s->max_block_offset)) {
|
||||||
GST_ERROR ("frame offset above limit (%ld > %ld)",
|
GST_ERROR ("frame offset above limit (%ld > %u)",
|
||||||
frame_offset, s->max_block_offset);
|
frame_offset, s->max_block_offset);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -1540,7 +1540,7 @@ mve_encode_frame16 (GstMveMux * mve, GstBuffer * frame, guint16 max_data)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* find best solution with size constraints */
|
/* find best solution with size constraints */
|
||||||
GST_DEBUG_OBJECT (mve, "encoded frame %u in %ld bytes (lossless)",
|
GST_DEBUG_OBJECT (mve, "encoded frame %u in %u bytes (lossless)",
|
||||||
mve->video_frames + 1, encoded_size);
|
mve->video_frames + 1, encoded_size);
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
@ -1593,7 +1593,7 @@ mve_encode_frame16 (GstMveMux * mve, GstBuffer * frame, guint16 max_data)
|
|||||||
|
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
GST_DEBUG_OBJECT (mve, "compressed frame %u to %ld bytes (lossy)",
|
GST_DEBUG_OBJECT (mve, "compressed frame %u to %u bytes (lossy)",
|
||||||
mve->video_frames + 1, encoded_size);
|
mve->video_frames + 1, encoded_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1638,7 +1638,7 @@ mve_encode_frame8 (GstMveMux * mve, GstBuffer * frame, const guint32 * palette,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* find best solution with size constraints */
|
/* find best solution with size constraints */
|
||||||
GST_DEBUG_OBJECT (mve, "encoded frame %u in %ld bytes (lossless)",
|
GST_DEBUG_OBJECT (mve, "encoded frame %u in %u bytes (lossless)",
|
||||||
mve->video_frames + 1, encoded_size);
|
mve->video_frames + 1, encoded_size);
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
@ -1691,7 +1691,7 @@ mve_encode_frame8 (GstMveMux * mve, GstBuffer * frame, const guint32 * palette,
|
|||||||
|
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
GST_DEBUG_OBJECT (mve, "compressed frame %u to %ld bytes (lossy)",
|
GST_DEBUG_OBJECT (mve, "compressed frame %u to %u bytes (lossy)",
|
||||||
mve->video_frames + 1, encoded_size);
|
mve->video_frames + 1, encoded_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user