upstream samplerate support 48K

in optek link two way mode

upstream samplerate support 48K
in optek link two way mode
luozhesi
1 parent 7b3077d0
Showing 7 changed files with 66 additions and 15 deletions
bin/Optek_HiFi3_prod/Debug/BlueSea_OPTEK_LINK_SDK
source/codec/lc3_dec/xa_lc3_decoder_sample_testbench.c
source/common/app_cmd.c
source/common/audio/audio_dec.c
source/common/oem_BlueSea.h
source/media/bt_hci/optek_link.c
source/media/bt_hci/optek_link.h
--- a/bin/Optek_HiFi3_prod/Debug/BlueSea_OPTEK_LINK_SDK
View file @ef23a3c
+++ b/bin/Optek_HiFi3_prod/Debug/BlueSea_OPTEK_LINK_SDK
View file @ef23a3c
--- a/source/codec/lc3_dec/xa_lc3_decoder_sample_testbench.c
View file @ef23a3c
+++ b/source/codec/lc3_dec/xa_lc3_decoder_sample_testbench.c
View file @ef23a3c
@@ -377,7 +377,11 @@ XA_ERRORCODE xa_lc3_dec_main_process_init(U32 bitrate,U16 samplerate,U8 channels
     if (app_main_data.share_link_role == SL_ROLE_MASTER)
     {
          if (frame_Time_ms == 5.0)
+            #ifdef UPSTREAM_SAMPLERATE_48k
+            arg.enc_frame_bytes =  30;
+            #else
             arg.enc_frame_bytes =  25;
+            #endif
         else
             arg.enc_frame_bytes =  37;
@@ -729,7 +733,7 @@ void lc3_dec_main_process_init(void)
 {
 	codec_malloc_init ();
     nedd_decode_frames = 0;
-    if (optek_link_mode == BC_SF44K_T7_R1_PT5MS)
+    if (optek_link_mode == BC_SF44K_T7_R1_PT5MS || optek_link_mode == BC_SF44K_PT5MS)
     {
         app_main_data.playing_stream_sample_rate = 44100;
     }
@@ -780,10 +784,17 @@ void lc3_dec_main_process_init_for_master(void)
         }
         else
         {
-            if (xa_lc3_dec_main_process_init(40000,24000,1,5.0) != XA_NO_ERROR)
+            #ifdef UPSTREAM_SAMPLERATE_48k
+            if (xa_lc3_dec_main_process_init(48000,48000,1,5.0) != XA_NO_ERROR)
             {
                 DBG_Printf("lc3 dec error!--\r\n");
             }
+            #else
+            if (xa_lc3_dec_main_process_init(40000,24000,1,5.0) != XA_NO_ERROR)
+            {
+                DBG_Printf("lc3 dec error!--\r\n");
+            }            
+            #endif
         }
     }
--- a/source/common/app_cmd.c
View file @ef23a3c
+++ b/source/common/app_cmd.c
View file @ef23a3c
@@ -695,7 +695,11 @@ void app_nav_rmt_convert_aux(void)
 		#if  defined OPL_MODE_TWO_WAY || defined OPL_MODE_SINGLE_WAY
 		#if 1
-		app_change_mode_req(GAME_HEADPHONE_PT_5MS_LP,100,51);
+		#ifdef UPSTREAM_SAMPLERATE_48k
+		app_change_mode_req(GAME_HEADPHONE_PT_5MS_LP,100,60);
+		#else
+		app_change_mode_req(GAME_HEADPHONE_PT_5MS_LP,100,50);
+		#endif
 		#else
 		if (optek_link_mode == GAME_HEADPHONE_PT_5MS_LP || optek_link_mode == BC_SF48K_PT5MS)
 		{
--- a/source/common/audio/audio_dec.c
View file @ef23a3c
+++ b/source/common/audio/audio_dec.c
View file @ef23a3c
@@ -1529,6 +1529,7 @@ void taskDec(void *pvParameters)
 					xa_lc3_dec_frame(&pOut_up,&len);
+					#ifndef UPSTREAM_SAMPLERATE_48k
 					short *p = pOut_up;
 					//24k to 48K
 					for(i=0; i<len/2; i++)
@@ -1549,7 +1550,7 @@ void taskDec(void *pvParameters)
 					extern void *upStreamHandle;
 					optek_bqdiir_mono_16b_process (upStreamHandle,pOut_up,pOut_up,len/2);
-
+					#endif
 					//master_rev_flag = 0xff;
 					if (fifo_put_data(&AdcInFifo, pOut_up,len) != len)
--- a/source/common/oem_BlueSea.h
View file @ef23a3c
+++ b/source/common/oem_BlueSea.h
View file @ef23a3c
@@ -122,7 +122,7 @@
 #define BT_PA_ENABLE
 /***********************OPTEK LINK 2.0******************************/
-#define OPTEK_LINK_ENABLE
+//#define OPTEK_LINK_ENABLE
 #ifdef OPTEK_LINK_ENABLE
@@ -134,6 +134,10 @@
 #define OPL_MODE_TWO_WAY  // use optek link lib:optek_link_5ms.a
 //#define OPL_MODE_SWF    // use optek link lib:optek_link_5ms_for_swf.a
+#ifdef OPL_MODE_TWO_WAY
+#define UPSTREAM_SAMPLERATE_48k
+#endif
+
 #if (defined OPL_MODE_TWO_WAY || (defined OPL_MODE_SINGLE_WAY && defined OPL_MASTER_ENABLE))
 #define LC3_ENCODE_ENABLE
 #endif
--- a/source/media/bt_hci/optek_link.c
View file @ef23a3c
+++ b/source/media/bt_hci/optek_link.c
View file @ef23a3c
@@ -193,10 +193,17 @@ void csbm_tx_init(U16 sample_rate,U8 bt_src)
 			}
 			else
 			{
-				if (xa_lc3_enc_main_init(40000,24000,1,5.0) != XA_NO_ERROR)
+				#ifdef UPSTREAM_SAMPLERATE_48k
+				if (xa_lc3_enc_main_init(48000,48000,1,5.0) != XA_NO_ERROR)
 				{
 					DBG_Printf("lc3 enc init error\n\r");
 				}
+				#else
+				if (xa_lc3_enc_main_init(40000,24000,1,5.0) != XA_NO_ERROR)
+				{
+					DBG_Printf("lc3 enc init error\n\r");
+				}				
+				#endif
 			}
 			upStreamHandle = optek_bqriir_open(codec_malloc(optek_bqriir_alloc(SR_24K_MAX_BIQUAD)),SR_24K_MAX_BIQUAD,sr_24k_dsp_coef);
@@ -268,7 +275,7 @@ extern FIFO audio_delay_fifo;
 		if (xa_lc3_enc_main_init(160000,sample_rate,2,5.0) != XA_NO_ERROR)
 		{
 			DBG_Printf("lc3 enc init error\n\r");
-		}
+		}	
     }
 	#endif
