Hi,
On Thu, Jun 24, 2010 at 5:37 PM, <harri.mahonen@xxxxxxxxx> wrote:
> From: Harri Mahonen <harri.mahonen@xxxxxxxxx>
>
> Each time sbc_typefind is called and there is no syncword, sbc_finalize
> never gets called. Instead of hardcoded syncword check, rely on
> sbc_parse to do it properly.
>
> Signed-off-by: Harri Mahonen <harri.mahonen@xxxxxxxxx>
> ---
> audio/gstbluetooth.c | 16 ++++++++++------
> 1 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/audio/gstbluetooth.c b/audio/gstbluetooth.c
> index 26dd4a5..3bc0690 100644
> --- a/audio/gstbluetooth.c
> +++ b/audio/gstbluetooth.c
> @@ -50,21 +50,25 @@ static void sbc_typefind(GstTypeFind *tf, gpointer ignore)
> sbc_t sbc;
> guint8 *data = gst_type_find_peek(tf, 0, 32);
>
> - if (sbc_init(&sbc, 0) < 0)
> + if (data == NULL)
> return;
>
> - if (data == NULL || *data != 0x9c) /* SBC syncword */
> + if (sbc_init(&sbc, 0) < 0)
> return;
>
> aux = g_new(guint8, 32);
> memcpy(aux, data, 32);
> - sbc_parse(&sbc, aux, 32);
> - g_free(aux);
> - caps = gst_sbc_parse_caps_from_sbc(&sbc);
> - sbc_finish(&sbc);
>
> + if (sbc_parse(&sbc, aux, 32) < 0)
> + goto done;
> +
> + caps = gst_sbc_parse_caps_from_sbc(&sbc);
> gst_type_find_suggest(tf, GST_TYPE_FIND_POSSIBLE, caps);
> gst_caps_unref(caps);
> +
> +done:
> + g_free(aux);
> + sbc_finish(&sbc);
> }
>
> static gchar *sbc_exts[] = { "sbc", NULL };
Looks great, but we don't use the signed-off-by thing.
--
Luiz Augusto von Dentz
Computer Engineer
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
