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

Commit c2556c65 authored by Jeremy Wu's avatar Jeremy Wu
Browse files

Floss: add a member to store codec in esco_param 

In anticipation of having LC3 and mSBC both qualifying for the
"transparent" coding format, we need an extra member to store which of
them is the underlying codec for various operations.

In this CL, we add a new member `coding_format` to store that.

Bug: 269970706
Tag: #floss
Test: Build and verify
Change-Id: Id4dc424b6917cd884e1ded0d38ca6f34d5cff604
parent 7efc8cbf

system/device/include/esco_parameters.h

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ typedef struct { 
  esco_packet_types_t packet_types; /* Packet Types */

  esco_retransmission_effort_t

      retransmission_effort; /* 0x00-0x02, 0xFF don't care */

  esco_coding_format_t

      coding_format; /* Extra field to store codec when TX/RX is transparent */

} enh_esco_params_t;



// Get the enhanced eSCO configuration parameters for the provided |codec|

system/device/src/esco_parameters.cc

+7 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ static const enh_esco_params_t default_esco_parameters[ESCO_NUM_CODECS] = { 
        .packet_types = (ESCO_PKT_TYPES_MASK_HV1 | ESCO_PKT_TYPES_MASK_HV2 |

                         ESCO_PKT_TYPES_MASK_HV3),

        .retransmission_effort = ESCO_RETRANSMISSION_OFF,

        .coding_format = ESCO_CODING_FORMAT_CVSD,

    },

    // CVSD S3

    {
@@ -96,6 +97,7 @@ static const enh_esco_params_t default_esco_parameters[ESCO_NUM_CODECS] = { 
             ESCO_PKT_TYPES_MASK_NO_3_EV3 | ESCO_PKT_TYPES_MASK_NO_2_EV5 |

             ESCO_PKT_TYPES_MASK_NO_3_EV5),

        .retransmission_effort = ESCO_RETRANSMISSION_POWER,

        .coding_format = ESCO_CODING_FORMAT_CVSD,

    },

    // CVSD S4

    {
@@ -135,6 +137,7 @@ static const enh_esco_params_t default_esco_parameters[ESCO_NUM_CODECS] = { 
             ESCO_PKT_TYPES_MASK_NO_3_EV3 | ESCO_PKT_TYPES_MASK_NO_2_EV5 |

             ESCO_PKT_TYPES_MASK_NO_3_EV5),

        .retransmission_effort = ESCO_RETRANSMISSION_QUALITY,

        .coding_format = ESCO_CODING_FORMAT_CVSD,

    },

    // mSBC T1

    {
@@ -172,6 +175,7 @@ static const enh_esco_params_t default_esco_parameters[ESCO_NUM_CODECS] = { 
             ESCO_PKT_TYPES_MASK_NO_2_EV5 | ESCO_PKT_TYPES_MASK_NO_3_EV5 |

             ESCO_PKT_TYPES_MASK_NO_2_EV3),

        .retransmission_effort = ESCO_RETRANSMISSION_QUALITY,

        .coding_format = ESCO_CODING_FORMAT_MSBC,

    },

    // mSBC T2

    {
@@ -208,6 +212,7 @@ static const enh_esco_params_t default_esco_parameters[ESCO_NUM_CODECS] = { 
            (ESCO_PKT_TYPES_MASK_EV3 | ESCO_PKT_TYPES_MASK_NO_3_EV3 |

             ESCO_PKT_TYPES_MASK_NO_2_EV5 | ESCO_PKT_TYPES_MASK_NO_3_EV5),

        .retransmission_effort = ESCO_RETRANSMISSION_QUALITY,

        .coding_format = ESCO_CODING_FORMAT_MSBC,

    },

    // LC3 T1

    {
@@ -245,6 +250,7 @@ static const enh_esco_params_t default_esco_parameters[ESCO_NUM_CODECS] = { 
             ESCO_PKT_TYPES_MASK_NO_2_EV5 | ESCO_PKT_TYPES_MASK_NO_3_EV5 |

             ESCO_PKT_TYPES_MASK_NO_2_EV3),

        .retransmission_effort = ESCO_RETRANSMISSION_QUALITY,

        .coding_format = ESCO_CODING_FORMAT_LC3,

    },

    // LC3 T2

    {
@@ -281,6 +287,7 @@ static const enh_esco_params_t default_esco_parameters[ESCO_NUM_CODECS] = { 
            (ESCO_PKT_TYPES_MASK_NO_3_EV3 | ESCO_PKT_TYPES_MASK_NO_2_EV5 |

             ESCO_PKT_TYPES_MASK_NO_3_EV5),

        .retransmission_effort = ESCO_RETRANSMISSION_QUALITY,

        .coding_format = ESCO_CODING_FORMAT_LC3,

    },

};