@@ -407,20 +414,34 @@ void csbm_put_tx_unencoded_data(short *ptr,U16 len)
 		short *pIn = ptr;
 		short *pOut = ptr;
+		#ifdef UPSTREAM_SAMPLERATE_48k
+		pIn += 1;
+
+		len >> 2;
+		
+		for (i=0;i<(len);i++)
+		{
+			*pOut++ = *pIn;
+			pIn += 2;
+		}	
+		
+		xa_lc3_enc_frame(ptr,len,&plc3,&pOutDataLen);
+		#else
 		optek_bqdiir_stereo_16b_process (upStreamHandle,ptr,ptr,len/2);
 		pIn += 1;
+
+		len >> 3;
-		for (i=0;i<(len>>3);i++)
+		for (i=0;i<(len);i++)
 		{
 			*pOut++ = *pIn;
 			pIn += 4;
-		}
-		//second step stereo to mono  
-		//optek_hifi2_stereo_16b_to_mono(ptr,ptr,len>>2);		
+		}	
-		xa_lc3_enc_frame(ptr,len>>3,&plc3,&pOutDataLen);
-		//DBG_Assert(pOutDataLen == 25);
+		xa_lc3_enc_frame(ptr,len,&plc3,&pOutDataLen);
+		#endif
+
 		if (bc_tx_data.tx_len == 0 && pOutDataLen)
 		{
 			memcpy(bc_tx_data.tx_data+bc_tx_data.cur_data_len,plc3,pOutDataLen);
@@ -1041,6 +1062,11 @@ u8 optek_link_slave_conn_cb (u8 mode, u8 *slave_max_tx_len, u8 *slave_max_rx_len
 		*slave_max_tx_len = OPTEK_LINK_MASTER_NO_RX_LEN;
 		*slave_max_rx_len = 100;
 	}
+	else if (optek_link_mode == BC_SF44K_T7_R1_PT5MS || optek_link_mode == BC_SF44K_PT5MS)
+	{
+		*slave_max_tx_len = OPTEK_LINK_MASTER_NO_RX_LEN;
+		*slave_max_rx_len = 108;
+	}
 	else if (mode == BC_SF48K_PT7P5MS)
 	{
 		*slave_max_tx_len = OPTEK_LINK_MASTER_NO_RX_LEN;
@@ -1050,7 +1076,7 @@ u8 optek_link_slave_conn_cb (u8 mode, u8 *slave_max_tx_len, u8 *slave_max_rx_len
 	#if (defined OPL_MODE_TWO_WAY)	
 	else if (mode == GAME_HEADPHONE_PT_5MS_LP)
 	{		
-		*slave_max_tx_len = 51;
+		*slave_max_tx_len = 60;
 		*slave_max_rx_len = 100;		
 	}
 	else if (mode == GAME_HEADPHONE_PT7P5MS_T7R3E)
--- a/source/media/bt_hci/optek_link.h
View file @ef23a3c
+++ b/source/media/bt_hci/optek_link.h
View file @ef23a3c
@@ -286,7 +286,12 @@ uint8_t optek_link_role_change_slave_to_scan (uint8_t act_id);
 #define TEST_MODE           GAME_HEADPHONE_PT_5MS_LP
 #define MASTER_MAX_TX_LEN   100
-#define SLAVE_MAX_TX_LEN    51
+
+#ifdef UPSTREAM_SAMPLERATE_48k
+#define SLAVE_MAX_TX_LEN    60
+#else
+#define SLAVE_MAX_TX_LEN    50
+#endif