summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChisato Kenmochi <Chisato.Kenmochi@sony.com>2017-02-22 18:16:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-22 18:16:40 +0000
commitb1441860aa50232bdb9a40f28b6dd108ab787661 (patch)
treeace1439cb2d6520c45ad4db9b71b6c78ae398b22
parent96b847eb0ee944d18337933467b21da5d311ef23 (diff)
parent4f80eeb6e684ac1964c7388d1e74a3c93db4f9c0 (diff)
downloadlibldac-b1441860aa50232bdb9a40f28b6dd108ab787661.tar.gz
Updated to suppress some warnings. am: f1540a7a01
am: 4f80eeb6e6 Change-Id: I07ab053509248217bb0d24dfa029c1509c00e863
-rw-r--r--Android.bp2
-rw-r--r--src/bitalloc_sub_ldac.c4
-rw-r--r--src/ldacBT_api.c12
3 files changed, 9 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index e87603c..cf5087e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,5 +12,5 @@ cc_library_shared {
],
// -D_32BIT_FIXED_POINT should be added to cflags for devices without a FPU
// unit such as ARM Cortex-R series or external 32-bit DSPs.
- cflags: ["-O2"],
+ cflags: ["-O2", "-Werror"],
}
diff --git a/src/bitalloc_sub_ldac.c b/src/bitalloc_sub_ldac.c
index bd8d717..d77a21b 100644
--- a/src/bitalloc_sub_ldac.c
+++ b/src/bitalloc_sub_ldac.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 - 2016 Sony Corporation
+ * Copyright (C) 2003 - 2017 Sony Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
Calculate Bits for Band Info
***************************************************************************************************/
static int encode_band_info_ldac(
-AB *p_ab)
+__attribute__((unused)) AB *p_ab)
{
int nbits;
diff --git a/src/ldacBT_api.c b/src/ldacBT_api.c
index af45394..a490a62 100644
--- a/src/ldacBT_api.c
+++ b/src/ldacBT_api.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 - 2016 Sony Corporation
+ * Copyright (C) 2013 - 2017 Sony Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
/* Get LDAC library version */
-#define LDACBT_LIB_VER_MAJOR 1
-#define LDACBT_LIB_VER_MINOR 2
-#define LDACBT_LIB_VER_BRANCH 0
+#define LDACBT_LIB_VER_MAJOR 2
+#define LDACBT_LIB_VER_MINOR 0
+#define LDACBT_LIB_VER_BRANCH 2
LDACBT_API int ldacBT_get_version( void )
{
return ((LDACBT_LIB_VER_MAJOR)<<16)|((LDACBT_LIB_VER_MINOR)<<8)|(LDACBT_LIB_VER_BRANCH);
@@ -547,7 +547,7 @@ LDACBT_API int ldacBT_encode( HANDLE_LDAC_BT hLdacBT, void *p_pcm, int *pcm_used
}
p_pcm_ring_r = ppcmring->buf + ppcmring->rp;
ldacBT_prepare_pcm_encode( p_pcm_ring_r, hLdacBT->pp_pcm, hLdacBT->frm_samples, ch, fmt );
- result = ldaclib_encode(hLdacBT->hLDAC, hLdacBT->pp_pcm, fmt,
+ result = ldaclib_encode(hLdacBT->hLDAC, hLdacBT->pp_pcm, (LDAC_SMPL_FMT_T)fmt,
p_ldac_transport_frame+LDACBT_FRMHDRBYTES, &frmlen_wrote);
if( !LDAC_FAILED(result) ){
ppcmring->rp += hLdacBT->frm_samples * wl * ch;
@@ -556,7 +556,7 @@ LDACBT_API int ldacBT_encode( HANDLE_LDAC_BT hLdacBT, void *p_pcm, int *pcm_used
if( ppcmring->nsmpl < 0 ){ ppcmring->nsmpl = 0; }
}
}else{
- result = ldaclib_flush_encode(hLdacBT->hLDAC, fmt,
+ result = ldaclib_flush_encode(hLdacBT->hLDAC, (LDAC_SMPL_FMT_T)fmt,
p_ldac_transport_frame+LDACBT_FRMHDRBYTES, &frmlen_wrote);
hLdacBT->flg_encode_flushed = TRUE;
}