diff options
| author | David Schleef <ds@schleef.org> | 2003-12-05 10:04:29 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2003-12-05 10:04:29 +0000 |
| commit | c03ed5262a96a0b0cac881ffd8a04210b0bd4fee (patch) | |
| tree | 5892cebdc5e350ba8ee2a0d4f8c1465e163604b8 | |
| parent | c7ced6bec1f5604604f12588f04b06772079912e (diff) | |
| download | gstreamer-plugins-bad-c03ed5262a96a0b0cac881ffd8a04210b0bd4fee.tar.gz | |
more migration for new caps
Original commit message from CVS:
more migration for new caps
| m--------- | common | 0 | ||||
| -rw-r--r-- | gst-libs/gst/audio/audio.h | 2 | ||||
| -rw-r--r-- | gst-libs/gst/video/video.h | 46 |
3 files changed, 23 insertions, 25 deletions
diff --git a/common b/common -Subproject b5288e8215c6eacf0782880f6c5b6dea8f445a3 +Subproject fcdc6ccbcc674dd487021d87a0313abf02bae39 diff --git a/gst-libs/gst/audio/audio.h b/gst-libs/gst/audio/audio.h index 9a193c2d8..b87f22d57 100644 --- a/gst-libs/gst/audio/audio.h +++ b/gst-libs/gst/audio/audio.h @@ -70,7 +70,7 @@ G_BEGIN_DECLS "endianness = (int) " G_STRINGIFY(G_BYTE_ORDER) ", " \ "width = (int) 16, " \ "depth = (int) 16, " \ - "signed = (boolean) { true, false }, " \ + "signed = (boolean) true, " \ "buffer-frames = (int) [ 1, " G_STRINGIFY(G_MAXINT) "]" #define GST_AUDIO_FLOAT_PAD_TEMPLATE_CAPS \ diff --git a/gst-libs/gst/video/video.h b/gst-libs/gst/video/video.h index 3ce2a2e92..236002d9d 100644 --- a/gst-libs/gst/video/video.h +++ b/gst-libs/gst/video/video.h @@ -23,9 +23,9 @@ #include <gst/gst.h> -#define R_MASK_32 0xff000000 -#define G_MASK_32 0x00ff0000 -#define B_MASK_32 0x0000ff00 +#define R_MASK_32 "0xff000000" +#define G_MASK_32 "0x00ff0000" +#define B_MASK_32 "0x0000ff00" #define R_MASK_32_REVERSE 0x000000ff #define G_MASK_32_REVERSE 0x0000ff00 @@ -47,8 +47,8 @@ #define G_MASK_15 0x03e0 #define B_MASK_15 0x001f -#define SIZE_RANGE GST_PROPS_INT_RANGE (16, 4096) -#define FPS_RANGE GST_PROPS_FLOAT_RANGE (0, G_MAXFLOAT) +#define SIZE_RANGE "(int) [ 16, 4096 ]" +#define FPS_RANGE "(double) [ 0, max ]" /* properties for pad templates */ #define GST_VIDEO_RGB_PAD_TEMPLATE_PROPS_24_32 \ @@ -107,18 +107,17 @@ "framerate", FPS_RANGE, \ NULL) -#define GST_VIDEO_RGB_PAD_TEMPLATE_PROPS_32 \ - gst_props_new ( \ - "bpp", GST_PROPS_INT (32), \ - "depth", GST_PROPS_INT (32), \ - "endianness", GST_PROPS_INT (G_BIG_ENDIAN), \ - "red_mask", GST_PROPS_INT (R_MASK_32), \ - "green_mask", GST_PROPS_INT (G_MASK_32), \ - "blue_mask", GST_PROPS_INT (B_MASK_32), \ - "width", SIZE_RANGE, \ - "height", SIZE_RANGE, \ - "framerate", FPS_RANGE, \ - NULL) +#define GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_32 \ + "video/x-raw-rgb, " \ + "bpp = (int) 32, " \ + "depth = (int) 32, " \ + "endianness = (int) " G_STRINGIFY(G_BIG_ENDIAN) ", " \ + "red_mask = (int) " R_MASK_32 ", " \ + "green_mask = (int) " G_MASK_32 ", " \ + "blue_mask = (int) " B_MASK_32 ", " \ + "width = " SIZE_RANGE ", " \ + "height = " SIZE_RANGE ", " \ + "framerate = " FPS_RANGE #define GST_VIDEO_RGB_PAD_TEMPLATE_PROPS_24 \ gst_props_new ( \ @@ -210,13 +209,12 @@ "framerate", FPS_RANGE, \ NULL) -#define GST_VIDEO_YUV_PAD_TEMPLATE_PROPS(fourcc) \ - gst_props_new (\ - "format", fourcc, \ - "width", SIZE_RANGE, \ - "height", SIZE_RANGE, \ - "framerate", FPS_RANGE, \ - NULL) +#define GST_VIDEO_YUV_PAD_TEMPLATE_CAPS(fourcc) \ + "video/x-raw-yuv, " \ + "format = (fourcc) " fourcc ", " \ + "width = " SIZE_RANGE ", " \ + "height = " SIZE_RANGE ", " \ + "framerate = " FPS_RANGE /* functions */ gfloat gst_video_frame_rate (GstPad *pad); |