Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3399b993 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topics 'bt-only-pcm-media-feeding-format', 'bt-a2d-sbc-cie-localize' 

* changes:
  Use only PCM as the media feeding format
  Localize the usage of tA2D_SBC_CIE only within the SBC codec
parents 1627d319 fb99bf77

system/bta/av/bta_av_api.c

+2 −1
Original line number Diff line number Diff line
@@ -309,7 +309,8 @@ void BTA_AvStop(bool suspend) 
**

*******************************************************************************/

void BTA_AvReconfig(tBTA_AV_HNDL hndl, bool suspend, uint8_t sep_info_idx,

                    uint8_t *p_codec_info, uint8_t num_protect, uint8_t *p_protect_info)

                    uint8_t *p_codec_info, uint8_t num_protect,

                    const uint8_t *p_protect_info)

{

    tBTA_AV_API_RCFG *p_buf =

        (tBTA_AV_API_RCFG *)osi_malloc(sizeof(tBTA_AV_API_RCFG) + num_protect);

system/bta/av/bta_av_sbc.c

+4 −3
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ typedef struct 
    uint32_t              src_sps;    /* samples per second (source audio data) */

    uint32_t              dst_sps;    /* samples per second (converted audio data) */

    tBTA_AV_SBC_ACT     *p_act;     /* the action function to do the conversion */

    uint16_t              bits;       /* number of bits per pcm sample */

    uint16_t              n_channels; /* number of channels (i.e. mono(1), stereo(2)...) */

    uint8_t               bits;       /* number of bits per pcm sample */

    uint8_t               n_channels; /* number of channels (i.e. mono(1), stereo(2)...) */

    int16_t               worker1;

    int16_t               worker2;

    uint8_t               div;
@@ -61,7 +61,8 @@ tBTA_AV_SBC_UPS_CB bta_av_sbc_ups_cb; 
** Returns          none

**

*******************************************************************************/

void bta_av_sbc_init_up_sample (uint32_t src_sps, uint32_t dst_sps, uint16_t bits, uint16_t n_channels)

void bta_av_sbc_init_up_sample (uint32_t src_sps, uint32_t dst_sps,

                                uint8_t bits, uint8_t n_channels)

{

    bta_av_sbc_ups_cb.cur_pos   = -1;

    bta_av_sbc_ups_cb.src_sps   = src_sps;

system/bta/include/bta_av_api.h

+2 −1
Original line number Diff line number Diff line
@@ -632,7 +632,8 @@ void BTA_AvStop(bool suspend); 
**

*******************************************************************************/

void BTA_AvReconfig(tBTA_AV_HNDL hndl, bool suspend, uint8_t sep_info_idx,

                            uint8_t *p_codec_info, uint8_t num_protect, uint8_t *p_protect_info);

                    uint8_t *p_codec_info, uint8_t num_protect,

                    const uint8_t *p_protect_info);



/*******************************************************************************

**

system/bta/include/bta_av_sbc.h

+1 −3
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
#ifndef BTA_AV_SBC_H

#define BTA_AV_SBC_H



#include "stack/include/a2d_sbc.h"



/*****************************************************************************

**  constants

*****************************************************************************/
@@ -53,7 +51,7 @@ extern "C" { 
**

*******************************************************************************/

extern void bta_av_sbc_init_up_sample (uint32_t src_sps, uint32_t dst_sps,

                                       uint16_t bits, uint16_t n_channels);

                                       uint8_t bits, uint8_t n_channels);



/*******************************************************************************

**

system/btif/co/bta_av_co.cc

+323 −624

File changed.

Preview size limit exceeded, changes collapsed.