summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/dash/gstdashdemux.c12
-rw-r--r--ext/dash/gstmpdparser.c7
-rw-r--r--ext/eglgles/gstegladaptation_egl.c3
-rw-r--r--ext/eglgles/gsteglglessink.c8
-rw-r--r--ext/faac/gstfaac.c11
-rw-r--r--ext/resindvd/gstmpegdemux.c42
-rw-r--r--ext/resindvd/gstmpegdesc.c7
-rw-r--r--ext/resindvd/gstpesfilter.c2
-rw-r--r--ext/rsvg/gstrsvgdec.c9
-rw-r--r--ext/smoothstreaming/gstmssdemux.c2
-rw-r--r--ext/wayland/gstwaylandsink.c14
11 files changed, 66 insertions, 51 deletions
diff --git a/ext/dash/gstdashdemux.c b/ext/dash/gstdashdemux.c
index f30de900b..c3a442ca6 100644
--- a/ext/dash/gstdashdemux.c
+++ b/ext/dash/gstdashdemux.c
@@ -227,11 +227,13 @@ static void gst_dash_demux_remove_streams (GstDashDemux * demux,
GSList * streams);
static void gst_dash_demux_stream_free (GstDashDemuxStream * stream);
static void gst_dash_demux_reset (GstDashDemux * demux, gboolean dispose);
+#ifndef GST_DISABLE_GST_DEBUG
static GstClockTime gst_dash_demux_get_buffering_time (GstDashDemux * demux);
-static GstCaps *gst_dash_demux_get_input_caps (GstDashDemux * demux,
- GstActiveStream * stream);
static GstClockTime gst_dash_demux_stream_get_buffering_time (GstDashDemuxStream
* stream);
+#endif
+static GstCaps *gst_dash_demux_get_input_caps (GstDashDemux * demux,
+ GstActiveStream * stream);
static GstPad *gst_dash_demux_create_pad (GstDashDemux * demux);
#define gst_dash_demux_parent_class parent_class
@@ -1409,6 +1411,7 @@ gst_dash_demux_reset (GstDashDemux * demux, gboolean dispose)
demux->cancelled = FALSE;
}
+#ifndef GST_DISABLE_GST_DEBUG
static GstClockTime
gst_dash_demux_get_buffering_time (GstDashDemux * demux)
{
@@ -1436,6 +1439,7 @@ gst_dash_demux_stream_get_buffering_time (GstDashDemuxStream * stream)
return (GstClockTime) level.time;
}
+#endif
static gboolean
gst_dash_demux_all_streams_have_data (GstDashDemux * demux)
@@ -2186,12 +2190,16 @@ gst_dash_demux_get_next_fragment (GstDashDemux * demux,
/* Wake the download task up */
GST_TASK_SIGNAL (demux->download_task);
if (selected_stream) {
+#ifndef GST_DISABLE_GST_DEBUG
guint64 brate;
+#endif
diff = (GST_TIMEVAL_TO_TIME (now) - GST_TIMEVAL_TO_TIME (start));
gst_download_rate_add_rate (&selected_stream->dnl_rate, size_buffer, diff);
+#ifndef GST_DISABLE_GST_DEBUG
brate = (size_buffer * 8) / ((double) diff / GST_SECOND);
+#endif
GST_INFO_OBJECT (demux,
"Stream: %d Download rate = %" PRIu64 " Kbits/s (%" PRIu64
" Ko in %.2f s)", selected_stream->index,
diff --git a/ext/dash/gstmpdparser.c b/ext/dash/gstmpdparser.c
index 7e3563486..448f20bda 100644
--- a/ext/dash/gstmpdparser.c
+++ b/ext/dash/gstmpdparser.c
@@ -699,15 +699,14 @@ gst_mpdparser_get_xml_prop_dateTime (xmlNode * a_node,
{
xmlChar *prop_string;
gchar *str;
- gint ret, len, pos;
+ gint ret, pos;
gint year, month, day, hour, minute, second;
gboolean exists = FALSE;
prop_string = xmlGetProp (a_node, (const xmlChar *) property_name);
if (prop_string) {
- len = xmlStrlen (prop_string);
str = (gchar *) prop_string;
- GST_TRACE ("dateTime: %s, len %d", str, len);
+ GST_TRACE ("dateTime: %s, len %d", str, xmlStrlen (prop_string));
/* parse year */
ret = sscanf (str, "%d", &year);
if (ret != 1)
@@ -2023,10 +2022,12 @@ gst_mpdparser_get_first_adapt_set_with_mimeType_and_lang (GList *
gchar *this_mimeType = NULL;
rep =
gst_mpdparser_get_lowest_representation (adapt_set->Representations);
+#ifndef GST_DISABLE_GST_DEBUG
if (rep && rep->BaseURLs) {
GstBaseURL *url = rep->BaseURLs->data;
GST_DEBUG ("%s", url->baseURL);
}
+#endif
if (rep->RepresentationBase)
this_mimeType = rep->RepresentationBase->mimeType;
if (!this_mimeType && adapt_set->RepresentationBase) {
diff --git a/ext/eglgles/gstegladaptation_egl.c b/ext/eglgles/gstegladaptation_egl.c
index 0c8a75b0e..d6a49f8a1 100644
--- a/ext/eglgles/gstegladaptation_egl.c
+++ b/ext/eglgles/gstegladaptation_egl.c
@@ -106,6 +106,7 @@ got_egl_error (const char *wtf)
void
gst_egl_adaptation_init_egl_exts (GstEglAdaptationContext * ctx)
{
+#ifndef GST_DISABLE_GST_DEBUG
const char *eglexts;
unsigned const char *glexts;
@@ -116,7 +117,7 @@ gst_egl_adaptation_init_egl_exts (GstEglAdaptationContext * ctx)
GST_STR_NULL (eglexts));
GST_DEBUG_OBJECT (ctx->element, "Available GLES extensions: %s\n",
GST_STR_NULL ((const char *) glexts));
-
+#endif
return;
}
diff --git a/ext/eglgles/gsteglglessink.c b/ext/eglgles/gsteglglessink.c
index 0e17b7bab..2b371e8d8 100644
--- a/ext/eglgles/gsteglglessink.c
+++ b/ext/eglgles/gsteglglessink.c
@@ -1052,7 +1052,10 @@ static gboolean
gst_eglglessink_fill_texture (GstEglGlesSink * eglglessink, GstBuffer * buf)
{
GstVideoFrame vframe;
- gint w, h;
+#ifndef GST_DISABLE_GST_DEBUG
+ gint w;
+#endif
+ gint h;
memset (&vframe, 0, sizeof (vframe));
@@ -1061,8 +1064,9 @@ gst_eglglessink_fill_texture (GstEglGlesSink * eglglessink, GstBuffer * buf)
GST_ERROR_OBJECT (eglglessink, "Couldn't map frame");
goto HANDLE_ERROR;
}
-
+#ifndef GST_DISABLE_GST_DEBUG
w = GST_VIDEO_FRAME_WIDTH (&vframe);
+#endif
h = GST_VIDEO_FRAME_HEIGHT (&vframe);
GST_DEBUG_OBJECT (eglglessink,
diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c
index d47db2e93..0619296dc 100644
--- a/ext/faac/gstfaac.c
+++ b/ext/faac/gstfaac.c
@@ -126,7 +126,6 @@ static gboolean gst_faac_configure_source_pad (GstFaac * faac,
GstAudioInfo * info);
static GstCaps *gst_faac_getcaps (GstAudioEncoder * enc, GstCaps * filter);
-static gboolean gst_faac_start (GstAudioEncoder * enc);
static gboolean gst_faac_stop (GstAudioEncoder * enc);
static gboolean gst_faac_set_format (GstAudioEncoder * enc,
GstAudioInfo * info);
@@ -207,7 +206,6 @@ gst_faac_class_init (GstFaacClass * klass)
"Free MPEG-2/4 AAC encoder",
"Ronald Bultje <rbultje@ronald.bitfreak.net>");
- base_class->start = GST_DEBUG_FUNCPTR (gst_faac_start);
base_class->stop = GST_DEBUG_FUNCPTR (gst_faac_stop);
base_class->set_format = GST_DEBUG_FUNCPTR (gst_faac_set_format);
base_class->handle_frame = GST_DEBUG_FUNCPTR (gst_faac_handle_frame);
@@ -260,15 +258,6 @@ gst_faac_close_encoder (GstFaac * faac)
}
static gboolean
-gst_faac_start (GstAudioEncoder * enc)
-{
- GstFaac *faac = GST_FAAC (enc);
-
- GST_DEBUG_OBJECT (faac, "start");
- return TRUE;
-}
-
-static gboolean
gst_faac_stop (GstAudioEncoder * enc)
{
GstFaac *faac = GST_FAAC (enc);
diff --git a/ext/resindvd/gstmpegdemux.c b/ext/resindvd/gstmpegdemux.c
index 267c9f792..29da73d0a 100644
--- a/ext/resindvd/gstmpegdemux.c
+++ b/ext/resindvd/gstmpegdemux.c
@@ -460,7 +460,6 @@ gst_flups_demux_send_data (GstFluPSDemux * demux, GstFluPSStream * stream,
{
GstFlowReturn result;
GstClockTime pts = GST_CLOCK_TIME_NONE, dts = GST_CLOCK_TIME_NONE;
- guint size;
if (stream == NULL)
goto no_stream;
@@ -497,16 +496,15 @@ gst_flups_demux_send_data (GstFluPSDemux * demux, GstFluPSStream * stream,
stream->discont = FALSE;
}
- size = gst_buffer_get_size (buf);
demux->next_pts = G_MAXUINT64;
demux->next_dts = G_MAXUINT64;
result = gst_pad_push (stream->pad, buf);
GST_DEBUG_OBJECT (demux, "pushed stream id 0x%02x type 0x%02x, pts time: %"
- GST_TIME_FORMAT ", size %d. result: %s",
+ GST_TIME_FORMAT ", size %" G_GSIZE_FORMAT ". result: %s",
stream->id, stream->type, GST_TIME_ARGS (pts),
- size, gst_flow_get_name (result));
+ gst_buffer_get_size (buf), gst_flow_get_name (result));
return result;
@@ -1525,7 +1523,9 @@ gst_flups_demux_parse_sys_head (GstFluPSDemux * demux)
{
guint16 length;
const guint8 *data;
+#ifndef GST_DISABLE_GST_DEBUG
gboolean csps;
+#endif
if (gst_adapter_available (demux->adapter) < 6)
goto need_more_data;
@@ -1572,6 +1572,7 @@ gst_flups_demux_parse_sys_head (GstFluPSDemux * demux)
/* audio_bound:6==1 ! fixed:1 | constrained:1 */
{
+#ifndef GST_DISABLE_GST_DEBUG
guint8 audio_bound;
gboolean fixed;
@@ -1584,36 +1585,40 @@ gst_flups_demux_parse_sys_head (GstFluPSDemux * demux)
GST_DEBUG_OBJECT (demux, "audio_bound %d, fixed %d, constrained %d",
audio_bound, fixed, csps);
+#endif
data += 1;
}
/* audio_lock:1 | video_lock:1 | marker:1==1 | video_bound:5 */
{
+#ifndef GST_DISABLE_GST_DEBUG
gboolean audio_lock;
gboolean video_lock;
guint8 video_bound;
audio_lock = (data[0] & 0x80) == 0x80;
video_lock = (data[0] & 0x40) == 0x40;
-
+#endif
if ((data[0] & 0x20) != 0x20)
goto marker_expected;
-
+#ifndef GST_DISABLE_GST_DEBUG
/* max number of simultaneous video streams active */
video_bound = (data[0] & 0x1f);
GST_DEBUG_OBJECT (demux, "audio_lock %d, video_lock %d, video_bound %d",
audio_lock, video_lock, video_bound);
+#endif
data += 1;
}
/* packet_rate_restriction:1 | reserved:7==0x7F */
{
+#ifndef GST_DISABLE_GST_DEBUG
gboolean packet_rate_restriction;
-
+#endif
if ((data[0] & 0x7f) != 0x7f)
goto marker_expected;
-
+#ifndef GST_DISABLE_GST_DEBUG
/* only valid if csps is set */
if (csps) {
packet_rate_restriction = (data[0] & 0x80) == 0x80;
@@ -1621,6 +1626,7 @@ gst_flups_demux_parse_sys_head (GstFluPSDemux * demux)
GST_DEBUG_OBJECT (demux, "packet_rate_restriction %d",
packet_rate_restriction);
}
+#endif
}
data += 1;
@@ -1632,10 +1638,11 @@ gst_flups_demux_parse_sys_head (GstFluPSDemux * demux)
for (i = 0; i < stream_count; i++) {
guint8 stream_id;
+#ifndef GST_DISABLE_GST_DEBUG
gboolean STD_buffer_bound_scale;
guint16 STD_buffer_size_bound;
guint32 buf_byte_size_bound;
-
+#endif
stream_id = *data++;
if (!(stream_id & 0x80))
goto sys_len_error;
@@ -1643,7 +1650,7 @@ gst_flups_demux_parse_sys_head (GstFluPSDemux * demux)
/* check marker bits */
if ((*data & 0xC0) != 0xC0)
goto no_placeholder_bits;
-
+#ifndef GST_DISABLE_GST_DEBUG
STD_buffer_bound_scale = *data & 0x20;
STD_buffer_size_bound = ((guint16) (*data++ & 0x1F)) << 8;
STD_buffer_size_bound |= *data++;
@@ -1653,7 +1660,7 @@ gst_flups_demux_parse_sys_head (GstFluPSDemux * demux)
} else {
buf_byte_size_bound = STD_buffer_size_bound * 1024;
}
-
+#endif
GST_DEBUG_OBJECT (demux, "STD_buffer_bound_scale %d",
STD_buffer_bound_scale);
GST_DEBUG_OBJECT (demux, "STD_buffer_size_bound %d or %d bytes",
@@ -1700,7 +1707,9 @@ gst_flups_demux_parse_psm (GstFluPSDemux * demux)
guint16 length = 0, info_length = 0, es_map_length = 0;
guint8 psm_version = 0;
const guint8 *data, *es_map_base;
+#ifndef GST_DISABLE_GST_DEBUG
gboolean applicable;
+#endif
if (gst_adapter_available (demux->adapter) < 6)
goto need_more_data;
@@ -1731,7 +1740,9 @@ gst_flups_demux_parse_psm (GstFluPSDemux * demux)
/* Read PSM applicable bit together with version */
psm_version = GST_READ_UINT8 (data);
+#ifndef GST_DISABLE_GST_DEBUG
applicable = (psm_version & 0x80) >> 7;
+#endif
psm_version &= 0x1F;
GST_DEBUG_OBJECT (demux, "PSM version %u (applicable now %u)", psm_version,
applicable);
@@ -1835,8 +1846,6 @@ gst_flups_demux_data_cb (GstPESFilter * filter, gboolean first,
if (stream_type == -1) {
/* no stream type, if PS1, get the new id */
if (start_code == ID_PRIVATE_STREAM_1 && datalen >= 2) {
- guint8 nframes;
-
/* VDR writes A52 streams without any header bytes
* (see ftp://ftp.mplayerhq.hu/MPlayer/samples/MPEG-VOB/vdr-AC3) */
if (datalen >= 4) {
@@ -1861,8 +1870,13 @@ gst_flups_demux_data_cb (GstPESFilter * filter, gboolean first,
* take the first byte too, since it's the frame count in audio
* streams and our backwards compat convention is to strip it off */
if (stream_type != ST_PS_DVD_SUBPICTURE) {
+#ifndef GST_DISABLE_GST_DEBUG
+ guint8 nframes;
+
/* Number of audio frames in this packet */
- nframes = map.data[offset++];
+ nframes = map.data[offset];
+#endif
+ offset++;
datalen--;
GST_DEBUG_OBJECT (demux, "private type 0x%02x, %d frames", id,
nframes);
diff --git a/ext/resindvd/gstmpegdesc.c b/ext/resindvd/gstmpegdesc.c
index 514e5d316..598a3b763 100644
--- a/ext/resindvd/gstmpegdesc.c
+++ b/ext/resindvd/gstmpegdesc.c
@@ -36,14 +36,19 @@ gst_mpeg_descriptor_free (GstMPEGDescriptor * desc)
static guint
gst_mpeg_descriptor_parse_1 (guint8 * data, guint size)
{
+#ifndef GST_DISABLE_GST_DEBUG
guint8 tag;
+#endif
guint8 length;
/* need at least 2 bytes for tag and length */
if (size < 2)
return 0;
- tag = *data++;
+#ifndef GST_DISABLE_GST_DEBUG
+ tag = *data;
+#endif
+ data += 1;
length = *data++;
size -= 2;
diff --git a/ext/resindvd/gstpesfilter.c b/ext/resindvd/gstpesfilter.c
index efef8f6b6..2e94c723c 100644
--- a/ext/resindvd/gstpesfilter.c
+++ b/ext/resindvd/gstpesfilter.c
@@ -458,9 +458,11 @@ gst_pes_filter_parse (GstPESFilter * filter)
push_out:
{
GstBuffer *out;
+#ifndef GST_DISABLE_GST_DEBUG
guint16 consumed;
consumed = avail - 6 - datalen;
+#endif
if (filter->unbounded_packet == FALSE) {
filter->length -= avail - 6;
diff --git a/ext/rsvg/gstrsvgdec.c b/ext/rsvg/gstrsvgdec.c
index ce32983d4..12e75e89d 100644
--- a/ext/rsvg/gstrsvgdec.c
+++ b/ext/rsvg/gstrsvgdec.c
@@ -293,13 +293,12 @@ static GstFlowReturn
gst_rsvg_dec_parse (GstVideoDecoder * decoder, GstVideoCodecFrame * frame,
GstAdapter * adapter, gboolean at_eos)
{
- GstRsvgDec *rsvg = GST_RSVG_DEC (decoder);
gboolean completed = FALSE;
const guint8 *data;
guint size;
guint i;
- GST_LOG_OBJECT (rsvg, "parse start");
+ GST_LOG_OBJECT (decoder, "parse start");
size = gst_adapter_available (adapter);
/* "<svg></svg>" */
@@ -308,7 +307,7 @@ gst_rsvg_dec_parse (GstVideoDecoder * decoder, GstVideoCodecFrame * frame,
data = gst_adapter_map (adapter, size);
if (data == NULL) {
- GST_ERROR_OBJECT (rsvg, "Unable to map memory");
+ GST_ERROR_OBJECT (decoder, "Unable to map memory");
return GST_FLOW_ERROR;
}
for (i = 0; i < size - 4; i++) {
@@ -320,7 +319,7 @@ gst_rsvg_dec_parse (GstVideoDecoder * decoder, GstVideoCodecFrame * frame,
return GST_VIDEO_DECODER_FLOW_NEED_DATA;
data = gst_adapter_map (adapter, size);
if (data == NULL) {
- GST_ERROR_OBJECT (rsvg, "Unable to map memory");
+ GST_ERROR_OBJECT (decoder, "Unable to map memory");
return GST_FLOW_ERROR;
}
break;
@@ -342,7 +341,7 @@ gst_rsvg_dec_parse (GstVideoDecoder * decoder, GstVideoCodecFrame * frame,
if (completed) {
- GST_LOG_OBJECT (rsvg, "have complete svg of %u bytes", size);
+ GST_LOG_OBJECT (decoder, "have complete svg of %u bytes", size);
gst_video_decoder_add_to_frame (decoder, size);
return gst_video_decoder_have_frame (decoder);
diff --git a/ext/smoothstreaming/gstmssdemux.c b/ext/smoothstreaming/gstmssdemux.c
index 8ee0ae69d..4d3a86db8 100644
--- a/ext/smoothstreaming/gstmssdemux.c
+++ b/ext/smoothstreaming/gstmssdemux.c
@@ -1106,8 +1106,10 @@ gst_mss_demux_stream_download_fragment (GstMssDemuxStream * stream,
after_download = g_get_real_time ();
if (_buffer) {
+#ifndef GST_DISABLE_GST_DEBUG
guint64 bitrate = (8 * gst_buffer_get_size (_buffer) * 1000000LLU) /
(after_download - before_download);
+#endif
GST_DEBUG_OBJECT (mssdemux,
"Measured download bitrate: %s %" G_GUINT64_FORMAT " bps",
diff --git a/ext/wayland/gstwaylandsink.c b/ext/wayland/gstwaylandsink.c
index bf2c3eb4c..cabf310a7 100644
--- a/ext/wayland/gstwaylandsink.c
+++ b/ext/wayland/gstwaylandsink.c
@@ -84,7 +84,6 @@ static GstCaps *gst_wayland_sink_get_caps (GstBaseSink * bsink,
GstCaps * filter);
static gboolean gst_wayland_sink_set_caps (GstBaseSink * bsink, GstCaps * caps);
static gboolean gst_wayland_sink_start (GstBaseSink * bsink);
-static gboolean gst_wayland_sink_stop (GstBaseSink * bsink);
static gboolean gst_wayland_sink_preroll (GstBaseSink * bsink,
GstBuffer * buffer);
static gboolean
@@ -130,6 +129,7 @@ gst_wayland_format_to_wl_format (GstVideoFormat format)
return -1;
}
+#ifndef GST_DISABLE_GST_DEBUG
static const gchar *
gst_wayland_format_to_string (uint32_t wl_format)
{
@@ -142,6 +142,7 @@ gst_wayland_format_to_string (uint32_t wl_format)
return gst_video_format_to_string (format);
}
+#endif
static void
gst_wayland_sink_class_init (GstWaylandSinkClass * klass)
@@ -169,7 +170,6 @@ gst_wayland_sink_class_init (GstWaylandSinkClass * klass)
gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_wayland_sink_get_caps);
gstbasesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_wayland_sink_set_caps);
gstbasesink_class->start = GST_DEBUG_FUNCPTR (gst_wayland_sink_start);
- gstbasesink_class->stop = GST_DEBUG_FUNCPTR (gst_wayland_sink_stop);
gstbasesink_class->preroll = GST_DEBUG_FUNCPTR (gst_wayland_sink_preroll);
gstbasesink_class->propose_allocation =
GST_DEBUG_FUNCPTR (gst_wayland_sink_propose_allocation);
@@ -528,16 +528,6 @@ gst_wayland_sink_start (GstBaseSink * bsink)
}
static gboolean
-gst_wayland_sink_stop (GstBaseSink * bsink)
-{
- GstWaylandSink *sink = (GstWaylandSink *) bsink;
-
- GST_DEBUG_OBJECT (sink, "stop");
-
- return TRUE;
-}
-
-static gboolean
gst_wayland_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
{
GstWaylandSink *sink = GST_WAYLAND_SINK (bsink);
View Lorry Controller Status