summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--ext/vorbis/vorbisdec.c2
-rw-r--r--gst/videoscale/gstvideoscale.c3
-rw-r--r--sys/xvimage/xvimagesink.c4
-rw-r--r--tests/examples/dynamic/addstream.c6
5 files changed, 19 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c7ea5174..52876d70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2008-05-21 Wim Taymans <wim.taymans@collabora.co.uk>
+ * ext/vorbis/vorbisdec.c:
+ * gst/videoscale/gstvideoscale.c: (gst_video_scale_transform):
+ * sys/xvimage/xvimagesink.c: (gst_xvimagesink_show_frame):
+ Some debug and comment fixes.
+
+ * tests/examples/dynamic/addstream.c: (main):
+ Fix , to ;
+
+2008-05-21 Wim Taymans <wim.taymans@collabora.co.uk>
+
* ext/ogg/gstoggdemux.c: (gst_ogg_pad_typefind):
* gst/playback/decodetest.c: (new_decoded_pad_cb):
* gst/playback/gstdecodebin.c: (gst_decode_bin_init),
diff --git a/ext/vorbis/vorbisdec.c b/ext/vorbis/vorbisdec.c
index fc8b9d70..0cc1ee03 100644
--- a/ext/vorbis/vorbisdec.c
+++ b/ext/vorbis/vorbisdec.c
@@ -1166,7 +1166,7 @@ empty_header:
* output queue:
*
* Then we decode each buffer in the decode queue in order and put the output
- * buffer in the output queue. The first buffer (7) will not produce and output
+ * buffer in the output queue. The first buffer (7) will not produce any output
* because it needs the previous buffer (6) which did not arrive yet. This
* yields:
*
diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c
index f99643e2..5cf69726 100644
--- a/gst/videoscale/gstvideoscale.c
+++ b/gst/videoscale/gstvideoscale.c
@@ -753,6 +753,7 @@ gst_video_scale_transform (GstBaseTransform * trans, GstBuffer * in,
switch (method) {
case GST_VIDEO_SCALE_NEAREST:
+ GST_LOG_OBJECT (videoscale, "doing nearest scaling");
switch (videoscale->format) {
case GST_VIDEO_SCALE_RGBx:
case GST_VIDEO_SCALE_xRGB:
@@ -796,6 +797,7 @@ gst_video_scale_transform (GstBaseTransform * trans, GstBuffer * in,
}
break;
case GST_VIDEO_SCALE_BILINEAR:
+ GST_LOG_OBJECT (videoscale, "doing bilinear scaling");
switch (videoscale->format) {
case GST_VIDEO_SCALE_RGBx:
case GST_VIDEO_SCALE_xRGB:
@@ -839,6 +841,7 @@ gst_video_scale_transform (GstBaseTransform * trans, GstBuffer * in,
}
break;
case GST_VIDEO_SCALE_4TAP:
+ GST_LOG_OBJECT (videoscale, "doing 4tap scaling");
switch (videoscale->format) {
case GST_VIDEO_SCALE_I420:
case GST_VIDEO_SCALE_YV12:
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index 42fb6fd3..b96a2a90 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -2191,11 +2191,11 @@ gst_xvimagesink_show_frame (GstBaseSink * bsink, GstBuffer * buf)
/* If this buffer has been allocated using our buffer management we simply
put the ximage which is in the PRIVATE pointer */
if (GST_IS_XVIMAGE_BUFFER (buf)) {
- GST_LOG_OBJECT (xvimagesink, "fast put of bufferpool buffer");
+ GST_LOG_OBJECT (xvimagesink, "fast put of bufferpool buffer %p", buf);
if (!gst_xvimagesink_xvimage_put (xvimagesink, GST_XVIMAGE_BUFFER (buf)))
goto no_window;
} else {
- GST_LOG_OBJECT (xvimagesink, "slow copy into bufferpool buffer");
+ GST_LOG_OBJECT (xvimagesink, "slow copy into bufferpool buffer %p", buf);
/* Else we have to copy the data into our private image, */
/* if we have one... */
if (!xvimagesink->xvimage) {
diff --git a/tests/examples/dynamic/addstream.c b/tests/examples/dynamic/addstream.c
index 3c4a263b..66ad0bec 100644
--- a/tests/examples/dynamic/addstream.c
+++ b/tests/examples/dynamic/addstream.c
@@ -239,9 +239,9 @@ main (int argc, char *argv[])
/* start our actions while we are in the mainloop so that we can catch errors
* and other messages. */
- g_idle_add ((GSourceFunc) perform_step, GINT_TO_POINTER (0)),
- /* go to main loop */
- g_main_loop_run (loop);
+ g_idle_add ((GSourceFunc) perform_step, GINT_TO_POINTER (0));
+ /* go to main loop */
+ g_main_loop_run (loop);
gst_element_set_state (pipeline, GST_STATE_NULL);