templ = gst_pad_get_pad_template_caps (base->srcpad);
+ GST_DEBUG_OBJECT (self, "direction %s from caps %" GST_PTR_FORMAT,
+ direction == GST_PAD_SRC ? "src" : "sink", caps);
+
res = gst_caps_new_empty ();
n = gst_caps_get_size (caps);
for (i = 0; i < n; i++) {
/* There's an intersection between the framerates so we can convert
* into CDP with exactly those framerates */
cdp_framerate = gst_structure_get_value (t, "framerate");
- gst_caps_set_value (tmp, "framerate", cdp_framerate);
+ if (gst_value_intersect (NULL, cdp_framerate, framerate)) {
+ gst_caps_set_value (tmp, "framerate", cdp_framerate);
- res = gst_caps_merge (res, tmp);
+ res = gst_caps_merge (res, tmp);
+ } else {
+ gst_clear_caps (&tmp);
+ }
}
/* We can always convert CEA708 to all non-CDP formats */
if (framerate) {
FLAG_SEND_EOS = 1,
};
-GST_START_TEST (cdp_requires_framerate)
+GST_START_TEST (cdp_requires_valid_framerate)
{
GstHarness *h;
GstBuffer *buffer;
gst_harness_set_src_caps_str (h,
"closedcaption/x-cea-708,format=(string)cc_data,framerate=(fraction)30/1");
- fail_unless_equals_int (gst_harness_push (h, buffer), GST_FLOW_OK);
+ fail_unless_equals_int (gst_harness_push (h, gst_buffer_ref (buffer)),
+ GST_FLOW_OK);
+
+ /* Then try with an invalid CDP framerate, this should fail */
+ gst_harness_set_sink_caps_str (h,
+ "closedcaption/x-cea-708,format=(string)cdp");
+ gst_harness_set_src_caps_str (h,
+ "closedcaption/x-cea-708,format=(string)cc_data,framerate=(fraction)29/1");
+
+ fail_unless_equals_int (gst_harness_push (h, buffer),
+ GST_FLOW_NOT_NEGOTIATED);
gst_harness_teardown (h);
}
suite_add_tcase (s, tc);
- tcase_add_test (tc, cdp_requires_framerate);
+ tcase_add_test (tc, cdp_requires_valid_framerate);
tcase_add_test (tc, framerate_passthrough);
tcase_add_test (tc, framerate_changes);
tcase_add_test (tc, framerate_invalid_format);