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

Commit d9609462 authored by Yun-Hao Chung's avatar Yun-Hao Chung Committed by Yun-hao Chung
Browse files

Floss: Restrict allowed packet types of SCO codec 

Per HFP 1.9 spec 6.7.3 and 6.7.4, each codec has its own packet type.

After this CL, only the packet types defined in the spec would be sent
in the setup.

Bug: 324157546
Bug: 332650199
Test: m -j
Tag: #floss
Change-Id: Ie1a53fb743ef9bf7fbfaeff1b18c6f419aa95ce2
parent eb4b03ce

system/device/src/esco_parameters.cc

+21 −0
Original line number Diff line number Diff line
@@ -414,5 +414,26 @@ enh_esco_params_t esco_parameters_for_codec(esco_codec_t codec, bool offload) { 
    param.output_bandwidth = TXRX_64KBITS_RATE;

  }



#if TARGET_FLOSS

  esco_packet_types_t new_packet_types = param.packet_types;

  if (codec == ESCO_CODEC_CVSD_S3 || codec == ESCO_CODEC_CVSD_S4 ||

      codec == ESCO_CODEC_MSBC_T2 || codec == ESCO_CODEC_LC3_T2) {

    new_packet_types =

        (ESCO_PKT_TYPES_MASK_NO_3_EV3 | ESCO_PKT_TYPES_MASK_NO_2_EV5 |

         ESCO_PKT_TYPES_MASK_NO_3_EV5);

  } else if (codec == ESCO_CODEC_CVSD_S1) {

    new_packet_types =

        (ESCO_PKT_TYPES_MASK_EV3 | ESCO_PKT_TYPES_MASK_EV4 |

         ESCO_PKT_TYPES_MASK_EV5 | ESCO_PKT_TYPES_MASK_NO_3_EV3 |

         ESCO_PKT_TYPES_MASK_NO_2_EV5 | ESCO_PKT_TYPES_MASK_NO_3_EV5);

  }



  if (param.packet_types != new_packet_types) {

    log::info("Applying restricted packet types for codec %d: 0x%04x -> 0x%04x",

              (int)codec, param.packet_types, new_packet_types);

    param.packet_types = new_packet_types;

  }

#endif



  return param;

}