fix more caps

This commit is contained in:
Wim Taymans 2012-09-14 13:30:37 +02:00
parent 58ce9de7a5
commit 829c80ce6c
14 changed files with 15 additions and 14 deletions

View file

@ -26,7 +26,7 @@
* <refsect2> * <refsect2>
* <title>Example launch line</title> * <title>Example launch line</title>
* |[ * |[
* gst-launch-1.0 videotestsrc num-buffers=50 ! video/x-raw-yuv, framerate='(fraction)'5/1 ! jpegenc ! avimux ! filesink location=mjpeg.avi * gst-launch-1.0 videotestsrc num-buffers=50 ! video/x-raw, framerate='(fraction)'5/1 ! jpegenc ! avimux ! filesink location=mjpeg.avi
* ]| a pipeline to mux 5 JPEG frames per second into a 10 sec. long motion jpeg * ]| a pipeline to mux 5 JPEG frames per second into a 10 sec. long motion jpeg
* avi. * avi.
* </refsect2> * </refsect2>

View file

@ -27,7 +27,7 @@
* <refsect2> * <refsect2>
* <title>Sample pipelines</title> * <title>Sample pipelines</title>
* |[ * |[
* gst-launch-1.0 videotestsrc ! video/x-raw-yuv, framerate='(fraction)'5/1 ! jpegenc ! multipartmux ! filesink location=/tmp/test.multipart * gst-launch-1.0 videotestsrc ! video/x-raw, framerate='(fraction)'5/1 ! jpegenc ! multipartmux ! filesink location=/tmp/test.multipart
* ]| a pipeline to mux 5 JPEG frames per second into a multipart stream * ]| a pipeline to mux 5 JPEG frames per second into a multipart stream
* stored to a file. * stored to a file.
* </refsect2> * </refsect2>

View file

@ -274,7 +274,7 @@ Some gst-launch-1.0 lines:
gst-launch-0.10 -v videotestsrc ! ffenc_h263p ! rtph263ppay ! udpsink gst-launch-0.10 -v videotestsrc ! ffenc_h263p ! rtph263ppay ! udpsink
Setting pipeline to PAUSED ... Setting pipeline to PAUSED ...
/pipeline0/videotestsrc0.src: caps = video/x-raw-yuv, format=(fourcc)I420, /pipeline0/videotestsrc0.src: caps = video/x-raw, format=(string)I420,
width=(int)320, height=(int)240, framerate=(fraction)30/1 width=(int)320, height=(int)240, framerate=(fraction)30/1
Pipeline is PREROLLING ... Pipeline is PREROLLING ...
.... ....

View file

@ -29,7 +29,7 @@
* <refsect2> * <refsect2>
* <title>Example launch line</title> * <title>Example launch line</title>
* |[ * |[
* gst-launch-1.0 -v videotestsrc ! video/x-raw-rgb,height=640,width=480 ! aspectratiocrop aspect-ratio=16/9 ! ximagesink * gst-launch-1.0 -v videotestsrc ! video/x-raw,height=640,width=480 ! aspectratiocrop aspect-ratio=16/9 ! ximagesink
* ]| This pipeline generates a videostream in 4/3 and crops it to 16/9. * ]| This pipeline generates a videostream in 4/3 and crops it to 16/9.
* </refsect2> * </refsect2>
*/ */

View file

@ -29,7 +29,7 @@
* (write everything in one line, without the backslash characters) * (write everything in one line, without the backslash characters)
* <programlisting> * <programlisting>
* gst-launch-0.10 videotestsrc num-buffers=250 \ * gst-launch-0.10 videotestsrc num-buffers=250 \
* ! 'video/x-raw-yuv,format=(fourcc)I420,width=320,height=240,framerate=(fraction)25/1' \ * ! 'video/x-raw,format=(string)I420,width=320,height=240,framerate=(fraction)25/1' \
* ! y4menc ! filesink location=test.yuv * ! y4menc ! filesink location=test.yuv
* </programlisting> * </programlisting>
* </para> * </para>

View file

@ -148,7 +148,8 @@ main (int argc, char *argv[])
/* Force float32 samples */ /* Force float32 samples */
capsfilter = gst_element_factory_make ("capsfilter", "capsfilter"); capsfilter = gst_element_factory_make ("capsfilter", "capsfilter");
caps = caps =
gst_caps_new_simple ("audio/x-raw-float", "width", G_TYPE_INT, 32, NULL); gst_caps_new_simple ("audio/x-raw", "format", G_TYPE_STRING, "F32LE",
NULL);
g_object_set (capsfilter, "caps", caps, NULL); g_object_set (capsfilter, "caps", caps, NULL);
equalizer = gst_element_factory_make ("equalizer-nbands", "equalizer"); equalizer = gst_element_factory_make ("equalizer-nbands", "equalizer");

View file

@ -3,7 +3,7 @@
# A simple RTP server # A simple RTP server
# #
VCAPS="video/x-raw-yuv,width=352,height=288,framerate=15/1" VCAPS="video/x-raw,width=352,height=288,framerate=15/1"
gst-launch-1.0 -v gstrtpbin name=rtpbin \ gst-launch-1.0 -v gstrtpbin name=rtpbin \
videotestsrc ! $VCAPS ! ffenc_h263p ! rtph263ppay ! rtpbin.send_rtp_sink_0 \ videotestsrc ! $VCAPS ! ffenc_h263p ! rtph263ppay ! rtpbin.send_rtp_sink_0 \

View file

@ -30,7 +30,7 @@ AOFFSET=0
# H263+ encode from the source # H263+ encode from the source
VELEM="videotestsrc is-live=1" VELEM="videotestsrc is-live=1"
VCAPS="video/x-raw-yuv,width=352,height=288,framerate=15/1" VCAPS="video/x-raw,width=352,height=288,framerate=15/1"
VSOURCE="$VELEM ! $VCAPS" VSOURCE="$VELEM ! $VCAPS"
VENC="ffenc_h263p ! rtph263ppay" VENC="ffenc_h263p ! rtph263ppay"

View file

@ -14,7 +14,7 @@
AOFFSET=0 AOFFSET=0
VOFFSET=0 VOFFSET=0
VCAPS="video/x-raw-yuv,width=352,height=288,framerate=15/1" VCAPS="video/x-raw,width=352,height=288,framerate=15/1"
# video and audio encoding and payloading # video and audio encoding and payloading
VENCPAY="ffenc_h263p ! rtph263ppay" VENCPAY="ffenc_h263p ! rtph263ppay"

View file

@ -9,7 +9,7 @@
AOFFSET=0 AOFFSET=0
VOFFSET=0 VOFFSET=0
VCAPS="video/x-raw-yuv,width=352,height=288,framerate=15/1" VCAPS="video/x-raw,width=352,height=288,framerate=15/1"
#DEST=192.168.1.126 #DEST=192.168.1.126
DEST=localhost DEST=localhost

View file

@ -49,7 +49,7 @@ AOFFSET=0
# H264 encode from the source # H264 encode from the source
VELEM="v4l2src" VELEM="v4l2src"
#VELEM="videotestsrc is-live=1" #VELEM="videotestsrc is-live=1"
VCAPS="video/x-raw-yuv,width=352,height=288,framerate=15/1" VCAPS="video/x-raw,width=352,height=288,framerate=15/1"
VSOURCE="$VELEM ! queue ! videorate ! videoconvert ! $VCAPS" VSOURCE="$VELEM ! queue ! videorate ! videoconvert ! $VCAPS"
VENC="x264enc tune=zerolatency byte-stream=true bitrate=300 ! rtph264pay" VENC="x264enc tune=zerolatency byte-stream=true bitrate=300 ! rtph264pay"

View file

@ -83,7 +83,7 @@ main (gint argc, gchar ** argv)
pipeline_string = pipeline_string =
g_strdup_printf g_strdup_printf
("videotestsrc ! video/x-raw-yuv,format=(fourcc)AYUV,width=640,height=480 ! shapewipe name=shape border=%f ! videomixer name=mixer ! videoconvert ! autovideosink filesrc location=%s ! typefind ! decodebin2 ! videoconvert ! videoscale ! queue ! shape.mask_sink videotestsrc pattern=snow ! video/x-raw-yuv,format=(fourcc)AYUV,width=640,height=480 ! queue ! mixer.", ("videotestsrc ! video/x-raw,format=(string)AYUV,width=640,height=480 ! shapewipe name=shape border=%f ! videomixer name=mixer ! videoconvert ! autovideosink filesrc location=%s ! typefind ! decodebin2 ! videoconvert ! videoscale ! queue ! shape.mask_sink videotestsrc pattern=snow ! video/x-raw,format=(string)AYUV,width=640,height=480 ! queue ! mixer.",
border, argv[1]); border, argv[1]);
pipeline = gst_parse_launch (pipeline_string, NULL); pipeline = gst_parse_launch (pipeline_string, NULL);

View file

@ -146,7 +146,7 @@ main (gint argc, gchar ** argv)
} }
caps = caps =
gst_caps_from_string gst_caps_from_string
("video/x-raw-yuv, width=640, height=480, framerate=(fraction)15/1"); ("video/x-raw, width=640, height=480, framerate=(fraction)15/1");
g_object_set (fmt, "caps", caps, NULL); g_object_set (fmt, "caps", caps, NULL);
if (!(src = gst_element_factory_make ("v4l2src", NULL))) { if (!(src = gst_element_factory_make ("v4l2src", NULL))) {

View file

@ -77,7 +77,7 @@ new_decoded_pad (GstElement * dec, GstPad * new_pad, gboolean last,
s = gst_caps_get_structure (caps, 0); s = gst_caps_get_structure (caps, 0);
sname = gst_structure_get_name (s); sname = gst_structure_get_name (s);
if (!g_str_has_prefix (sname, "video/x-raw-")) if (!g_str_has_prefix (sname, "video/x-raw"))
goto not_video; goto not_video;
csp = create_element ("videoconvert"); csp = create_element ("videoconvert");