diff options
author | Andre Eisenbach <andre@broadcom.com> | 2012-09-18 01:35:44 -0700 |
---|---|---|
committer | Matthew Xie <mattx@google.com> | 2012-09-18 16:26:28 -0700 |
commit | 6ef101187774e30ddba6b46bbedef549a42196ad (patch) | |
tree | f36eb347f03083671640fbc750171e3b951e0082 /embdrv/sbc/encoder/include | |
parent | f80d3d045eab5f002be4b5e8a3d2d376fdf7581a (diff) | |
download | external_bluetooth_bluedroid-6ef101187774e30ddba6b46bbedef549a42196ad.zip external_bluetooth_bluedroid-6ef101187774e30ddba6b46bbedef549a42196ad.tar.gz external_bluetooth_bluedroid-6ef101187774e30ddba6b46bbedef549a42196ad.tar.bz2 |
Initual Bluetooth open source release
First release under Apache source license with updated header files
and whitespace cleanups. Also fixed file permission to remove executable
bit from source files.
Change-Id: I7155903edfc2f491c1cbbd0db108f207852caaa0
Diffstat (limited to 'embdrv/sbc/encoder/include')
-rw-r--r-- | embdrv/sbc/encoder/include/sbc_dct.h | 31 | ||||
-rw-r--r-- | embdrv/sbc/encoder/include/sbc_enc_func_declare.h | 33 | ||||
-rw-r--r-- | embdrv/sbc/encoder/include/sbc_encoder.h | 45 | ||||
-rw-r--r-- | embdrv/sbc/encoder/include/sbc_if.h | 21 | ||||
-rw-r--r-- | embdrv/sbc/encoder/include/sbc_types.h | 33 |
5 files changed, 114 insertions, 49 deletions
diff --git a/embdrv/sbc/encoder/include/sbc_dct.h b/embdrv/sbc/encoder/include/sbc_dct.h index be077e2..245e65d 100644 --- a/embdrv/sbc/encoder/include/sbc_dct.h +++ b/embdrv/sbc/encoder/include/sbc_dct.h @@ -1,13 +1,26 @@ /****************************************************************************** -** -** File Name: $RCSfile: sbc_dct.h,v $ -** -** Description: Definitions for the fast DCT. -** -** Copyright (c) 1999-2008, Broadcom Corp., All Rights Reserved. -** Widcomm Bluetooth Core. Proprietary and confidential. -** -******************************************************************************/ + * + * Copyright (C) 1999-2012 Broadcom Corporation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + ******************************************************************************/ + +/****************************************************************************** + * + * Definitions for the fast DCT. + * + ******************************************************************************/ #ifndef SBC_DCT_H #define SBC_DCT_H diff --git a/embdrv/sbc/encoder/include/sbc_enc_func_declare.h b/embdrv/sbc/encoder/include/sbc_enc_func_declare.h index cfe5777..2ac34ff 100644 --- a/embdrv/sbc/encoder/include/sbc_enc_func_declare.h +++ b/embdrv/sbc/encoder/include/sbc_enc_func_declare.h @@ -1,15 +1,26 @@ /****************************************************************************** -** -** File Name: $RCSfile: sbc_enc_func_declare.h,v $ -** -** Description: Function declarations. -** -** Revision : $Id: sbc_enc_func_declare.h,v 1.8 2006/04/13 16:59:58 mjougit Exp $ -** -** Copyright (c) 1999-2002, Widcomm Inc., All Rights Reserved. -** Widcomm Bluetooth Core. Proprietary and confidential. -** -******************************************************************************/ + * + * Copyright (C) 1999-2012 Broadcom Corporation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + ******************************************************************************/ + +/****************************************************************************** + * + * Function declarations. + * + ******************************************************************************/ #ifndef SBC_FUNCDECLARE_H #define SBC_FUNCDECLARE_H diff --git a/embdrv/sbc/encoder/include/sbc_encoder.h b/embdrv/sbc/encoder/include/sbc_encoder.h index b348de8..78ed044 100644 --- a/embdrv/sbc/encoder/include/sbc_encoder.h +++ b/embdrv/sbc/encoder/include/sbc_encoder.h @@ -1,22 +1,33 @@ /****************************************************************************** -** -** File Name: $RCSfile: sbc_encoder.h,v $ -** -** Description: This file contains constants and structures used by Encoder. -** -** Revision : $Id: sbc_encoder.h,v 1.28 2006/06/27 12:29:32 mjougit Exp $ -** -** Copyright (c) 1999-2008, Broadcom Corp., All Rights Reserved. -** Broadcom Bluetooth Core. Proprietary and confidential. -** -******************************************************************************/ + * + * Copyright (C) 1999-2012 Broadcom Corporation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + ******************************************************************************/ + +/****************************************************************************** + * + * This file contains constants and structures used by Encoder. + * + ******************************************************************************/ #ifndef SBC_ENCODER_H #define SBC_ENCODER_H #define ENCODER_VERSION "0025" - -#ifdef BUILDCFG + +#ifdef BUILDCFG #include "bt_target.h" #endif @@ -60,7 +71,7 @@ #define SBC_MAX_NUM_FRAME 1 #endif -#ifndef SBC_DSP_OPT +#ifndef SBC_DSP_OPT #define SBC_DSP_OPT FALSE #endif @@ -101,7 +112,7 @@ /* -> more MIPS required for a better audio quality. comparasion with the SIG utilities shows a division by 10 of the RMS */ /* CAUTION: It only apply in the if SBC_FAST_DCT is set to TRUE */ #ifndef SBC_IS_64_MULT_IN_IDCT -#define SBC_IS_64_MULT_IN_IDCT FALSE +#define SBC_IS_64_MULT_IN_IDCT FALSE #endif /*SBC_IS_64_MULT_IN_IDCT */ /* set SBC_IS_64_MULT_IN_QUANTIZER to TRUE to use 64 bits multiplication in the quantizer */ @@ -126,7 +137,7 @@ #endif #define MINIMUM_ENC_VX_BUFFER_SIZE (8*10*2) -#ifndef ENC_VX_BUFFER_SIZE +#ifndef ENC_VX_BUFFER_SIZE #define ENC_VX_BUFFER_SIZE (MINIMUM_ENC_VX_BUFFER_SIZE + 64) /*#define ENC_VX_BUFFER_SIZE MINIMUM_ENC_VX_BUFFER_SIZE + 1024*/ #endif @@ -148,7 +159,7 @@ typedef struct SBC_ENC_PARAMS_TAG SINT16 s16NumOfChannels; SINT16 s16NumOfBlocks; /* 4, 8, 12 or 16*/ SINT16 s16AllocationMethod; /* loudness or SNR*/ - SINT16 s16BitPool; /* 16*numOfSb for mono & dual; + SINT16 s16BitPool; /* 16*numOfSb for mono & dual; 32*numOfSb for stereo & joint stereo */ UINT16 u16BitRate; UINT8 u8NumPacketToEncode; /* number of sbc frame to encode. Default is 1 */ diff --git a/embdrv/sbc/encoder/include/sbc_if.h b/embdrv/sbc/encoder/include/sbc_if.h index 7e4c2c5..de8dd48 100644 --- a/embdrv/sbc/encoder/include/sbc_if.h +++ b/embdrv/sbc/encoder/include/sbc_if.h @@ -1,3 +1,21 @@ +/****************************************************************************** + * + * Copyright (C) 1999-2012 Broadcom Corporation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + ******************************************************************************/ + #ifndef _SBC_IF_H #define _SBC_IF_H @@ -24,5 +42,6 @@ int SBC_init(int pcm_sample_freq, int channels, int bits_per_sample); return - number of bytes written to sbc_out */ -int SBC_write(unsigned char *pcm_in, int length, unsigned char *sbc_out); +int SBC_write(unsigned char *pcm_in, int length, unsigned char *sbc_out); + #endif diff --git a/embdrv/sbc/encoder/include/sbc_types.h b/embdrv/sbc/encoder/include/sbc_types.h index 531bb2c..d161051 100644 --- a/embdrv/sbc/encoder/include/sbc_types.h +++ b/embdrv/sbc/encoder/include/sbc_types.h @@ -1,15 +1,26 @@ /****************************************************************************** -** -** File Name: $RCSfile: sbc_types.h,v $ -** -** Description: Data type declarations. -** -** Revision : $Id: sbc_types.h,v 1.7 2006/04/11 17:07:39 mjougit Exp $ -** -** Copyright (c) 1999-2008, Broadcom Corp., All Rights Reserved. -** Broadcom Bluetooth Core. Proprietary and confidential. -** -******************************************************************************/ + * + * Copyright (C) 1999-2012 Broadcom Corporation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + ******************************************************************************/ + +/****************************************************************************** + * + * Data type declarations. + * + ******************************************************************************/ #ifndef SBC_TYPES_H #define SBC_TYPES_H |