[int][new][bt] [support two sbc/aac decoder]

Project: Bluetooth

redmine: #5945, REDMINE-5945

ext-redmine: bug|feat#5945

[Description in detail]

Affected branch: [master]

Change-Id: I6fce1b55fdb5f204a0193a6d70b9bce3c288a96f

Author: yuzheng-alt

include/av_sbc_api.h

@@ -105,7 +105,7 @@ U16 bts2_sbc_encode_cfg(BTS2E_SBC_CHNL_MODE chnl_mode,
 /*----------------------------------------------------------------------------*
 *
 * DESCRIPTION:
-*       Configure the settings required before decoding.
+*       Configure sbc decoder settings for the specified connection
 *
 * INPUT:
 *      BTS2E_SBC_CHNL_MODE chnl_mode
@@ -114,6 +114,7 @@ U16 bts2_sbc_encode_cfg(BTS2E_SBC_CHNL_MODE chnl_mode,
 *      U8 nrof_blocks
 *      U8 nrof_subbands
 *      U8 bitpool
+*      U8 con_idx
 *
 * OUTPUT:
 *      If inputs are valid else returns FALSE.
@@ -129,6 +130,14 @@ U8 bts2_sbc_decode_cfg(BTS2E_SBC_CHNL_MODE chnl_mode,
                        U8 nrof_subbands,
                        U8 bitpool);
 
+U8 bts2_sbc_decode_cfg_ext(BTS2E_SBC_CHNL_MODE chnl_mode,
+                           BTS2E_SBC_ALLOC_METHOD alloc_method,
+                           U16 sample_freq,
+                           U8 nrof_blocks,
+                           U8 nrof_subbands,
+                           U8 bitpool,
+                           U8 con_idx);
+
 /*----------------------------------------------------------------------------*
 *
 * DESCRIPTION:
@@ -152,12 +161,13 @@ void bts2_sbc_encode(BTS2S_SBC_STREAM *pbss);
 /*----------------------------------------------------------------------------*
 *
 * DESCRIPTION:
-*      SBC decode.
+*      Sbc decoding the specified connection
 *
 *
 *
 * INPUT:
 *      BTS2S_SBC_STREAM *pbss
+*      U8 con_idx
 *
 *
 * OUTPUT:
@@ -168,20 +178,23 @@ void bts2_sbc_encode(BTS2S_SBC_STREAM *pbss);
 *
 *----------------------------------------------------------------------------*/
 void bts2_sbc_decode(BTS2S_SBC_STREAM *pbss);
+void bts2_sbc_decode_ext(BTS2S_SBC_STREAM *pbss, U8 con_idx);
 
 void bts2_sbc_encode_completed(void);
 
 
 void bts2_sbc_decode_completed(void);
+void bts2_sbc_decode_completed_ext(U8 con_idx);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 /*----------------------------------------------------------------------------*
 *
 * DESCRIPTION:
-*       Configure the settings required before encoding.
+*       Configure msbc encoder settings for the specified connection
 *
 * INPUT:
+*       U8 con_idx
 *
 * OUTPUT:
 *      Frame size in bytes if inputs are valid else returns zero.
@@ -191,13 +204,15 @@ void bts2_sbc_decode_completed(void);
 *
 *----------------------------------------------------------------------------*/
 U16 bts2_msbc_encode_cfg(void);
+U16 bts2_msbc_encode_cfg_ext(U8 con_idx);
 
 /*----------------------------------------------------------------------------*
 *
 * DESCRIPTION:
-*       Configure the settings required before decoding.
+*       Configure msbc decoder settings for the specified connection
 *
 * INPUT:
+*       U8 con_idx
 *
 * OUTPUT:
 *      If inputs are valid else returns FALSE.
@@ -207,16 +222,18 @@ U16 bts2_msbc_encode_cfg(void);
 *
 *----------------------------------------------------------------------------*/
 U8 bts2_msbc_decode_cfg(void);
+U8 bts2_msbc_decode_cfg_ext(U8 con_idx);
 
 /*----------------------------------------------------------------------------*
 *
 * DESCRIPTION:
-*      mSBC encode.
+*      MSBC encoding the specified connection
 *
 *
 *
 * INPUT:
 *      BS_SBC_STREAM *pbss
+*      U8 con_idx
 *
 *
 * OUTPUT:
@@ -227,16 +244,18 @@ U8 bts2_msbc_decode_cfg(void);
 *
 *----------------------------------------------------------------------------*/
 void bts2_msbc_encode(BTS2S_SBC_STREAM *pbss);
+void bts2_msbc_encode_ext(BTS2S_SBC_STREAM *pbss, U8 con_idx);
 
 /*----------------------------------------------------------------------------*
 *
 * DESCRIPTION:
-*      mSBC decode.
+*      MSBC decoding the specified connection
 *
 *
 *
 * INPUT:
 *      BS_SBC_STREAM *pbss
+*      U8 con_idx
 *
 *
 * OUTPUT:
@@ -247,12 +266,15 @@ void bts2_msbc_encode(BTS2S_SBC_STREAM *pbss);
 *
 *----------------------------------------------------------------------------*/
 void bts2_msbc_decode(BTS2S_SBC_STREAM *pbss);
+void bts2_msbc_decode_ext(BTS2S_SBC_STREAM *pbss, U8 con_idx);
 
 
 void bts2_msbc_encode_completed(void);
+void bts2_msbc_encode_completed_ext(U8 con_idx);
 
 
 void bts2_msbc_decode_completed(void);
+void bts2_msbc_decode_completed_ext(U8 con_idx);
 
 
 #ifdef __cplusplus

include/avrcp_api.h

@@ -77,6 +77,7 @@ typedef enum
 #define AVRCP_VENDOR_DEPENDENT_PDU_ID_REQUEST_CONTINUING_RESPONSE 0x40
 #define AVRCP_VENDOR_DEPENDENT_PDU_ID_ABORT_CONTINUING_RESPONSE 0x41
 #define AVRCP_VENDOR_DEPENDENT_PDU_ID_SET_ABSOLUTE_VOLUME 0x50
+#define AVRCP_VENDOR_DEPENDENT_PDU_ID_INVALD 0xff
 
 
 #define AVRCP_VENDOR_DEPENDENT_EVENT_CAPABILITY_COMPANY_ID 0x02

lib/lib_bt_gcc.a

@@ -1877,6 +1877,51 @@ void bt_cm(uint8_t argc, char **argv)
                     gap_rd_rmt_ext_featr_req(bts2_task_get_app_task_id(), atoi(argv[2]), env->bt_devices[i].info.bd_addr);
             }
         }
