Commit 19201c1a authored by Edward Hervey's avatar Edward Hervey

encoding: encoding_profile_get_output_caps => _get_input_caps

Makes more sense name-wise
parent ff92c53e
......@@ -1935,7 +1935,7 @@ gst_encoding_profile_set_preset
gst_encoding_profile_set_restriction
gst_encoding_profile_set_presence
gst_encoding_profile_is_equal
gst_encoding_profile_get_output_caps
gst_encoding_profile_get_input_caps
gst_encoding_profile_get_type_nick
<SUBSECTION container>
GstEncodingContainerProfile
......
......@@ -809,7 +809,7 @@ gst_encoding_profile_is_equal (GstEncodingProfile * a, GstEncodingProfile * b)
/**
* gst_encoding_profile_get_output_caps:
* gst_encoding_profile_get_input_caps:
* @profile: a #GstEncodingProfile
*
* Computes the full output caps that this @profile will be able to consume.
......@@ -820,7 +820,7 @@ gst_encoding_profile_is_equal (GstEncodingProfile * a, GstEncodingProfile * b)
* when you are done with the caps.
*/
GstCaps *
gst_encoding_profile_get_output_caps (GstEncodingProfile * profile)
gst_encoding_profile_get_input_caps (GstEncodingProfile * profile)
{
GstCaps *out, *tmp;
GList *ltmp;
......@@ -835,7 +835,7 @@ gst_encoding_profile_get_output_caps (GstEncodingProfile * profile)
for (ltmp = GST_ENCODING_CONTAINER_PROFILE (profile)->encodingprofiles;
ltmp; ltmp = ltmp->next) {
GstEncodingProfile *sprof = (GstEncodingProfile *) ltmp->data;
gst_caps_merge (res, gst_encoding_profile_get_output_caps (sprof));
gst_caps_merge (res, gst_encoding_profile_get_input_caps (sprof));
}
return res;
}
......
......@@ -143,7 +143,7 @@ void gst_encoding_profile_set_presence(GstEncodingProfile *profile, guint presen
gboolean gst_encoding_profile_is_equal (GstEncodingProfile *a,
GstEncodingProfile *b);
GstCaps * gst_encoding_profile_get_output_caps (GstEncodingProfile *profile);
GstCaps * gst_encoding_profile_get_input_caps (GstEncodingProfile *profile);
const gchar *gst_encoding_profile_get_type_nick (GstEncodingProfile *profile);
......
......@@ -497,7 +497,7 @@ next_unused_stream_profile (GstEncodeBin * ebin, GType ptype, GstCaps * caps)
GstCaps *outcaps;
gboolean res;
outcaps = gst_encoding_profile_get_output_caps (sprof);
outcaps = gst_encoding_profile_get_input_caps (sprof);
GST_DEBUG ("Unknown stream, seeing if it's compatible with %"
GST_PTR_FORMAT, outcaps);
res = gst_caps_can_intersect (outcaps, caps);
......
......@@ -76,7 +76,7 @@ GST_START_TEST (test_profile_creation)
/* Test caps */
test1 = gst_caps_from_string ("video/x-theora; audio/x-vorbis");
test2 = gst_encoding_profile_get_output_caps (encprof);
test2 = gst_encoding_profile_get_input_caps (encprof);
fail_unless (gst_caps_is_equal (test1, test2));
gst_caps_unref (test1);
gst_caps_unref (test2);
......@@ -90,7 +90,7 @@ GST_START_TEST (test_profile_creation)
GST_END_TEST;
GST_START_TEST (test_profile_output_caps)
GST_START_TEST (test_profile_input_caps)
{
GstEncodingProfile *sprof;
GstCaps *vorbis;
......@@ -103,7 +103,7 @@ GST_START_TEST (test_profile_output_caps)
gst_encoding_audio_profile_new (vorbis, NULL, NULL, 0);
fail_if (sprof == NULL);
out = gst_encoding_profile_get_output_caps (sprof);
out = gst_encoding_profile_get_input_caps (sprof);
fail_if (out == NULL);
fail_unless (gst_caps_is_equal (out, vorbis));
gst_caps_unref (out);
......@@ -118,7 +118,7 @@ GST_START_TEST (test_profile_output_caps)
gst_encoding_audio_profile_new (vorbis, NULL, restriction, 0);
fail_if (sprof == NULL);
out = gst_encoding_profile_get_output_caps (sprof);
out = gst_encoding_profile_get_input_caps (sprof);
fail_if (out == NULL);
GST_DEBUG ("got caps %" GST_PTR_FORMAT, out);
fail_unless (gst_caps_is_equal (out, test1));
......@@ -604,7 +604,7 @@ profile_suite (void)
suite_add_tcase (s, tc_chain);
tcase_add_test (tc_chain, test_profile_creation);
tcase_add_test (tc_chain, test_profile_output_caps);
tcase_add_test (tc_chain, test_profile_input_caps);
tcase_add_test (tc_chain, test_target_naming);
tcase_add_test (tc_chain, test_target_profile);
if (can_write) {
......
......@@ -304,7 +304,7 @@ transcode_file (gchar * uri, gchar * outputuri, GstEncodingProfile * prof)
/* Figure out the streams that can be passed as-is to encodebin */
g_object_get (src, "caps", &rescaps, NULL);
rescaps = gst_caps_copy (rescaps);
profilecaps = gst_encoding_profile_get_output_caps (prof);
profilecaps = gst_encoding_profile_get_input_caps (prof);
gst_caps_append (rescaps, profilecaps);
/* Set properties */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment