mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gst: improve buffer params

Browse source
This commit is contained in:
Wim Taymans 2018-08-15 21:29:40 +02:00
parent 009f23abaa
commit a3e4c6df99
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/gst/gstpipewiresink.c
View file

@ -214,8 +214,6 @@ gst_pipewire_sink_class_init (GstPipeWireSinkClass * klass)
"PipeWire Sink"); "PipeWire Sink");
} }
#define PROP_RANGE(min,max) 2,min,max
static void static void
pool_activated (GstPipeWirePool *pool, GstPipeWireSink *sink) pool_activated (GstPipeWirePool *pool, GstPipeWireSink *sink)
{ {
@ -236,16 +234,16 @@ pool_activated (GstPipeWirePool *pool, GstPipeWireSink *sink)
spa_pod_builder_push_object (&b, t->param.idBuffers, t->param_buffers.Buffers); spa_pod_builder_push_object (&b, t->param.idBuffers, t->param_buffers.Buffers);
if (size == 0) if (size == 0)
spa_pod_builder_add (&b, spa_pod_builder_add (&b,
":", t->param_buffers.size, "iru", 0, PROP_RANGE(0, INT32_MAX), NULL); ":", t->param_buffers.size, "iru", 0, SPA_POD_PROP_MIN_MAX(0, INT32_MAX), NULL);
else else
spa_pod_builder_add (&b, spa_pod_builder_add (&b,
":", t->param_buffers.size, "ir", size, PROP_RANGE(size, INT32_MAX), NULL); ":", t->param_buffers.size, "iru", size, SPA_POD_PROP_MIN_MAX(size, INT32_MAX), NULL);
spa_pod_builder_add (&b, spa_pod_builder_add (&b,
":", t->param_buffers.stride, "iru", 0, PROP_RANGE(0, INT32_MAX), ":", t->param_buffers.stride, "iru", 0, SPA_POD_PROP_MIN_MAX(0, INT32_MAX),
":", t->param_buffers.buffers, "iru", min_buffers, ":", t->param_buffers.buffers, "iru", min_buffers,
PROP_RANGE(min_buffers, SPA_POD_PROP_MIN_MAX(min_buffers,
max_buffers ? max_buffers : INT32_MAX), max_buffers ? max_buffers : INT32_MAX),
":", t->param_buffers.align, "i", 16, ":", t->param_buffers.align, "i", 16,
NULL); NULL);
port_params[0] = spa_pod_builder_pop (&b); port_params[0] = spa_pod_builder_pop (&b);

8
src/gst/gstpipewiresrc.c
View file

@ -678,8 +678,6 @@ connect_error:
} }
} }
#define SPA_PROP_RANGE(min,max) 2,min,max
static void static void
on_format_changed (void *data, on_format_changed (void *data,
const struct spa_pod *format) const struct spa_pod *format)
@ -709,9 +707,9 @@ on_format_changed (void *data,
spa_pod_builder_init (&b, buffer, sizeof (buffer)); spa_pod_builder_init (&b, buffer, sizeof (buffer));
params[0] = spa_pod_builder_object (&b, params[0] = spa_pod_builder_object (&b,
t->param.idBuffers, t->param_buffers.Buffers, t->param.idBuffers, t->param_buffers.Buffers,
":", t->param_buffers.size, "ir", 0, SPA_PROP_RANGE(0, INT32_MAX), ":", t->param_buffers.size, "iru", 0, SPA_POD_PROP_MIN_MAX(0, INT32_MAX),
":", t->param_buffers.stride, "ir", 0, SPA_PROP_RANGE(0, INT32_MAX), ":", t->param_buffers.stride, "iru", 0, SPA_POD_PROP_MIN_MAX(0, INT32_MAX),
":", t->param_buffers.buffers, "ir", 16, SPA_PROP_RANGE(1, INT32_MAX), ":", t->param_buffers.buffers, "iru", 16, SPA_POD_PROP_MIN_MAX(1, INT32_MAX),
":", t->param_buffers.align, "i", 16); ":", t->param_buffers.align, "i", 16);
params[1] = spa_pod_builder_object (&b, params[1] = spa_pod_builder_object (&b,