Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: timvideos/gst-switch
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 432741810617
Choose a base ref
...
head repository: timvideos/gst-switch
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1f939e618e3b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 13, 2015

  1. Adding audio caps and making sure caps is part of input.

    @mithro
    mithro committed Jan 13, 2015
    Copy the full SHA
    933156e View commit details

  2. Merge pull request #124 from mithro/caps-everywhere 

    Adding audio caps and making sure caps is part of input.
    @mithro
    mithro committed Jan 13, 2015
    Copy the full SHA
    1f939e6 View commit details
Showing with 7 additions and 5 deletions.
  1. +7 −5 tools/gstcase.c
12 changes: 7 additions & 5 deletions tools/gstcase.c
View file
Original file line number Diff line number Diff line change
@@ -284,19 +284,21 @@ gst_case_get_pipeline_string (GstCase * cas)
gboolean is_audiostream = cas->serve_type == GST_SERVE_AUDIO_STREAM;
GString *desc = g_string_new ("");
const gchar *caps =
is_audiostream ? "" : gst_switch_server_get_video_caps_str ();
is_audiostream ?
"audio/x-raw,rate=48000,channels=2,format=S16LE,layout=interleaved" :
gst_switch_server_get_video_caps_str ();

switch (cas->type) {
case GST_CASE_INPUT_AUDIO:
g_string_append_printf (desc,
"giostreamsrc name=source ! gdpdepay ! interaudiosink name=sink channel=input_%d",
cas->sink_port);
"giostreamsrc name=source ! gdpdepay ! %s ! interaudiosink name=sink channel=input_%d",
caps, cas->sink_port);
break;

case GST_CASE_INPUT_VIDEO:
g_string_append_printf (desc,
"giostreamsrc name=source ! gdpdepay ! intervideosink name=sink channel=input_%d",
cas->sink_port);
"giostreamsrc name=source ! gdpdepay ! %s ! intervideosink name=sink channel=input_%d",
caps, cas->sink_port);
break;

case GST_CASE_PREVIEW: