diff --git a/docs/design/design-decodebin.txt b/docs/design/design-decodebin.txt
index 034d1cdd87..ec8df9a5d7 100644
--- a/docs/design/design-decodebin.txt
+++ b/docs/design/design-decodebin.txt
@@ -84,9 +84,9 @@ fine-tune the process.
By default the target caps are:
- _ Raw audio : audio/x-raw-int, audio/x-raw-float
+ _ Raw audio : audio/x-raw
- _ and raw video : video/x-raw-rgb, video/x-raw-yuv
+ _ and raw video : video/x-raw
_ and Text : text/plain, text/x-pango-markup
diff --git a/docs/design/design-encoding.txt b/docs/design/design-encoding.txt
index 9a4f6b3550..b28de89d34 100644
--- a/docs/design/design-encoding.txt
+++ b/docs/design/design-encoding.txt
@@ -107,7 +107,7 @@ B. Goals
* Uncompressed (but maybe subsampled)
* Compressed
* Audio
- * Uncompressed (audio/x-raw-{int|float})
+ * Uncompressed (audio/x-raw)
* Compressed
* Timed text
* Private streams
@@ -308,7 +308,7 @@ made as to which formatting to use for storing targets and profiles.
audio
audio/mpeg,mpegversion=4
Quality High/Main
- audio/x-raw-int,channels=[1,2]
+ audio/x-raw,channels=[1,2]
1
@@ -316,7 +316,7 @@ made as to which formatting to use for storing targets and profiles.
video/x-h264
Profile Baseline/Quality High
- video/x-raw-yuv,width=[16, 800],\
+ video/x-raw,width=[16, 800],\
height=[16, 480],framerate=[1/1, 30000/1001]
1
diff --git a/docs/design/draft-subtitle-overlays.txt b/docs/design/draft-subtitle-overlays.txt
index 4cc894d970..b2e080dde6 100644
--- a/docs/design/draft-subtitle-overlays.txt
+++ b/docs/design/draft-subtitle-overlays.txt
@@ -540,9 +540,9 @@ Other considerations:
TEST: should these look (roughly) alike (note text distortion) - needs fixing in textoverlay
gst-launch-0.10 \
- videotestsrc ! video/x-raw-yuv,width=640,height=480,pixel-aspect-ratio=1/1 ! textoverlay text=Hello font-desc=72 ! xvimagesink \
- videotestsrc ! video/x-raw-yuv,width=320,height=480,pixel-aspect-ratio=2/1 ! textoverlay text=Hello font-desc=72 ! xvimagesink \
- videotestsrc ! video/x-raw-yuv,width=640,height=240,pixel-aspect-ratio=1/2 ! textoverlay text=Hello font-desc=72 ! xvimagesink
+ videotestsrc ! video/x-raw,width=640,height=480,pixel-aspect-ratio=1/1 ! textoverlay text=Hello font-desc=72 ! xvimagesink \
+ videotestsrc ! video/x-raw,width=320,height=480,pixel-aspect-ratio=2/1 ! textoverlay text=Hello font-desc=72 ! xvimagesink \
+ videotestsrc ! video/x-raw,width=640,height=240,pixel-aspect-ratio=1/2 ! textoverlay text=Hello font-desc=72 ! xvimagesink
~~~ THE END ~~~
diff --git a/gst/videoscale/README b/gst/videoscale/README
index 3e08f4ecc3..50f1fe2792 100644
--- a/gst/videoscale/README
+++ b/gst/videoscale/README
@@ -1,5 +1,5 @@
- test different strides using
-gst-launch -v videotestsrc ! video/x-raw-yuv,width=320,height=240,format=\(fourcc\)UYVY ! videoscale ! video/x-raw-yuv,width=328,height=240 ! xvimagesink
-gst-launch -v videotestsrc ! video/x-raw-yuv,width=320,height=240,format=\(fourcc\)UYVY ! videoscale ! video/x-raw-yuv,width=324,height=240 ! xvimagesink
-gst-launch -v videotestsrc ! video/x-raw-yuv,width=320,height=240,format=\(fourcc\)UYVY ! videoscale ! video/x-raw-yuv,width=322,height=240 ! xvimagesink
-gst-launch -v videotestsrc ! video/x-raw-yuv,width=320,height=240,format=\(fourcc\)UYVY ! videoscale ! video/x-raw-yuv,width=321,height=240 ! xvimagesink
+gst-launch -v videotestsrc ! video/x-raw,width=320,height=240,format=UYVY ! videoscale ! video/x-raw,width=328,height=240 ! xvimagesink
+gst-launch -v videotestsrc ! video/x-raw,width=320,height=240,format=UYVY ! videoscale ! video/x-raw,width=324,height=240 ! xvimagesink
+gst-launch -v videotestsrc ! video/x-raw,width=320,height=240,format=UYVY ! videoscale ! video/x-raw,width=322,height=240 ! xvimagesink
+gst-launch -v videotestsrc ! video/x-raw,width=320,height=240,format=UYVY ! videoscale ! video/x-raw,width=321,height=240 ! xvimagesink
diff --git a/tests/examples/app/appsink-src.c b/tests/examples/app/appsink-src.c
index 8f8ae0a6d2..2b274e8ebd 100644
--- a/tests/examples/app/appsink-src.c
+++ b/tests/examples/app/appsink-src.c
@@ -6,8 +6,7 @@
#include
/* these are the caps we are going to pass through the appsink and appsrc */
-const gchar *audio_caps =
- "audio/x-raw-int,channels=1,rate=8000,signed=(boolean)true,width=16,depth=16,endianness=1234";
+const gchar *audio_caps = "audio/x-raw,format=S16LE,channels=1,rate=8000";
typedef struct
{
diff --git a/tests/examples/audio/audiomix.c b/tests/examples/audio/audiomix.c
index 4ad1894221..fda556d606 100644
--- a/tests/examples/audio/audiomix.c
+++ b/tests/examples/audio/audiomix.c
@@ -135,7 +135,7 @@ make_mixer_channel (GstElement * pipeline, GstElement * mix, gchar * file_name)
/* prepare mixer channel */
filesrc = gst_element_factory_make ("filesrc", NULL);
- decodebin = gst_element_factory_make ("decodebin2", NULL);
+ decodebin = gst_element_factory_make ("decodebin", NULL);
volume = gst_element_factory_make ("volume", NULL);
convert = gst_element_factory_make ("audioconvert", NULL);
format = gst_element_factory_make ("capsfilter", NULL);
@@ -148,10 +148,8 @@ make_mixer_channel (GstElement * pipeline, GstElement * mix, gchar * file_name)
g_object_set (filesrc, "location", file_name, NULL);
g_object_set (volume, "volume", (num_vol == 0) ? 1.0 : 0.0, NULL);
- caps = gst_caps_from_string ("audio/x-raw-int, "
- "channels = (int) 2, "
- "endianness = (int) BYTE_ORDER, "
- "width = (int) 16, " "depth = (int) 16, " "signed = (boolean) true");
+ caps = gst_caps_from_string ("audio/x-raw, "
+ "format = (string) S16LE, " "channels = (int) 2");
g_object_set (format, "caps", caps, NULL);
gst_caps_unref (caps);
diff --git a/tests/examples/dynamic/codec-select.c b/tests/examples/dynamic/codec-select.c
index 9018a0842c..bf27dba0b8 100644
--- a/tests/examples/dynamic/codec-select.c
+++ b/tests/examples/dynamic/codec-select.c
@@ -130,8 +130,7 @@ make_pipeline (void)
g_assert (audiocaps);
caps =
- gst_caps_from_string
- ("audio/x-raw-int,signed=true,width=16,depth=16,rate=48000,channels=1");
+ gst_caps_from_string ("audio/x-raw,format=S16LE,rate=48000,channels=1");
g_object_set (audiocaps, "caps", caps, NULL);
gst_caps_unref (caps);
@@ -161,14 +160,11 @@ make_pipeline (void)
/* make caps */
capslist[0] =
- gst_caps_from_string
- ("audio/x-raw-int,signed=true,width=16,depth=16,rate=48000,channels=1");
+ gst_caps_from_string ("audio/x-raw,format=S16LE,rate=48000,channels=1");
capslist[1] =
- gst_caps_from_string
- ("audio/x-raw-int,signed=true,width=16,depth=16,rate=16000,channels=1");
+ gst_caps_from_string ("audio/x-raw,format=S16LE,rate=16000,channels=1");
capslist[2] =
- gst_caps_from_string
- ("audio/x-raw-int,signed=true,width=16,depth=16,rate=8000,channels=1");
+ gst_caps_from_string ("audio/x-raw,format=S16LE,rate=8000,channels=1");
/* create encoder elements */
for (i = 0; i < 3; i++) {
diff --git a/tests/examples/dynamic/sprinkle.c b/tests/examples/dynamic/sprinkle.c
index 722fe9146f..2a513189fd 100644
--- a/tests/examples/dynamic/sprinkle.c
+++ b/tests/examples/dynamic/sprinkle.c
@@ -219,12 +219,9 @@ main (int argc, char *argv[])
convert = gst_element_factory_make ("audioconvert", "convert");
sink = gst_element_factory_make ("autoaudiosink", "sink");
- caps = gst_caps_new_simple ("audio/x-raw-int",
- "endianness", G_TYPE_INT, G_LITTLE_ENDIAN,
- "channels", G_TYPE_INT, 1,
- "width", G_TYPE_INT, 16,
- "depth", G_TYPE_INT, 16,
- "rate", G_TYPE_INT, 44100, "signed", G_TYPE_BOOLEAN, TRUE, NULL);
+ caps = gst_caps_new_simple ("audio/x-raw",
+ "format", G_TYPE_STRING, "S16LE",
+ "channels", G_TYPE_INT, 1, "rate", G_TYPE_INT, 44100, NULL);
g_object_set (filter, "caps", caps, NULL);
gst_caps_unref (caps);
diff --git a/tests/examples/dynamic/sprinkle2.c b/tests/examples/dynamic/sprinkle2.c
index 15ea812040..2bf8b4eae1 100644
--- a/tests/examples/dynamic/sprinkle2.c
+++ b/tests/examples/dynamic/sprinkle2.c
@@ -243,12 +243,9 @@ main (int argc, char *argv[])
convert = gst_element_factory_make ("audioconvert", "convert");
sink = gst_element_factory_make ("autoaudiosink", "sink");
- caps = gst_caps_new_simple ("audio/x-raw-int",
- "endianness", G_TYPE_INT, G_LITTLE_ENDIAN,
- "channels", G_TYPE_INT, 2,
- "width", G_TYPE_INT, 16,
- "depth", G_TYPE_INT, 16,
- "rate", G_TYPE_INT, 44100, "signed", G_TYPE_BOOLEAN, TRUE, NULL);
+ caps = gst_caps_new_simple ("audio/x-raw",
+ "format", G_TYPE_STRING, "S16LE",
+ "channels", G_TYPE_INT, 2, "rate", G_TYPE_INT, 44100, NULL);
g_object_set (filter, "caps", caps, NULL);
gst_caps_unref (caps);
diff --git a/tests/examples/dynamic/sprinkle3.c b/tests/examples/dynamic/sprinkle3.c
index 4b9d80b8bd..79aedad5d2 100644
--- a/tests/examples/dynamic/sprinkle3.c
+++ b/tests/examples/dynamic/sprinkle3.c
@@ -256,12 +256,9 @@ main (int argc, char *argv[])
convert = gst_element_factory_make ("audioconvert", "convert");
sink = gst_element_factory_make ("autoaudiosink", "sink");
- caps = gst_caps_new_simple ("audio/x-raw-int",
- "endianness", G_TYPE_INT, G_LITTLE_ENDIAN,
- "channels", G_TYPE_INT, 2,
- "width", G_TYPE_INT, 16,
- "depth", G_TYPE_INT, 16,
- "rate", G_TYPE_INT, 44100, "signed", G_TYPE_BOOLEAN, TRUE, NULL);
+ caps = gst_caps_new_simple ("audio/x-raw",
+ "format", G_TYPE_STRING, "S16LE",
+ "channels", G_TYPE_INT, 2, "rate", G_TYPE_INT, 44100, NULL);
g_object_set (filter, "caps", caps, NULL);
gst_caps_unref (caps);
diff --git a/tests/examples/encoding/gstcapslist.c b/tests/examples/encoding/gstcapslist.c
index 1e59635214..790e721dff 100644
--- a/tests/examples/encoding/gstcapslist.c
+++ b/tests/examples/encoding/gstcapslist.c
@@ -70,10 +70,8 @@ clear_caps (GstCaps * caps, GstCaps * rescaps)
/* And append to list without duplicates */
while ((st = gst_caps_steal_structure (res, 0))) {
/* Skip fake codecs/containers */
- if (gst_structure_has_name (st, "audio/x-raw-int") ||
- gst_structure_has_name (st, "audio/x-raw-float") ||
- gst_structure_has_name (st, "video/x-raw-yuv") ||
- gst_structure_has_name (st, "video/x-raw-rgb") ||
+ if (gst_structure_has_name (st, "audio/x-raw") ||
+ gst_structure_has_name (st, "video/x-raw") ||
gst_structure_has_name (st, "unknown/unknown")) {
gst_structure_free (st);
continue;
diff --git a/tests/examples/seek/jsseek.c b/tests/examples/seek/jsseek.c
index 4565fd6fd8..6f9454f079 100644
--- a/tests/examples/seek/jsseek.c
+++ b/tests/examples/seek/jsseek.c
@@ -2002,16 +2002,11 @@ shot_cb (GtkButton * button, gpointer data)
GstCaps *caps;
/* convert to our desired format (RGB24) */
- caps = gst_caps_new_simple ("video/x-raw-rgb",
- "bpp", G_TYPE_INT, 24, "depth", G_TYPE_INT, 24,
+ caps = gst_caps_new_simple ("video/x-raw", "format", G_TYPE_STRING, "RGB24",
/* Note: we don't ask for a specific width/height here, so that
* videoscale can adjust dimensions from a non-1/1 pixel aspect
* ratio to a 1/1 pixel-aspect-ratio */
- "pixel-aspect-ratio", GST_TYPE_FRACTION, 1, 1,
- "endianness", G_TYPE_INT, G_BIG_ENDIAN,
- "red_mask", G_TYPE_INT, 0xff0000,
- "green_mask", G_TYPE_INT, 0x00ff00,
- "blue_mask", G_TYPE_INT, 0x0000ff, NULL);
+ "pixel-aspect-ratio", GST_TYPE_FRACTION, 1, 1, NULL);
/* convert the latest frame to the requested format */
g_signal_emit_by_name (pipeline, "convert-frame", caps, &buffer);
diff --git a/tests/examples/snapshot/snapshot.c b/tests/examples/snapshot/snapshot.c
index a63c783fca..b4b3d677d2 100644
--- a/tests/examples/snapshot/snapshot.c
+++ b/tests/examples/snapshot/snapshot.c
@@ -22,7 +22,7 @@
#include
-#define CAPS "video/x-raw-rgb,width=160,pixel-aspect-ratio=1/1,bpp=(int)24,depth=(int)24,endianness=(int)4321,red_mask=(int)0xff0000, green_mask=(int)0x00ff00, blue_mask=(int)0x0000ff"
+#define CAPS "video/x-raw,format=RGB24,width=160,pixel-aspect-ratio=1/1"
int
main (int argc, char *argv[])
diff --git a/tests/icles/input-selector-test.c b/tests/icles/input-selector-test.c
index 4742c03376..386582607d 100644
--- a/tests/icles/input-selector-test.c
+++ b/tests/icles/input-selector-test.c
@@ -120,7 +120,7 @@ main (int argc, char *argv[])
g_object_set (G_OBJECT (src2), "pattern", 1, NULL);
capsfilter = gst_element_factory_make ("capsfilter", "caps0");
g_object_set (G_OBJECT (capsfilter), "caps",
- gst_caps_from_string ("video/x-raw-rgb,width=640,height=480"), NULL);
+ gst_caps_from_string ("video/x-raw,width=640,height=480"), NULL);
video_switch = gst_element_factory_make ("input-selector", "video_switch");
segment = gst_element_factory_make ("identity", "identity-segment");
g_object_set (G_OBJECT (segment), "silent", TRUE, NULL);
diff --git a/tests/icles/test-scale.c b/tests/icles/test-scale.c
index 719adee165..5cdb69b244 100644
--- a/tests/icles/test-scale.c
+++ b/tests/icles/test-scale.c
@@ -119,8 +119,8 @@ main (int argc, char **argv)
/* we prefer our fixed width and height but allow other dimensions to pass
* as well */
capsstr =
- g_strdup_printf ("video/x-raw-rgb, width=(int)%d, height=(int)%d;"
- "video/x-raw-rgb", width, height);
+ g_strdup_printf ("video/x-raw, width=(int)%d, height=(int)%d;"
+ "video/x-raw", width, height);
caps = gst_caps_from_string (capsstr);
g_free (capsstr);
g_object_set (filter, "caps", caps, NULL);
diff --git a/tests/icles/test-textoverlay.c b/tests/icles/test-textoverlay.c
index 22119df3e6..3d3e8fe38f 100644
--- a/tests/icles/test-textoverlay.c
+++ b/tests/icles/test-textoverlay.c
@@ -80,7 +80,7 @@ test_textoverlay (int width, int height)
gint a, b, c;
pstr = g_strdup_printf ("videotestsrc pattern=blue ! "
- "video/x-raw-yuv,width=%d,height=%d ! t.video_sink "
+ "video/x-raw,width=%d,height=%d ! t.video_sink "
"textoverlay name=t font-desc=\"Sans Serif, 20\" ! "
" videoconvert ! videoscale ! autovideosink", width, height);