style(optek link mic):modify two compiled issues

LuoZheSi
1 parent e1587f5e
Showing 2 changed files with 44 additions and 43 deletions
source/common/audio/audio_dec.c
source/media/bt_hci/optek_link.c
--- a/source/common/audio/audio_dec.c
View file @9af582a
+++ b/source/common/audio/audio_dec.c
View file @9af582a
@@ -1505,7 +1505,7 @@ void taskDec(void *pvParameters)
 				#ifdef OPL_MODE_SWF
 				if (decode_type == DECODE_SBC || app_main_data.media == MEDIA_USB_DEVICE)
 				{
-					
+
 				}
 				else
 				#endif
@@ -1726,6 +1726,7 @@ void taskDec(void *pvParameters)
 				{
 					if (app_main_data.share_link_role == SL_ROLE_MASTER)
 					{
+						#ifdef LC3_DECODE_ENABLE
 						U16 dec_len;
 						//if (master_rev_flag)
 						{
@@ -1744,7 +1745,8 @@ void taskDec(void *pvParameters)
 							{
 								//DBG_Printf("usbdev upstream overflow\r\n");
 							}
-						}	
+						}
+						#endif	
 					}			
 				}		
 			#else
--- a/source/media/bt_hci/optek_link.c
View file @9af582a
+++ b/source/media/bt_hci/optek_link.c
View file @9af582a
@@ -176,7 +176,44 @@ void csbm_tx_init(U16 sample_rate,U8 bt_src)
 	bc_tx_data.last_tx_len = 0;
 #ifdef OPL_SLAVE_ENBALE
-	#ifndef OPL_MODE_WIRELESS_MIC
+	#ifdef OPL_MODE_WIRELESS_MIC
+	if (app_main_data.share_link_role == SL_ROLE_SLAVE)
+	{
+		XA_ERRORCODE xa_lc3_enc_main_init(U32 bitrate,U16 samplerate,U8 channels,float frame_Time_ms);
+
+		float ptms;
+		int bitrate;
+
+		if (optek_link_mode == WIRELESS_MIC_PT2P5MS_T7R1 || optek_link_mode == WIRELESS_MIC_48K_PT2P5MS_T7R1M)
+		{
+			ptms = 2.5;
+			bitrate = 80000;
+		}
+		else if (optek_link_mode == WIRELESS_MIC_PT2P5MS_LP)
+		{
+			ptms = 2.5;
+			bitrate = 96000;
+		}
+		else if (optek_link_mode == WIRELESS_MIC_PT5MS_LP  || optek_link_mode == WIRELESS_MIC_PT5MS_T10_R2_LP || optek_link_mode == WIRELESS_MIC_48K_PT5MS_T10_R2M_LP)
+		{
+			ptms = 5;
+			bitrate = 80000;
+		}
+		else
+		{
+			ptms = 2.5;
+			bitrate = 96000;
+		}
+
+		if (xa_lc3_enc_main_init(bitrate,sample_rate,1,ptms) != XA_NO_ERROR)
+		{
+			DBG_Printf("lc3 enc init error\n\r");
+		}
+
+		//spk_out_sync_w_tx_status = SPK_AND_TX_SYNCING;
+		return;
+	}	
+	#else
 	if (app_main_data.share_link_role == SL_ROLE_SLAVE)
 	{
 		#ifdef OPL_MODE_TWO_WAY
@@ -277,45 +314,6 @@ extern FIFO audio_delay_fifo;
 			DBG_Printf("lc3 enc init error\n\r");
 		}	
     }
-
-	#elif defined OPL_MODE_WIRELESS_MIC
-
-	if (app_main_data.share_link_role == SL_ROLE_SLAVE)
-	{
-		XA_ERRORCODE xa_lc3_enc_main_init(U32 bitrate,U16 samplerate,U8 channels,float frame_Time_ms);
-
-		float ptms;
-		int bitrate;
-
-		if (optek_link_mode == WIRELESS_MIC_PT2P5MS_T7R1 || optek_link_mode == WIRELESS_MIC_48K_PT2P5MS_T7R1M)
-		{
-			ptms = 2.5;
-			bitrate = 80000;
-		}
-		else if (optek_link_mode == WIRELESS_MIC_PT2P5MS_LP)
-		{
-			ptms = 2.5;
-			bitrate = 96000;
-		}
-		else if (optek_link_mode == WIRELESS_MIC_PT5MS_LP  || optek_link_mode == WIRELESS_MIC_PT5MS_T10_R2_LP || optek_link_mode == WIRELESS_MIC_48K_PT5MS_T10_R2M_LP)
-		{
-			ptms = 5;
-			bitrate = 80000;
-		}
-		else
-		{
-			ptms = 2.5;
-			bitrate = 96000;
-		}
-
-		if (xa_lc3_enc_main_init(bitrate,sample_rate,1,ptms) != XA_NO_ERROR)
-		{
-			DBG_Printf("lc3 enc init error\n\r");
-		}
-
-		//spk_out_sync_w_tx_status = SPK_AND_TX_SYNCING;
-		return;
-	}
 	#endif
 	#ifdef OPL_MODE_TWO_WAY
@@ -501,9 +499,9 @@ void csbm_put_tx_unencoded_data(short *ptr,U16 len)
 	int xa_lc3_enc_frame(U16 *pInBuf, U32 samples, U8 **pOutBuf, U32 *pOutDataLen);
 	U8 *plc3;
-
 	if (app_main_data.share_link_role == SL_ROLE_SLAVE)
 	{
+	#ifdef OPL_SLAVE_ENBALE		
 		#ifdef OPL_MODE_TWO_WAY
 		//first step 48K to 24K
 		short *pIn = ptr;
@@ -570,6 +568,7 @@ void csbm_put_tx_unencoded_data(short *ptr,U16 len)
 		bc_tx_data.tx_len = pOutDataLen;
 		memset(ptr,0,len<<2);//mute local output		
 		#endif
+	#endif	
 	}
 	else
 	{