Commit 5c4b6ce0 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠
Browse files

Make stuff compile with GST_DISABLE_GST_DEBUG.

Original commit message from CVS:
* ext/raw1394/gsthdv1394src.c: (gst_hdv1394src_create):
* gst/alpha/gstalpha.c: (gst_alpha_get_unit_size):
* gst/audiofx/audiocheblimit.c: (generate_coefficients):
* gst/avi/gstavidemux.c: (gst_avi_demux_src_convert):
* gst/matroska/ebml-read.c: (gst_ebml_read_element_id),
(gst_ebml_read_element_length):
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_check_subtitle_buffer):
Make stuff compile with GST_DISABLE_GST_DEBUG.
parent 331b0166
2008-08-30 Tim-Philipp Müller <tim.muller at collabora co uk>
* ext/raw1394/gsthdv1394src.c: (gst_hdv1394src_create):
* gst/alpha/gstalpha.c: (gst_alpha_get_unit_size):
* gst/audiofx/audiocheblimit.c: (generate_coefficients):
* gst/avi/gstavidemux.c: (gst_avi_demux_src_convert):
* gst/matroska/ebml-read.c: (gst_ebml_read_element_id),
(gst_ebml_read_element_length):
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_check_subtitle_buffer):
Make stuff compile with GST_DISABLE_GST_DEBUG.
2008-08-28 Michael Smith <msmith@songbirdnest.com> 2008-08-28 Michael Smith <msmith@songbirdnest.com>
   
