mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

Some debug and comment fixes.

Browse source 
Original commit message from CVS:
* 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 ;
This commit is contained in:
Wim Taymans 2008-05-21 16:44:15 +00:00
parent c6b54c3d02
commit 2cdf18edff
5 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
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> 2008-05-21 Wim Taymans <wim.taymans@collabora.co.uk>
* ext/ogg/gstoggdemux.c: (gst_ogg_pad_typefind): * ext/ogg/gstoggdemux.c: (gst_ogg_pad_typefind):

2
ext/vorbis/vorbisdec.c
View file

@ -1166,7 +1166,7 @@ empty_header:
* output queue: * output queue:
* *
* Then we decode each buffer in the decode queue in order and put the output * 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 * because it needs the previous buffer (6) which did not arrive yet. This
* yields: * yields:
* *

3
gst/videoscale/gstvideoscale.c
View file

@ -753,6 +753,7 @@ gst_video_scale_transform (GstBaseTransform * trans, GstBuffer * in,
switch (method) { switch (method) {
case GST_VIDEO_SCALE_NEAREST: case GST_VIDEO_SCALE_NEAREST:
GST_LOG_OBJECT (videoscale, "doing nearest scaling");
switch (videoscale->format) { switch (videoscale->format) {
case GST_VIDEO_SCALE_RGBx: case GST_VIDEO_SCALE_RGBx:
case GST_VIDEO_SCALE_xRGB: case GST_VIDEO_SCALE_xRGB:
@ -796,6 +797,7 @@ gst_video_scale_transform (GstBaseTransform * trans, GstBuffer * in,
} }
break; break;
case GST_VIDEO_SCALE_BILINEAR: case GST_VIDEO_SCALE_BILINEAR:
GST_LOG_OBJECT (videoscale, "doing bilinear scaling");
switch (videoscale->format) { switch (videoscale->format) {
case GST_VIDEO_SCALE_RGBx: case GST_VIDEO_SCALE_RGBx:
case GST_VIDEO_SCALE_xRGB: case GST_VIDEO_SCALE_xRGB:
@ -839,6 +841,7 @@ gst_video_scale_transform (GstBaseTransform * trans, GstBuffer * in,
} }
break; break;
case GST_VIDEO_SCALE_4TAP: case GST_VIDEO_SCALE_4TAP:
GST_LOG_OBJECT (videoscale, "doing 4tap scaling");
switch (videoscale->format) { switch (videoscale->format) {
case GST_VIDEO_SCALE_I420: case GST_VIDEO_SCALE_I420:
case GST_VIDEO_SCALE_YV12: case GST_VIDEO_SCALE_YV12:

4
sys/xvimage/xvimagesink.c
View file

@ -2191,11 +2191,11 @@ gst_xvimagesink_show_frame (GstBaseSink * bsink, GstBuffer * buf)
/* If this buffer has been allocated using our buffer management we simply /* If this buffer has been allocated using our buffer management we simply
put the ximage which is in the PRIVATE pointer */ put the ximage which is in the PRIVATE pointer */
if (GST_IS_XVIMAGE_BUFFER (buf)) { 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))) if (!gst_xvimagesink_xvimage_put (xvimagesink, GST_XVIMAGE_BUFFER (buf)))
goto no_window; goto no_window;
} else { } 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, */ /* Else we have to copy the data into our private image, */
/* if we have one... */ /* if we have one... */
if (!xvimagesink->xvimage) { if (!xvimagesink->xvimage) {

6
tests/examples/dynamic/addstream.c
View file

@ -239,9 +239,9 @@ main (int argc, char *argv[])
/* start our actions while we are in the mainloop so that we can catch errors /* start our actions while we are in the mainloop so that we can catch errors
* and other messages. */ * and other messages. */
g_idle_add ((GSourceFunc) perform_step, GINT_TO_POINTER (0)), g_idle_add ((GSourceFunc) perform_step, GINT_TO_POINTER (0));
/* go to main loop */ /* go to main loop */
g_main_loop_run (loop); g_main_loop_run (loop);
gst_element_set_state (pipeline, GST_STATE_NULL); gst_element_set_state (pipeline, GST_STATE_NULL);