From 3f45ccd6a519659cb2842475f4bfe831cefd32ab Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sun, 8 Jul 2018 15:23:28 +0200 Subject: [PATCH] gst: update to current API --- src/gst/gstpipewireclock.c | 6 +++--- src/gst/gstpipewiresink.c | 2 +- src/gst/gstpipewiresrc.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gst/gstpipewireclock.c b/src/gst/gstpipewireclock.c index a82631efe..4c4e47889 100644 --- a/src/gst/gstpipewireclock.c +++ b/src/gst/gstpipewireclock.c @@ -50,12 +50,12 @@ gst_pipewire_clock_get_internal_time (GstClock * clock) pw_stream_get_time (pclock->stream, &t); - if (t.rate) - result = gst_util_uint64_scale_int (t.ticks, GST_SECOND, t.rate); + if (t.rate.denom) + result = gst_util_uint64_scale_int (t.ticks, GST_SECOND * t.rate.num, t.rate.denom); else result = GST_CLOCK_TIME_NONE; - GST_DEBUG ("%"PRId64", %d %"PRId64, t.ticks, t.rate, result); + GST_DEBUG ("%"PRId64", %d %"PRId64, t.ticks, t.rate.denom, result); return result; } diff --git a/src/gst/gstpipewiresink.c b/src/gst/gstpipewiresink.c index 4a9d0d24b..ea4b3eb3e 100644 --- a/src/gst/gstpipewiresink.c +++ b/src/gst/gstpipewiresink.c @@ -225,7 +225,7 @@ pool_activated (GstPipeWirePool *pool, GstPipeWireSink *sink) guint size; guint min_buffers; guint max_buffers; - struct spa_pod *port_params[2]; + const struct spa_pod *port_params[2]; struct spa_pod_builder b = { NULL }; uint8_t buffer[1024]; diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c index 4e6982a3d..568ebfa9b 100644 --- a/src/gst/gstpipewiresrc.c +++ b/src/gst/gstpipewiresrc.c @@ -618,7 +618,7 @@ gst_pipewire_src_negotiate (GstBaseSrc * basesrc) pw_stream_connect (pwsrc->stream, PW_DIRECTION_INPUT, pwsrc->path, - PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_CLOCK_UPDATE, + PW_STREAM_FLAG_AUTOCONNECT, (const struct spa_pod **)possible->pdata, possible->len); g_ptr_array_free (possible, TRUE); @@ -703,7 +703,7 @@ on_format_changed (void *data, gst_caps_unref (caps); if (res) { - struct spa_pod *params[2]; + const struct spa_pod *params[2]; struct spa_pod_builder b = { NULL }; uint8_t buffer[512];