encoding: encoding_profile_get_output_caps => _get_input_caps

Makes more sense name-wise

diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt
index 0cbfb2ec640e45c5b9d345fe4ac589a7123d30cc..91fb569f68398e02289e27053317e0800c391c80 100644 (file)
--- a/docs/libs/gst-plugins-base-libs-sections.txt
+++ b/docs/libs/gst-plugins-base-libs-sections.txt
@@ -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

diff --git a/gst-libs/gst/pbutils/encoding-profile.c b/gst-libs/gst/pbutils/encoding-profile.c
index 939b0ba1d19ffa7b16bf220037489f4752293096..12300dc7926972f8be2f1d17152badd487046a81 100644 (file)
--- a/gst-libs/gst/pbutils/encoding-profile.c
+++ b/gst-libs/gst/pbutils/encoding-profile.c
@@ -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;
   }

diff --git a/gst-libs/gst/pbutils/encoding-profile.h b/gst-libs/gst/pbutils/encoding-profile.h
index 69d3d634361b70f454aae673309bf4745a437635..86beccaf86a1143a80b345794bc061e5919c23e6 100644 (file)
--- a/gst-libs/gst/pbutils/encoding-profile.h
+++ b/gst-libs/gst/pbutils/encoding-profile.h
@@ -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);
 

diff --git a/gst/encoding/gstencodebin.c b/gst/encoding/gstencodebin.c
index cccc71d7d22a63ecdf8c31fd23af6baa9c7caac9..1d4413207060bc19201702af549346e8bfb2c036 100644 (file)
--- a/gst/encoding/gstencodebin.c
+++ b/gst/encoding/gstencodebin.c
@@ -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);

diff --git a/tests/check/libs/profile.c b/tests/check/libs/profile.c
index 127b8a3f8b6de35130b57b65df0977c9d2f0f2fd..1c9f60af98dd1902f8cacdd07ea3245b6f9fdc55 100644 (file)
--- a/tests/check/libs/profile.c
+++ b/tests/check/libs/profile.c
@@ -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) {

diff --git a/tests/examples/encoding/encoding.c b/tests/examples/encoding/encoding.c
index c668148f8b58540fc055ce14652fb01eba783678..89674ce445071d4cde1efddcfe96b487b73be63c 100644 (file)
--- a/tests/examples/encoding/encoding.c
+++ b/tests/examples/encoding/encoding.c
@@ -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 */