tests: fix scale test for 1.0

It needs a basetransform patch that makes it prefer the order of
the caps property instead of passthrough.
This commit is contained in:
Wim Taymans 2012-10-04 11:12:42 +02:00
parent 92560517e8
commit 6fa859f679

View file

@ -41,28 +41,20 @@ make_pipeline (gint type)
"ximagesink"); "ximagesink");
break; break;
case 2: case 2:
pstr = g_strdup_printf ("videotestsrc peer-alloc=0 ! videoscale ! " pstr = g_strdup_printf ("videotestsrc ! videoscale ! "
"capsfilter name=filter ! " "ximagesink"); "capsfilter name=filter ! " "ximagesink");
break; break;
case 3: case 3:
pstr = pstr =
g_strdup_printf ("videotestsrc peer-alloc=0 ! queue ! videoscale ! " g_strdup_printf ("videotestsrc ! queue ! videoscale ! "
"capsfilter name=filter ! " "ximagesink"); "capsfilter name=filter ! " "ximagesink");
break; break;
case 4: case 4:
pstr = pstr =
g_strdup_printf ("videotestsrc peer-alloc=0 ! videoscale ! queue ! " g_strdup_printf ("videotestsrc ! videoscale ! queue ! "
"capsfilter name=filter ! " "ximagesink"); "capsfilter name=filter ! " "ximagesink");
break; break;
case 5: case 5:
pstr = g_strdup_printf ("videotestsrc peer-alloc=0 ! "
"capsfilter name=filter ! " "ximagesink");
break;
case 6:
pstr = g_strdup_printf ("videotestsrc ! videoscale ! "
"capsfilter name=filter ! " "ximagesink");
break;
case 7:
pstr = g_strdup_printf ("v4l2src ! videoconvert ! videoscale ! " pstr = g_strdup_printf ("v4l2src ! videoconvert ! videoscale ! "
"capsfilter name=filter ! " "ximagesink"); "capsfilter name=filter ! " "ximagesink");
break; break;
@ -121,6 +113,7 @@ main (int argc, char **argv)
capsstr = capsstr =
g_strdup_printf ("video/x-raw, width=(int)%d, height=(int)%d;" g_strdup_printf ("video/x-raw, width=(int)%d, height=(int)%d;"
"video/x-raw", width, height); "video/x-raw", width, height);
caps = gst_caps_from_string (capsstr); caps = gst_caps_from_string (capsstr);
g_free (capsstr); g_free (capsstr);
g_object_set (filter, "caps", caps, NULL); g_object_set (filter, "caps", caps, NULL);