mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-07 13:30:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed datas field

Browse source
This commit is contained in:
raghu447 2020-06-03 18:31:50 +05:30 • committed by Wim Taymans
parent d93870fdeb
commit 0d8e030c6e
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
spa/include/spa/param/param.h
View file

@ -75,7 +75,6 @@ enum spa_param_buffers {
SPA_PARAM_BUFFERS_stride, /**< stride of data block memory (Int) */ SPA_PARAM_BUFFERS_stride, /**< stride of data block memory (Int) */
SPA_PARAM_BUFFERS_align, /**< alignment of data block memory (Int) */ SPA_PARAM_BUFFERS_align, /**< alignment of data block memory (Int) */
SPA_PARAM_BUFFERS_dataType, /**< possible memory types (Int, mask of enum spa_data_type) */ SPA_PARAM_BUFFERS_dataType, /**< possible memory types (Int, mask of enum spa_data_type) */
SPA_PARAM_BUFFERS_datas, /**< number of datas (Int) */
}; };
/** properties for SPA_TYPE_OBJECT_ParamMeta */ /** properties for SPA_TYPE_OBJECT_ParamMeta */

10
src/pipewire/buffers.c
View file

@ -239,7 +239,7 @@ int pw_buffers_negotiate(struct pw_context *context, uint32_t flags,
struct spa_pod **params, *param; struct spa_pod **params, *param;
uint8_t buffer[4096]; uint8_t buffer[4096];
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
uint32_t i, offset, n_params, n_datas = 1; uint32_t i, offset, n_params;
uint32_t max_buffers; uint32_t max_buffers;
size_t minsize, stride, align; size_t minsize, stride, align;
uint32_t data_sizes[1]; uint32_t data_sizes[1];
@ -288,7 +288,7 @@ int pw_buffers_negotiate(struct pw_context *context, uint32_t flags,
if (param) { if (param) {
uint32_t qmax_buffers = max_buffers, uint32_t qmax_buffers = max_buffers,
qminsize = minsize, qstride = stride, qalign = align; qminsize = minsize, qstride = stride, qalign = align;
uint32_t qtypes = types, qn_datas = n_datas; uint32_t qtypes = types;
spa_pod_parse_object(param, spa_pod_parse_object(param,
SPA_TYPE_OBJECT_ParamBuffers, NULL, SPA_TYPE_OBJECT_ParamBuffers, NULL,
@ -296,8 +296,7 @@ int pw_buffers_negotiate(struct pw_context *context, uint32_t flags,
SPA_PARAM_BUFFERS_size, SPA_POD_OPT_Int(&qminsize), SPA_PARAM_BUFFERS_size, SPA_POD_OPT_Int(&qminsize),
SPA_PARAM_BUFFERS_stride, SPA_POD_OPT_Int(&qstride), SPA_PARAM_BUFFERS_stride, SPA_POD_OPT_Int(&qstride),
SPA_PARAM_BUFFERS_align, SPA_POD_OPT_Int(&qalign), SPA_PARAM_BUFFERS_align, SPA_POD_OPT_Int(&qalign),
SPA_PARAM_BUFFERS_dataType, SPA_POD_OPT_Int(&qtypes), SPA_PARAM_BUFFERS_dataType, SPA_POD_OPT_Int(&qtypes));
SPA_PARAM_BUFFERS_datas, SPA_POD_OPT_Int(&qn_datas));
max_buffers = max_buffers =
qmax_buffers == 0 ? max_buffers : SPA_MIN(qmax_buffers, qmax_buffers == 0 ? max_buffers : SPA_MIN(qmax_buffers,
@ -306,7 +305,6 @@ int pw_buffers_negotiate(struct pw_context *context, uint32_t flags,
stride = SPA_MAX(stride, qstride); stride = SPA_MAX(stride, qstride);
align = SPA_MAX(align, qalign); align = SPA_MAX(align, qalign);
types = qtypes; types = qtypes;
n_datas = SPA_MAX(n_datas, qn_datas);
pw_log_debug(NAME" %p: %d %d %d %d %d -> %zd %zd %d %zd %d", result, pw_log_debug(NAME" %p: %d %d %d %d %d -> %zd %zd %d %zd %d", result,
qminsize, qstride, qmax_buffers, qalign, qtypes, qminsize, qstride, qmax_buffers, qalign, qtypes,
@ -329,7 +327,7 @@ int pw_buffers_negotiate(struct pw_context *context, uint32_t flags,
max_buffers, max_buffers,
n_params, n_params,
params, params,
n_datas, 1,
data_sizes, data_strides, data_sizes, data_strides,
data_aligns, data_types, data_aligns, data_types,
flags, flags,