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: e2e249101e38
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: db47727011af
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Jan 14, 2015

  1. s/queue2/queue

    @mithro
    mithro committed Jan 14, 2015

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4c08801 View commit details

  2. Merge pull request #131 from mithro/kill-queue2 

    s/queue2/queue
    @mithro
    mithro committed Jan 14, 2015
    Copy the full SHA
    db47727 View commit details
Showing with 15 additions and 15 deletions.
  1. +2 −2 tools/gstaudiovisual.c
  2. +4 −4 tools/gstcase.c
  3. +7 −7 tools/gstcomposite.c
  4. +2 −2 tools/gstswitchcapture.c
4 changes: 2 additions & 2 deletions tools/gstaudiovisual.c
View file
Original file line number Diff line number Diff line change
@@ -245,11 +245,11 @@ gst_audio_visual_get_pipeline_string (GstAudioVisual * visual)
if (visual->active) {
g_string_append_printf (
desc,
"a. ! queue2 ! audioconvert ! level name=level message=true !"
"a. ! queue ! audioconvert ! level name=level message=true !"
" autoaudiosink name=play sync=false\n");
}

g_string_append_printf (desc, "a. ! queue2 ! audioconvert ! monoscope ");
g_string_append_printf (desc, "a. ! queue ! audioconvert ! monoscope ");
if (visual->active) {
g_string_append_printf (desc, "! textoverlay text=\"active\" "
"font-desc=\"Sans 50\" " "shaded-background=true " "auto-resize=true ");
8 changes: 4 additions & 4 deletions tools/gstcase.c
View file
Original file line number Diff line number Diff line change
@@ -316,8 +316,8 @@ gst_case_get_pipeline_string (GstCase * cas)
case GST_CASE_COMPOSITE_AUDIO:
g_string_append_printf (desc,
"interaudiosrc name=source channel=input_%d ! audioparse raw-format=s16le rate=48000 ! tee name=s "
"s. ! queue2 ! interaudiosink name=sink1 channel=branch_%d "
"s. ! queue2 ! interaudiosink name=sink2 channel=composite_audio",
"s. ! queue ! interaudiosink name=sink1 channel=branch_%d "
"s. ! queue ! interaudiosink name=sink2 channel=composite_audio",
cas->sink_port, cas->sink_port);
break;

@@ -327,8 +327,8 @@ gst_case_get_pipeline_string (GstCase * cas)
gchar *channel = cas->type == GST_CASE_COMPOSITE_VIDEO_A ? "a" : "b";
g_string_append_printf (desc,
"intervideosrc name=source channel=input_%d ! %s ! tee name=s "
"s. ! queue2 ! intervideosink name=sink1 channel=branch_%d "
"s. ! queue2 ! intervideosink name=sink2 channel=composite_%s",
"s. ! queue ! intervideosink name=sink1 channel=branch_%d "
"s. ! queue ! intervideosink name=sink2 channel=composite_%s",
cas->sink_port, caps, cas->sink_port, channel);
break;
}
14 changes: 7 additions & 7 deletions tools/gstcomposite.c
View file
Original file line number Diff line number Diff line change
@@ -432,7 +432,7 @@ gst_composite_get_pipeline_string (GstComposite * composite)
/*
ASSESS ("assess-compose-a-source");
*/
g_string_append_printf (desc, "! queue2 ");
g_string_append_printf (desc, "! queue ");
g_string_append_printf (desc, "! identity name=mix ");
} else {
g_string_append_printf (desc,
@@ -452,7 +452,7 @@ gst_composite_get_pipeline_string (GstComposite * composite)
"source_b. ! video/x-raw,width=%d,height=%d ",
composite->b_width, composite->b_height);
ASSESS ("assess-compose-b-source");
g_string_append_printf (desc, "! queue2 ");
g_string_append_printf (desc, "! queue ");
#if 0
if (composite->width != composite->b_width ||
composite->height != composite->b_height) {
@@ -471,7 +471,7 @@ gst_composite_get_pipeline_string (GstComposite * composite)
"source_a. ! video/x-raw,width=%d,height=%d ",
composite->a_width, composite->a_height);
ASSESS ("assess-compose-a-source");
g_string_append_printf (desc, "! queue2 ");
g_string_append_printf (desc, "! queue ");
#if 0
if (composite->width != composite->a_width ||
composite->height != composite->a_height) {
@@ -491,7 +491,7 @@ gst_composite_get_pipeline_string (GstComposite * composite)
ASSESS ("assess-compose-result");
g_string_append_printf (desc, "! tee name=result ");

g_string_append_printf (desc, "result. ! queue2 ");
g_string_append_printf (desc, "result. ! queue ");
/*
ASSESS ("assess-compose-to-output");
*/
@@ -500,7 +500,7 @@ gst_composite_get_pipeline_string (GstComposite * composite)
"intervideosink name=out channel=composite_out ");

if (opts.record_filename) {
g_string_append_printf (desc, "result. ! queue2 ");
g_string_append_printf (desc, "result. ! queue ");
/*
ASSESS ("assess-compose-to-record");
*/
@@ -536,7 +536,7 @@ gst_composite_get_scaler_string (GstWorker * worker, GstComposite * composite)
g_string_append_printf (desc,
"source_a. ! video/x-raw,width=%d,height=%d ",
composite->width, composite->height);
g_string_append_printf (desc, "! queue2 ");
g_string_append_printf (desc, "! queue ");
/*
g_string_append_printf (desc,
"! videoconvert ! facedetect2 ! speakertrack ! videoconvert ");
@@ -555,7 +555,7 @@ gst_composite_get_scaler_string (GstWorker * worker, GstComposite * composite)
g_string_append_printf (desc,
"source_b. ! video/x-raw,width=%d,height=%d ",
composite->width, composite->height);
g_string_append_printf (desc, "! queue2 ");
g_string_append_printf (desc, "! queue ");
/*
g_string_append_printf (desc,
"! videoconvert ! facedetect2 ! speakertrack ! videoconvert ");
4 changes: 2 additions & 2 deletions tools/gstswitchcapture.c
View file
Original file line number Diff line number Diff line change
@@ -141,7 +141,7 @@ gst_switch_capture_pipeline (GstWorker * worker, GstSwitchCapture * capture)
g_string_append_printf (desc, "! tee name=video ");
}

g_string_append_printf (desc, "video. ! queue2 ");
g_string_append_printf (desc, "video. ! queue ");
g_string_append_printf (desc,
"! videoscale ! video/x-raw,width=%d,height=%d ",
GST_SWITCH_FACEDETECT_FRAME_WIDTH, GST_SWITCH_FACEDETECT_FRAME_HEIGHT);
@@ -153,7 +153,7 @@ gst_switch_capture_pipeline (GstWorker * worker, GstSwitchCapture * capture)
g_string_append_printf (desc, "! videoconvert ");
g_string_append_printf (desc, "! xvimagesink sync=false ");

g_string_append_printf (desc, "video. ! queue2 ");
g_string_append_printf (desc, "video. ! queue ");
g_string_append_printf (desc, "! videoconvert ");
g_string_append_printf (desc, "! videoscale "
"! video/x-raw,format=I420,width=%d,height=%d ", w, h);