mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-09 21:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

bluedroid/encoder: move EncMaxShiftCounter into SBC_ENC_PARAMS

Browse Source
This commit is contained in:
Matthias Ringwald 2023-11-27 16:25:21 +01:00
parent 31f5917009
commit c0ca5c25f5
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rd-party/bluedroid/encoder/include/sbc_encoder.h vendored
View File

@ -200,6 +200,8 @@ typedef struct SBC_ENC_PARAMS_TAG
SINT32 s32DCTY[16];// = {0};
SINT32 s32X[ENC_VX_BUFFER_SIZE/2];
SINT16 *s16X;//=(SINT16*) s32X; /* s16X must be 32 bits aligned cf SHIFTUP_X8_2*/
// from sbc_encoder
SINT16 EncMaxShiftCounter;
/* BK4BTSTACK_CHANGE END */
}SBC_ENC_PARAMS;

30
3rd-party/bluedroid/encoder/srce/sbc_analysis.c vendored
View File

@ -160,7 +160,7 @@
/* This macro is for 4 subbands */
#define SHIFTUP_X4 \
{ \
ps32X=(SINT32 *)(pstrEncParams->s16X+EncMaxShiftCounter+38); \
ps32X=(SINT32 *)(pstrEncParams->s16X+pstrEncParams->EncMaxShiftCounter+38); \
for (i=0;i<9;i++) \
{ \
*ps32X=*(ps32X-2-(ShiftCounter>>1)); ps32X--; \
@ -169,8 +169,8 @@
}
#define SHIFTUP_X4_2 \
{ \
ps32X=(SINT32 *)(pstrEncParams->s16X+EncMaxShiftCounter+38); \
ps32X2=(SINT32 *)(pstrEncParams->s16X+(EncMaxShiftCounter<<1)+78); \
ps32X=(SINT32 *)(pstrEncParams->s16X+pstrEncParams->EncMaxShiftCounter+38); \
ps32X2=(SINT32 *)(pstrEncParams->s16X+(pstrEncParams->EncMaxShiftCounter<<1)+78); \
for (i=0;i<9;i++) \
{ \
*ps32X=*(ps32X-2-(ShiftCounter>>1)); *(ps32X2)=*(ps32X2-2-(ShiftCounter>>1)); ps32X--; ps32X2--; \
@ -181,7 +181,7 @@
/* This macro is for 8 subbands */
#define SHIFTUP_X8 \
{ \
ps32X=(SINT32 *)(pstrEncParams->s16X+EncMaxShiftCounter+78); \
ps32X=(SINT32 *)(pstrEncParams->s16X+pstrEncParams->EncMaxShiftCounter+78); \
for (i=0;i<9;i++) \
{ \
*ps32X=*(ps32X-4-(ShiftCounter>>1)); ps32X--; \
@ -192,8 +192,8 @@
}
#define SHIFTUP_X8_2 \
{ \
ps32X=(SINT32 *)(pstrEncParams->s16X+EncMaxShiftCounter+78); \
ps32X2=(SINT32 *)(pstrEncParams->s16X+(EncMaxShiftCounter<<1)+158); \
ps32X=(SINT32 *)(pstrEncParams->s16X+pstrEncParams->EncMaxShiftCounter+78); \
ps32X2=(SINT32 *)(pstrEncParams->s16X+(pstrEncParams->EncMaxShiftCounter<<1)+158); \
for (i=0;i<9;i++) \
{ \
*ps32X=*(ps32X-4-(ShiftCounter>>1)); *(ps32X2)=*(ps32X2-4-(ShiftCounter>>1)); ps32X--; ps32X2--; \
@ -888,7 +888,7 @@
#endif
static SINT16 ShiftCounter=0;
extern SINT16 EncMaxShiftCounter;
/****************************************************************************
* SbcAnalysisFilter - performs Analysis of the input audio stream
*
@ -926,11 +926,11 @@ void SbcAnalysisFilter4(SBC_ENC_PARAMS *pstrEncParams)
ps16PcmBuf = pstrEncParams->ps16NextPcmBuffer;
ps32SbBuf = pstrEncParams->s32SbBuffer;
Offset2=(SINT32)(EncMaxShiftCounter+40);
Offset2=(SINT32)(pstrEncParams->EncMaxShiftCounter+40);
for (s32Blk=0; s32Blk <s32NumOfBlocks; s32Blk++)
{
Offset=(SINT32)(EncMaxShiftCounter-ShiftCounter);
Offset=(SINT32)(pstrEncParams->EncMaxShiftCounter-ShiftCounter);
/* Store new samples */
if (s32NumOfChannels==1)
{
@ -962,7 +962,7 @@ void SbcAnalysisFilter4(SBC_ENC_PARAMS *pstrEncParams)
}
if (s32NumOfChannels==1)
{
if (ShiftCounter>=EncMaxShiftCounter)
if (ShiftCounter>=pstrEncParams->EncMaxShiftCounter)
{
SHIFTUP_X4;
ShiftCounter=0;
@ -974,7 +974,7 @@ void SbcAnalysisFilter4(SBC_ENC_PARAMS *pstrEncParams)
}
else
{
if (ShiftCounter>=EncMaxShiftCounter)
if (ShiftCounter>=pstrEncParams->EncMaxShiftCounter)
{
SHIFTUP_X4_2;
ShiftCounter=0;
@ -1019,10 +1019,10 @@ void SbcAnalysisFilter8 (SBC_ENC_PARAMS *pstrEncParams)
ps16PcmBuf = pstrEncParams->ps16NextPcmBuffer;
ps32SbBuf = pstrEncParams->s32SbBuffer;
Offset2=(SINT32)(EncMaxShiftCounter+80);
Offset2=(SINT32)(pstrEncParams->EncMaxShiftCounter+80);
for (s32Blk=0; s32Blk <s32NumOfBlocks; s32Blk++)
{
Offset=(SINT32)(EncMaxShiftCounter-ShiftCounter);
Offset=(SINT32)(pstrEncParams->EncMaxShiftCounter-ShiftCounter);
/* Store new samples */
if (s32NumOfChannels==1)
{
@ -1066,7 +1066,7 @@ void SbcAnalysisFilter8 (SBC_ENC_PARAMS *pstrEncParams)
}
if (s32NumOfChannels==1)
{
if (ShiftCounter>=EncMaxShiftCounter)
if (ShiftCounter>=pstrEncParams->EncMaxShiftCounter)
{
SHIFTUP_X8;
ShiftCounter=0;
@ -1078,7 +1078,7 @@ void SbcAnalysisFilter8 (SBC_ENC_PARAMS *pstrEncParams)
}
else
{
if (ShiftCounter>=EncMaxShiftCounter)
if (ShiftCounter>=pstrEncParams->EncMaxShiftCounter)
{
SHIFTUP_X8_2;
ShiftCounter=0;

8
3rd-party/bluedroid/encoder/srce/sbc_encoder.c vendored
View File

@ -294,16 +294,16 @@ void SBC_Encoder_Init(SBC_ENC_PARAMS *pstrEncParams)
if (pstrEncParams->s16NumOfSubBands==4)
{
if (pstrEncParams->s16NumOfChannels==1)
EncMaxShiftCounter=((ENC_VX_BUFFER_SIZE-(4*10))>>2)<<2;
pstrEncParams->EncMaxShiftCounter=((ENC_VX_BUFFER_SIZE-(4*10))>>2)<<2;
else
EncMaxShiftCounter=((ENC_VX_BUFFER_SIZE-(4*10*2))>>3)<<2;
pstrEncParams->EncMaxShiftCounter=((ENC_VX_BUFFER_SIZE-(4*10*2))>>3)<<2;
}
else
{
if (pstrEncParams->s16NumOfChannels==1)
EncMaxShiftCounter=((ENC_VX_BUFFER_SIZE-(8*10))>>3)<<3;
pstrEncParams->EncMaxShiftCounter=((ENC_VX_BUFFER_SIZE-(8*10))>>3)<<3;
else
EncMaxShiftCounter=((ENC_VX_BUFFER_SIZE-(8*10*2))>>4)<<3;
pstrEncParams->EncMaxShiftCounter=((ENC_VX_BUFFER_SIZE-(8*10*2))>>4)<<3;
}
// APPL_TRACE_EVENT("SBC_Encoder_Init : bitrate %d, bitpool %d",