pidgin/pidgin

media: add videoscale before video sink
release-2.x.y
2016-04-21, Jakub Adam
ae26e3eace57
Parents 5e5e84e8a798
Children 3ac4724fc358
media: add videoscale before video sink

Fixes issue with ximagesink displaying only a corner cut-out of larger
webcam video.

In addition, a patch for ximagesink is needed, ETA GStreamer 1.9.0:

https://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=59d7f9c62ee95dfbb5b450476f73a717e03b7b8c

Backport of Pidgin 3 commit dfadb1bef243.
1 files changed, 6 insertions(+), 3 deletions(-)
  • +6 -3
    libpurple/mediamanager.c
    • --- a/libpurple/mediamanager.c Sun May 15 05:41:39 2016 -0300
    +++ b/libpurple/mediamanager.c Thu Apr 21 09:40:21 2016 +0200
    @@ -1449,7 +1449,7 @@
    (participant == ow->participant)) &&
    !strcmp(session_id, ow->session_id)) {
    GstBus *bus;
    - GstElement *queue, *convert;
    + GstElement *queue, *convert, *scale;
    GstElement *tee = purple_media_get_tee(media,
    session_id, participant);
    @@ -1462,6 +1462,7 @@
    #else
    convert = gst_element_factory_make("ffmpegcolorspace", NULL);
    #endif
    + scale = gst_element_factory_make("videoscale", NULL);
    ow->sink = purple_media_manager_get_element(
    manager, PURPLE_MEDIA_RECV_VIDEO,
    ow->media, ow->session_id,
    @@ -1482,7 +1483,7 @@
    }
    gst_bin_add_many(GST_BIN(GST_ELEMENT_PARENT(tee)),
    - queue, convert, ow->sink, NULL);
    + queue, convert, scale, ow->sink, NULL);
    bus = gst_pipeline_get_bus(GST_PIPELINE(
    manager->priv->pipeline));
    @@ -1491,9 +1492,11 @@
    gst_object_unref(bus);
    gst_element_set_state(ow->sink, GST_STATE_PLAYING);
    + gst_element_set_state(scale, GST_STATE_PLAYING);
    gst_element_set_state(convert, GST_STATE_PLAYING);
    gst_element_set_state(queue, GST_STATE_PLAYING);
    - gst_element_link(convert, ow->sink);
    + gst_element_link(scale, ow->sink);
    + gst_element_link(convert, scale);
    gst_element_link(queue, convert);
    gst_element_link(tee, queue);
    }