* gst/law/alaw.c: * gst/law/alaw.c:
......
...@@ -406,7 +406,9 @@ gst_hdv1394src_create (GstPushSrc * psrc, GstBuffer ** buf) ...@@ -406,7 +406,9 @@ gst_hdv1394src_create (GstPushSrc * psrc, GstBuffer ** buf)
goto told_to_stop; goto told_to_stop;
} else if (G_LIKELY (pollfds[0].revents & POLLIN)) { } else if (G_LIKELY (pollfds[0].revents & POLLIN)) {
int pt = dv1394src->frame_sequence; int pt;
pt = dv1394src->frame_sequence;
/* shouldn't block in theory */ /* shouldn't block in theory */
GST_LOG ("Iterating ! (%d)", dv1394src->frame_sequence); GST_LOG ("Iterating ! (%d)", dv1394src->frame_sequence);
raw1394_loop_iterate (dv1394src->handle); raw1394_loop_iterate (dv1394src->handle);
......
...@@ -395,7 +395,6 @@ static gboolean ...@@ -395,7 +395,6 @@ static gboolean
gst_alpha_get_unit_size (GstBaseTransform * btrans, gst_alpha_get_unit_size (GstBaseTransform * btrans,
GstCaps * caps, guint * size) GstCaps * caps, guint * size)
{ {
GstAlpha *alpha = GST_ALPHA (btrans);
GstVideoFormat format; GstVideoFormat format;
gint width, height; gint width, height;
...@@ -404,7 +403,7 @@ gst_alpha_get_unit_size (GstBaseTransform * btrans, ...@@ -404,7 +403,7 @@ gst_alpha_get_unit_size (GstBaseTransform * btrans,
*size = gst_video_format_get_size (format, width, height); *size = gst_video_format_get_size (format, width, height);
GST_DEBUG_OBJECT (alpha, "unit size = %d for format %d w %d height %d", GST_DEBUG_OBJECT (btrans, "unit size = %d for format %d w %d height %d",
*size, format, width, height); *size, format, width, height);
return TRUE; return TRUE;
......
...@@ -604,6 +604,8 @@ generate_coefficients (GstAudioChebLimit * filter) ...@@ -604,6 +604,8 @@ generate_coefficients (GstAudioChebLimit * filter)
filter->type, filter->poles, filter->cutoff, filter->ripple); filter->type, filter->poles, filter->cutoff, filter->ripple);
GST_LOG_OBJECT (filter, "%.2f dB gain @ 0 Hz", GST_LOG_OBJECT (filter, "%.2f dB gain @ 0 Hz",
20.0 * log10 (calculate_gain (a, b, np, np, 1.0, 0.0))); 20.0 * log10 (calculate_gain (a, b, np, np, 1.0, 0.0)));
#ifndef GST_DISABLE_GST_DEBUG
{ {
gdouble wc = gdouble wc =
2.0 * M_PI * (filter->cutoff / 2.0 * M_PI * (filter->cutoff /
...@@ -614,6 +616,8 @@ generate_coefficients (GstAudioChebLimit * filter) ...@@ -614,6 +616,8 @@ generate_coefficients (GstAudioChebLimit * filter)
20.0 * log10 (calculate_gain (a, b, np, np, zr, zi)), 20.0 * log10 (calculate_gain (a, b, np, np, zr, zi)),
(int) filter->cutoff); (int) filter->cutoff);
} }
#endif
GST_LOG_OBJECT (filter, "%.2f dB gain @ %d Hz", GST_LOG_OBJECT (filter, "%.2f dB gain @ %d Hz",
20.0 * log10 (calculate_gain (a, b, np, np, -1.0, 0.0)), 20.0 * log10 (calculate_gain (a, b, np, np, -1.0, 0.0)),
GST_AUDIO_FILTER (filter)->format.rate / 2); GST_AUDIO_FILTER (filter)->format.rate / 2);
......
...@@ -400,12 +400,10 @@ gst_avi_demux_src_convert (GstPad * pad, ...@@ -400,12 +400,10 @@ gst_avi_demux_src_convert (GstPad * pad,
GstFormat src_format, GstFormat src_format,
gint64 src_value, GstFormat * dest_format, gint64 * dest_value) gint64 src_value, GstFormat * dest_format, gint64 * dest_value)
{ {
gboolean res = TRUE;
GstAviDemux *avidemux = GST_AVI_DEMUX (GST_PAD_PARENT (pad));
avi_stream_context *stream = gst_pad_get_element_private (pad); avi_stream_context *stream = gst_pad_get_element_private (pad);
gboolean res = TRUE;
GST_LOG_OBJECT (avidemux, GST_LOG_OBJECT (pad,
"Received src_format:%s, src_value:%" G_GUINT64_FORMAT "Received src_format:%s, src_value:%" G_GUINT64_FORMAT
", dest_format:%s", gst_format_get_name (src_format), src_value, ", dest_format:%s", gst_format_get_name (src_format), src_value,
gst_format_get_name (*dest_format)); gst_format_get_name (*dest_format));
...@@ -470,7 +468,7 @@ gst_avi_demux_src_convert (GstPad * pad, ...@@ -470,7 +468,7 @@ gst_avi_demux_src_convert (GstPad * pad,
} }
done: done:
GST_LOG_OBJECT (avidemux, GST_LOG_OBJECT (pad,
"Returning res:%d dest_format:%s dest_value:%" G_GUINT64_FORMAT, res, "Returning res:%d dest_format:%s dest_value:%" G_GUINT64_FORMAT, res,
gst_format_get_name (*dest_format), *dest_value); gst_format_get_name (*dest_format), *dest_value);
return res; return res;
......
...@@ -327,11 +327,9 @@ gst_ebml_read_element_id (GstEbmlRead * ebml, guint32 * id, guint * level_up) ...@@ -327,11 +327,9 @@ gst_ebml_read_element_id (GstEbmlRead * ebml, guint32 * id, guint * level_up)
len_mask >>= 1; len_mask >>= 1;
} }
if (read > 4) { if (read > 4) {
guint64 pos = ebml->offset;
GST_ERROR_OBJECT (ebml, GST_ERROR_OBJECT (ebml,
"Invalid EBML ID size tag (0x%x) at position %" G_GUINT64_FORMAT " (0x%" "Invalid EBML ID size tag (0x%x) at position %" G_GUINT64_FORMAT " (0x%"
G_GINT64_MODIFIER "x)", (guint) b, pos, pos); G_GINT64_MODIFIER "x)", (guint) b, ebml->offset, ebml->offset);
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
...@@ -383,11 +381,9 @@ gst_ebml_read_element_length (GstEbmlRead * ebml, guint64 * length, ...@@ -383,11 +381,9 @@ gst_ebml_read_element_length (GstEbmlRead * ebml, guint64 * length,
len_mask >>= 1; len_mask >>= 1;
} }
if (read > 8) { if (read > 8) {
guint64 pos = ebml->offset;
GST_ERROR_OBJECT (ebml, GST_ERROR_OBJECT (ebml,
"Invalid EBML length size tag (0x%x) at position %" G_GUINT64_FORMAT "Invalid EBML length size tag (0x%x) at position %" G_GUINT64_FORMAT
" (0x%" G_GINT64_MODIFIER "x)", (guint) b, pos, pos); " (0x%" G_GINT64_MODIFIER "x)", (guint) b, ebml->offset, ebml->offset);
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
......
...@@ -3777,7 +3777,6 @@ static GstFlowReturn ...@@ -3777,7 +3777,6 @@ static GstFlowReturn
gst_matroska_demux_check_subtitle_buffer (GstElement * element, gst_matroska_demux_check_subtitle_buffer (GstElement * element,
GstMatroskaTrackContext * stream, GstBuffer ** buf) GstMatroskaTrackContext * stream, GstBuffer ** buf)
{ {
GstMatroskaDemux *demux = GST_MATROSKA_DEMUX (element);
GstMatroskaTrackSubtitleContext *sub_stream; GstMatroskaTrackSubtitleContext *sub_stream;
const gchar *encoding, *data; const gchar *encoding, *data;
GError *err = NULL; GError *err = NULL;
...@@ -3794,7 +3793,7 @@ gst_matroska_demux_check_subtitle_buffer (GstElement * element, ...@@ -3794,7 +3793,7 @@ gst_matroska_demux_check_subtitle_buffer (GstElement * element,
if (g_utf8_validate (data, size, NULL)) { if (g_utf8_validate (data, size, NULL)) {
return GST_FLOW_OK; return GST_FLOW_OK;
} }
GST_WARNING_OBJECT (demux, "subtitle stream %d is not valid UTF-8, this " GST_WARNING_OBJECT (element, "subtitle stream %d is not valid UTF-8, this "
"is broken according to the matroska specification", stream->num); "is broken according to the matroska specification", stream->num);
sub_stream->invalid_utf8 = TRUE; sub_stream->invalid_utf8 = TRUE;
} }
...@@ -3813,7 +3812,7 @@ gst_matroska_demux_check_subtitle_buffer (GstElement * element, ...@@ -3813,7 +3812,7 @@ gst_matroska_demux_check_subtitle_buffer (GstElement * element,
NULL, NULL, &err); NULL, NULL, &err);
if (err) { if (err) {
GST_LOG_OBJECT (demux, "could not convert string from '%s' to UTF-8: %s", GST_LOG_OBJECT (element, "could not convert string from '%s' to UTF-8: %s",
encoding, err->message); encoding, err->message);
g_error_free (err); g_error_free (err);
g_free (utf8); g_free (utf8);
...@@ -3824,7 +3823,7 @@ gst_matroska_demux_check_subtitle_buffer (GstElement * element, ...@@ -3824,7 +3823,7 @@ gst_matroska_demux_check_subtitle_buffer (GstElement * element,
NULL, NULL, NULL); NULL, NULL, NULL);
} }
GST_LOG_OBJECT (demux, "converted subtitle text from %s to UTF-8 %s", GST_LOG_OBJECT (element, "converted subtitle text from %s to UTF-8 %s",
encoding, (err) ? "(using ISO-8859-15 as fallback)" : ""); encoding, (err) ? "(using ISO-8859-15 as fallback)" : "");
if (utf8 == NULL) if (utf8 == NULL)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment