mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-04 09:42:19 +00:00
freeverb: remove channel-mask from caps
The channel-mask is only needed for channels>2 which we don't do.
This commit is contained in:
parent
e6e1479b75
commit
57ff02f485
1 changed files with 7 additions and 8 deletions
|
@ -76,12 +76,8 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
|
||||||
GST_PAD_ALWAYS,
|
GST_PAD_ALWAYS,
|
||||||
GST_STATIC_CAPS ("audio/x-raw, "
|
GST_STATIC_CAPS ("audio/x-raw, "
|
||||||
"format = (string) { " GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (S16) "}, "
|
"format = (string) { " GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (S16) "}, "
|
||||||
"rate = (int) [ 1, MAX ], " "channels = (int) 1, "
|
"rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ], "
|
||||||
"layout = (string) interleaved;"
|
"layout = (string) interleaved")
|
||||||
"audio/x-raw, "
|
|
||||||
"format = (string) { " GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (S16) "}, "
|
|
||||||
"rate = (int) [ 1, MAX ], " "channels = (int) 2, "
|
|
||||||
"layout = (string) interleaved, " "channel-mask = (bitmask) 0x3")
|
|
||||||
);
|
);
|
||||||
|
|
||||||
static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
|
static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
|
||||||
|
@ -90,7 +86,7 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
|
||||||
GST_STATIC_CAPS ("audio/x-raw, "
|
GST_STATIC_CAPS ("audio/x-raw, "
|
||||||
"format = (string) { " GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (S16) "}, "
|
"format = (string) { " GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (S16) "}, "
|
||||||
"rate = (int) [ 1, MAX ], " "channels = (int) 2, "
|
"rate = (int) [ 1, MAX ], " "channels = (int) 2, "
|
||||||
"layout = (string) interleaved, " "channel-mask = (bitmask) 0x3")
|
"layout = (string) interleaved")
|
||||||
);
|
);
|
||||||
|
|
||||||
G_DEFINE_TYPE_WITH_CODE (GstFreeverb, gst_freeverb, GST_TYPE_BASE_TRANSFORM,
|
G_DEFINE_TYPE_WITH_CODE (GstFreeverb, gst_freeverb, GST_TYPE_BASE_TRANSFORM,
|
||||||
|
@ -640,11 +636,11 @@ gst_freeverb_transform_caps (GstBaseTransform * base,
|
||||||
if (direction == GST_PAD_SRC) {
|
if (direction == GST_PAD_SRC) {
|
||||||
GST_INFO_OBJECT (base, "[%d] allow 1-2 channels", i);
|
GST_INFO_OBJECT (base, "[%d] allow 1-2 channels", i);
|
||||||
gst_structure_set (structure, "channels", GST_TYPE_INT_RANGE, 1, 2, NULL);
|
gst_structure_set (structure, "channels", GST_TYPE_INT_RANGE, 1, 2, NULL);
|
||||||
gst_structure_remove_field (structure, "channel-mask");
|
|
||||||
} else {
|
} else {
|
||||||
GST_INFO_OBJECT (base, "[%d] allow 2 channels", i);
|
GST_INFO_OBJECT (base, "[%d] allow 2 channels", i);
|
||||||
gst_structure_set (structure, "channels", G_TYPE_INT, 2, NULL);
|
gst_structure_set (structure, "channels", G_TYPE_INT, 2, NULL);
|
||||||
}
|
}
|
||||||
|
gst_structure_remove_field (structure, "channel-mask");
|
||||||
}
|
}
|
||||||
GST_DEBUG_OBJECT (base, "transformed %" GST_PTR_FORMAT, res);
|
GST_DEBUG_OBJECT (base, "transformed %" GST_PTR_FORMAT, res);
|
||||||
|
|
||||||
|
@ -673,6 +669,9 @@ gst_freeverb_set_caps (GstBaseTransform * base, GstCaps * incaps,
|
||||||
if (!gst_audio_info_from_caps (&info, incaps))
|
if (!gst_audio_info_from_caps (&info, incaps))
|
||||||
goto no_format;
|
goto no_format;
|
||||||
|
|
||||||
|
GST_DEBUG ("try to process %d input with %d channels",
|
||||||
|
GST_AUDIO_INFO_FORMAT (&info), GST_AUDIO_INFO_CHANNELS (&info));
|
||||||
|
|
||||||
if (!gst_freeverb_set_process_function (filter, &info))
|
if (!gst_freeverb_set_process_function (filter, &info))
|
||||||
goto no_format;
|
goto no_format;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue