diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-02-19 05:17:08 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-02-19 05:17:08 +0100 |
commit | 2e250aaebb7708b25b5342d8ced657364adedc95 (patch) | |
tree | 5698b90b843d0678350b9ab51d8c4d4d795dc12e /src/modules/bluetooth/sbc.c | |
parent | b0c0106824b47e7b21f022cb0f8dbf5b54a7b269 (diff) | |
parent | 38ded3bb31bc49664641965f856a35f432a8a956 (diff) |
Merge commit '38ded3bb31bc49664641965f856a35f432a8a956'
Diffstat (limited to 'src/modules/bluetooth/sbc.c')
-rw-r--r-- | src/modules/bluetooth/sbc.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/modules/bluetooth/sbc.c b/src/modules/bluetooth/sbc.c index 29258d05..a33ed571 100644 --- a/src/modules/bluetooth/sbc.c +++ b/src/modules/bluetooth/sbc.c @@ -985,7 +985,7 @@ int sbc_decode(sbc_t *sbc, void *input, int input_len, void *output, char *ptr; int i, ch, framelen, samples; - if (!sbc && !input) + if (!sbc || !input) return -EIO; priv = sbc->priv; @@ -1053,7 +1053,7 @@ int sbc_encode(sbc_t *sbc, void *input, int input_len, void *output, const uint8_t *pcm, int16_t X[2][SBC_X_BUFFER_SIZE], int nsamples, int nchannels); - if (!sbc && !input) + if (!sbc || !input) return -EIO; priv = sbc->priv; @@ -1221,6 +1221,20 @@ uint16_t sbc_get_codesize(sbc_t *sbc) return subbands * blocks * channels * 2; } +const char *sbc_get_implementation_info(sbc_t *sbc) +{ + struct sbc_priv *priv; + + if (!sbc) + return NULL; + + priv = sbc->priv; + if (!priv) + return NULL; + + return priv->enc_state.implementation_info; +} + int sbc_reinit(sbc_t *sbc, unsigned long flags) { struct sbc_priv *priv; |