diff --git a/ChangeLog b/ChangeLog index 6da369407b..96f839483c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2005-11-21 Tim-Philipp Müller + + * ext/directfb/dfbvideosink.c: + (gst_dfbvideosink_get_format_from_caps): + * ext/sdl/sdlvideosink.c: (gst_sdlvideosink_create): + * gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_header), + (qtdemux_parse), (qtdemux_type_get), (qtdemux_node_dump_foreach), + (qtdemux_dump_hdlr), (qtdemux_dump_dref), (qtdemux_dump_stsd), + (qtdemux_dump_dcom), (qtdemux_parse_trak), (qtdemux_video_caps), + (qtdemux_audio_caps): + * sys/v4l2/gstv4l2src.c: (gst_v4l2src_v4l2fourcc_to_caps): + * sys/v4l2/v4l2src_calls.c: (gst_v4l2src_fill_format_list), + (gst_v4l2src_capture_init), (gst_v4l2src_get_size_limits): + Update for GST_FOURCC_FORMAT API change. + 2005-11-21 Jan Schmidt * ext/audioresample/gstaudioresample.c: diff --git a/ext/directfb/dfbvideosink.c b/ext/directfb/dfbvideosink.c index 84dd040700..6bc9bfc0b2 100644 --- a/ext/directfb/dfbvideosink.c +++ b/ext/directfb/dfbvideosink.c @@ -755,7 +755,7 @@ gst_dfbvideosink_get_format_from_caps (GstCaps * caps) pixel_format = DSPF_UYVY; break; default: - GST_WARNING ("unhandled YUV format" GST_FOURCC_FORMAT, + GST_WARNING ("unhandled YUV format %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (fourcc)); goto beach; } diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c index 6d5f41292f..9671a5e577 100644 --- a/ext/sdl/sdlvideosink.c +++ b/ext/sdl/sdlvideosink.c @@ -613,7 +613,7 @@ gst_sdlvideosink_create (GstSDLVideoSink * sdlvideosink) goto no_overlay; - GST_DEBUG ("Using a %dx%d %dbpp SDL screen with a %dx%d \'" + GST_DEBUG ("Using a %dx%d %dbpp SDL screen with a %dx%d \'%" GST_FOURCC_FORMAT "\' YUV overlay", GST_VIDEO_SINK_WIDTH (sdlvideosink), GST_VIDEO_SINK_HEIGHT (sdlvideosink), sdlvideosink->screen->format->BitsPerPixel, sdlvideosink->width, @@ -626,7 +626,7 @@ gst_sdlvideosink_create (GstSDLVideoSink * sdlvideosink) /*SDL_DisplayYUVOverlay (sdlvideosink->overlay, &(sdlvideosink->rect)); */ - GST_DEBUG ("sdlvideosink: setting %08x (" GST_FOURCC_FORMAT ")", + GST_DEBUG ("sdlvideosink: setting %08x (%" GST_FOURCC_FORMAT ")", sdlvideosink->format, GST_FOURCC_ARGS (sdlvideosink->format)); g_mutex_unlock (sdlvideosink->lock); @@ -645,7 +645,7 @@ no_screen: no_overlay: { GST_ELEMENT_ERROR (sdlvideosink, LIBRARY, TOO_LAZY, (NULL), - ("SDL: Couldn't create SDL YUV overlay (%dx%d \'" GST_FOURCC_FORMAT + ("SDL: Couldn't create SDL YUV overlay (%dx%d \'%" GST_FOURCC_FORMAT "\'): %s", sdlvideosink->width, sdlvideosink->height, GST_FOURCC_ARGS (sdlvideosink->format), SDL_GetError ())); g_mutex_unlock (sdlvideosink->lock); diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 1cd44ccb74..4a0c9d8386 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -507,7 +507,7 @@ gst_qtdemux_loop_header (GstPad * pad) length = GST_READ_UINT32_BE (data); GST_DEBUG ("length %08x", length); fourcc = GST_READ_UINT32_LE (data + 4); - GST_DEBUG ("atom type " GST_FOURCC_FORMAT, GST_FOURCC_ARGS (fourcc)); + GST_DEBUG ("atom type %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (fourcc)); if (length == 0) { length = G_MAXUINT32; //gst_bytestream_length (qtdemux->bs) - cur_offset; @@ -555,7 +555,7 @@ gst_qtdemux_loop_header (GstPad * pad) } ed_edd_and_eddy: default:{ - GST_LOG ("unknown %08x '" GST_FOURCC_FORMAT "' at %d", + GST_LOG ("unknown %08x '%" GST_FOURCC_FORMAT "' at %d", fourcc, GST_FOURCC_ARGS (fourcc), cur_offset); cur_offset += length; qtdemux->offset += length; @@ -1059,7 +1059,7 @@ qtdemux_parse (GstQTDemux * qtdemux, GNode * node, void *buffer, int length) if (fourcc == 0 || node_length == 8) return; - GST_LOG ("parsing '" GST_FOURCC_FORMAT "', length=%d", + GST_LOG ("parsing '%" GST_FOURCC_FORMAT "', length=%d", GST_FOURCC_ARGS (fourcc), node_length); if (type->flags & QT_CONTAINER) { @@ -1333,7 +1333,7 @@ qtdemux_type_get (guint32 fourcc) return qt_node_types + i; } - GST_WARNING ("unknown QuickTime node type " GST_FOURCC_FORMAT, + GST_WARNING ("unknown QuickTime node type %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (fourcc)); return qt_node_types + n_qt_node_types - 1; } @@ -1353,7 +1353,7 @@ qtdemux_node_dump_foreach (GNode * node, gpointer data) type = qtdemux_type_get (fourcc); depth = (g_node_depth (node) - 1) * 2; - GST_LOG ("%*s'" GST_FOURCC_FORMAT "', [%d], %s", + GST_LOG ("%*s'%" GST_FOURCC_FORMAT "', [%d], %s", depth, "", GST_FOURCC_ARGS (fourcc), node_length, type->name); if (type->dump) @@ -1471,11 +1471,11 @@ qtdemux_dump_hdlr (GstQTDemux * qtdemux, void *buffer, int depth) { GST_LOG ("%*s version/flags: %08x", depth, "", QTDEMUX_GUINT32_GET (buffer + 8)); - GST_LOG ("%*s type: " GST_FOURCC_FORMAT, depth, "", + GST_LOG ("%*s type: %" GST_FOURCC_FORMAT, depth, "", GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (buffer + 12))); - GST_LOG ("%*s subtype: " GST_FOURCC_FORMAT, depth, "", + GST_LOG ("%*s subtype: %" GST_FOURCC_FORMAT, depth, "", GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (buffer + 16))); - GST_LOG ("%*s manufacturer: " GST_FOURCC_FORMAT, depth, "", + GST_LOG ("%*s manufacturer: %" GST_FOURCC_FORMAT, depth, "", GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (buffer + 20))); GST_LOG ("%*s flags: %08x", depth, "", QTDEMUX_GUINT32_GET (buffer + 24)); @@ -1511,7 +1511,7 @@ qtdemux_dump_dref (GstQTDemux * qtdemux, void *buffer, int depth) for (i = 0; i < n; i++) { GST_LOG ("%*s size: %u", depth, "", QTDEMUX_GUINT32_GET (buffer + offset)); - GST_LOG ("%*s type: " GST_FOURCC_FORMAT, depth, "", + GST_LOG ("%*s type: %" GST_FOURCC_FORMAT, depth, "", GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (buffer + offset + 4))); offset += QTDEMUX_GUINT32_GET (buffer + offset); } @@ -1533,14 +1533,14 @@ qtdemux_dump_stsd (GstQTDemux * qtdemux, void *buffer, int depth) for (i = 0; i < n; i++) { GST_LOG ("%*s size: %u", depth, "", QTDEMUX_GUINT32_GET (buffer + offset)); - GST_LOG ("%*s type: " GST_FOURCC_FORMAT, depth, "", + GST_LOG ("%*s type: %" GST_FOURCC_FORMAT, depth, "", GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (buffer + offset + 4))); GST_LOG ("%*s data reference:%d", depth, "", QTDEMUX_GUINT16_GET (buffer + offset + 14)); GST_LOG ("%*s version/rev.: %08x", depth, "", QTDEMUX_GUINT32_GET (buffer + offset + 16)); - GST_LOG ("%*s vendor: " GST_FOURCC_FORMAT, depth, "", + GST_LOG ("%*s vendor: %" GST_FOURCC_FORMAT, depth, "", GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (buffer + offset + 20))); GST_LOG ("%*s temporal qual: %u", depth, "", QTDEMUX_GUINT32_GET (buffer + offset + 24)); @@ -1719,7 +1719,7 @@ qtdemux_dump_co64 (GstQTDemux * qtdemux, void *buffer, int depth) static void qtdemux_dump_dcom (GstQTDemux * qtdemux, void *buffer, int depth) { - GST_LOG ("%*s compression type: " GST_FOURCC_FORMAT, depth, "", + GST_LOG ("%*s compression type: %" GST_FOURCC_FORMAT, depth, "", GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (buffer + 8))); } @@ -1921,9 +1921,9 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak) hdlr = qtdemux_tree_get_child_by_type (mdia, FOURCC_hdlr); g_assert (hdlr); - GST_LOG ("track type: " GST_FOURCC_FORMAT, + GST_LOG ("track type: %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (hdlr->data + 12))); - GST_LOG ("track subtype: " GST_FOURCC_FORMAT, + GST_LOG ("track subtype: %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (hdlr->data + 16))); stream->subtype = QTDEMUX_FOURCC_GET (hdlr->data + 16); @@ -1941,7 +1941,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak) guint32 fourcc; offset = 16; - GST_LOG ("st type: " GST_FOURCC_FORMAT, + GST_LOG ("st type: %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (stsd->data + offset + 4))); stream->width = QTDEMUX_GUINT16_GET (stsd->data + offset + 32); @@ -2005,7 +2005,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak) } } - GST_INFO ("type " GST_FOURCC_FORMAT " caps %" GST_PTR_FORMAT, + GST_INFO ("type %" GST_FOURCC_FORMAT " caps %" GST_PTR_FORMAT, GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (stsd->data + offset + 4)), stream->caps); } else if (stream->subtype == FOURCC_soun) { @@ -2014,7 +2014,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak) int len; len = QTDEMUX_GUINT32_GET (stsd->data + 16); - GST_LOG ("st type: " GST_FOURCC_FORMAT, + GST_LOG ("st type: %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (stsd->data + 16 + 4))); stream->fourcc = fourcc = QTDEMUX_FOURCC_GET (stsd->data + 16 + 4); @@ -2143,11 +2143,11 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak) "samplesize", G_TYPE_INT, samplesize, NULL); } } - GST_INFO ("type " GST_FOURCC_FORMAT " caps %" GST_PTR_FORMAT, + GST_INFO ("type %" GST_FOURCC_FORMAT " caps %" GST_PTR_FORMAT, GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (stsd->data + 16 + 4)), stream->caps); } else { - GST_INFO ("unknown subtype " GST_FOURCC_FORMAT, + GST_INFO ("unknown subtype %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (stream->subtype)); return; } @@ -2665,14 +2665,14 @@ qtdemux_video_caps (GstQTDemux * qtdemux, guint32 fourcc, case GST_MAKE_FOURCC ('k', 'p', 'c', 'd'): default: #if 0 - g_critical ("Don't know how to convert fourcc '" GST_FOURCC_FORMAT + g_critical ("Don't know how to convert fourcc '%" GST_FOURCC_FORMAT "' to caps\n", GST_FOURCC_ARGS (fourcc)); return NULL; #endif { char *s; - s = g_strdup_printf ("video/x-gst-fourcc-" GST_FOURCC_FORMAT, + s = g_strdup_printf ("video/x-gst-fourcc-%" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (fourcc)); return gst_caps_new_simple (s, NULL); } @@ -2803,14 +2803,14 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, guint32 fourcc, const guint8 * data, /* QUALCOMM PureVoice */ default: #if 0 - g_critical ("Don't know how to convert fourcc '" GST_FOURCC_FORMAT + g_critical ("Don't know how to convert fourcc '%" GST_FOURCC_FORMAT "' to caps\n", GST_FOURCC_ARGS (fourcc)); return NULL; #endif { char *s; - s = g_strdup_printf ("audio/x-gst-fourcc-" GST_FOURCC_FORMAT, + s = g_strdup_printf ("audio/x-gst-fourcc-%" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (fourcc)); return gst_caps_new_simple (s, NULL); } diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index ef0f2be7a7..02fc41b49e 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -535,7 +535,7 @@ gst_v4l2src_v4l2fourcc_to_caps (guint32 fourcc) case V4L2_PIX_FMT_WNVA: /* Winnov hw compres */ break; default: - GST_DEBUG ("Unknown fourcc 0x%08x " GST_FOURCC_FORMAT, + GST_DEBUG ("Unknown fourcc 0x%08x %" GST_FOURCC_FORMAT, fourcc, GST_FOURCC_ARGS (fourcc)); break; } diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c index f17667d96a..5e8d916fc0 100644 --- a/sys/v4l2/v4l2src_calls.c +++ b/sys/v4l2/v4l2src_calls.c @@ -81,7 +81,7 @@ gst_v4l2src_fill_format_list (GstV4l2Src * v4l2src) return FALSE; } } - GST_LOG_OBJECT (v4l2src, "got format" GST_FOURCC_FORMAT, + GST_LOG_OBJECT (v4l2src, "got format %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (format->pixelformat)); v4l2src->formats = g_slist_prepend (v4l2src->formats, format); } @@ -273,7 +273,7 @@ gst_v4l2src_capture_init (GstV4l2Src * v4l2src) g_object_notify (G_OBJECT (v4l2src), "num_buffers"); GST_INFO_OBJECT (v4l2src, - "Got %d buffers (" GST_FOURCC_FORMAT ") of size %d KB\n", + "Got %d buffers (%" GST_FOURCC_FORMAT ") of size %d KB\n", v4l2src->breq.count, GST_FOURCC_ARGS (v4l2src->format.fmt.pix.pixelformat), v4l2src->format.fmt.pix.sizeimage / 1024); @@ -474,7 +474,8 @@ gst_v4l2src_get_size_limits (GstV4l2Src * v4l2src, { struct v4l2_format fmt; - GST_LOG_OBJECT (v4l2src, "getting size limits with format " GST_FOURCC_FORMAT, + GST_LOG_OBJECT (v4l2src, + "getting size limits with format %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (format->pixelformat)); /* get size delimiters */