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

Commits on Nov 24, 2014

  1. Use sync=false on imagesinks as feeds are live. 

    Fixes #30.
    @mithro
    mithro committed Nov 24, 2014

    Verified

    This commit was signed with the committer’s verified signature.
    eramongodb Ezra Chung
    GPG key ID: 169AD805A54FD0F3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e2d91fd View commit details

Commits on Dec 1, 2014

  1. Merge pull request #40 from mithro/sync-false 

    Use sync=false on imagesinks as feeds are live.
    @mithro
    mithro committed Dec 1, 2014
    Copy the full SHA
    7c049da View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 tools/gstaudiovisual.c
  2. +1 −1 tools/gstswitchcapture.c
  3. +1 −1 tools/gstswitchptz.c
  4. +1 −1 tools/gstvideodisp.c
2 changes: 1 addition & 1 deletion tools/gstaudiovisual.c
View file
Original file line number Diff line number Diff line change
@@ -253,7 +253,7 @@ gst_audio_visual_get_pipeline_string (GstAudioVisual * visual)
"font-desc=\"Sans 50\" " "shaded-background=true " "auto-resize=true ");
}
g_string_append_printf (desc, "! autovideoconvert ");
g_string_append_printf (desc, "! xvimagesink name=visual ");
g_string_append_printf (desc, "! xvimagesink name=visual sync=false ");

return desc;
}
2 changes: 1 addition & 1 deletion tools/gstswitchcapture.c
View file
Original file line number Diff line number Diff line change
@@ -142,7 +142,7 @@ gst_switch_capture_pipeline (GstWorker * worker, GstSwitchCapture * capture)
g_string_append_printf (desc, "! camcontrol name=camctl "
"device=%s protocol=%s ", device, protocol);
g_string_append_printf (desc, "! videoconvert ");
g_string_append_printf (desc, "! xvimagesink ");
g_string_append_printf (desc, "! xvimagesink sync=false ");

g_string_append_printf (desc, "video. ! queue2 ");
g_string_append_printf (desc, "! videoconvert ");
2 changes: 1 addition & 1 deletion tools/gstswitchptz.c
View file
Original file line number Diff line number Diff line change
@@ -899,7 +899,7 @@ gst_switch_ptz_get_pipeline (GstSwitchPTZ * ptz)
g_string_append_printf (desc, "v4l2src device=%s ", ptz_video_name);
//g_string_append_printf (desc, "! video/x-raw,width=320,height=240 ");
g_string_append_printf (desc, "! videoconvert ! videoscale ");
g_string_append_printf (desc, "! ximagesink name=sink ");
g_string_append_printf (desc, "! ximagesink name=sink sync=false ");
return desc;
}

2 changes: 1 addition & 1 deletion tools/gstvideodisp.c
View file
Original file line number Diff line number Diff line change
@@ -151,7 +151,7 @@ gst_video_disp_get_pipeline_string (GstVideoDisp * disp)
g_string_append_printf (desc, "! videoconvert ");
g_string_append_printf (desc, "! cairooverlay name=overlay ");
g_string_append_printf (desc, "! videoconvert ");
g_string_append_printf (desc, "! xvimagesink name=sink ");
g_string_append_printf (desc, "! xvimagesink name=sink sync=false ");

return desc;
}