+#ifdef CFG_AV
+        else if (strcmp(argv[1], "av_conn1") == 0)
+        {
+            BTS2S_BD_ADDR bd_addr;
+            bd_addr.nap = strtol(argv[2], NULL, 0);
+            bd_addr.uap = strtol(argv[3], NULL, 0);
+            bd_addr.lap = strtol(argv[4], NULL, 0);
+            LOG_I("conn addr: %04X:%02X:%06lX",
+                  bd_addr.nap,
+                  bd_addr.uap,
+                  bd_addr.lap);
+
+            gap_wr_scan_enb_req(bts2_task_get_app_task_id(), 0, 0);
+            if (atoi(argv[5]))
+                bt_av_conn(&bd_addr, AV_SRC);
+            else
+                bt_av_conn(&bd_addr, AV_SNK);
+        }
+        else if (strcmp(argv[1], "av_disconn1") == 0)
+        {
+            bt_av_disconnect(0);
+        }
+#endif
+#ifdef CFG_AVRCP
+        else if (strcmp(argv[1], "avrcp_conn1") == 0)
+        {
+            BTS2S_BD_ADDR bd_addr;
+            bd_addr.nap = strtol(argv[2], NULL, 0);
+            bd_addr.uap = strtol(argv[3], NULL, 0);
+            bd_addr.lap = strtol(argv[4], NULL, 0);
+            LOG_I("conn addr: %04X:%02X:%06lX",
+                  bd_addr.nap,
+                  bd_addr.uap,
+                  bd_addr.lap);
+            gap_wr_scan_enb_req(bts2_task_get_app_task_id(), 0, 0);
+            if (atoi(argv[5]))
+                avrcp_conn_req(bts2_task_get_app_task_id(), bd_addr, AVRCP_TG, AVRCP_CT);
+            else
+                avrcp_conn_req(bts2_task_get_app_task_id(), bd_addr, AVRCP_CT, AVRCP_TG);
+        }
+        else if (strcmp(argv[1], "avrcp_dis") == 0)
+        {
+            avrcp_disc_req();
+        }
+#endif
     }
 }