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

Commit 09a1e59f authored by Rongxuan Liu's avatar Rongxuan Liu Committed by Gerrit Code Review
Browse files

Merge "broadcaster: rename presentation delay to be clear" into main

parents df016840 3cedd362

android/app/jni/com_android_bluetooth_le_audio.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1104,7 +1104,7 @@ jobject prepareBluetoothLeBroadcastMetadataObject( 
      broadcast_metadata.broadcast_code ? true : false,

      broadcast_metadata.is_public, broadcast_name.get(),

      broadcast_metadata.broadcast_code ? code.get() : nullptr,

      (jint)broadcast_metadata.basic_audio_announcement.presentation_delay,

      (jint)broadcast_metadata.basic_audio_announcement.presentation_delay_us,

      audio_cfg_quality, (jint)bluetooth::le_audio::kLeAudioSourceRssiUnknown,

      public_meta_obj.get(), subgroup_list_obj.get());

}

system/bta/le_audio/broadcaster/broadcaster.cc

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ class LeAudioBroadcasterImpl : public LeAudioBroadcaster, public BigCallbacks { 
    BasicAudioAnnouncementData announcement;



    /* Prepare the announcement */

    announcement.presentation_delay = 40000; /* us */

    announcement.presentation_delay_us = 40000; /* us */



    auto const& codec_id = codec_config.GetLeAudioCodecId();

system/bta/le_audio/broadcaster/broadcaster_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ static BasicAudioAnnouncementData prepareAnnouncement( 
    std::map<uint8_t, std::vector<uint8_t>> metadata) {

  BasicAudioAnnouncementData announcement;



  announcement.presentation_delay = 0x004E20;

  announcement.presentation_delay_us = 40000;

  auto const& codec_id = codec_config.GetLeAudioCodecId();



  announcement.subgroup_configs = {{

system/bta/le_audio/broadcaster/broadcaster_types.cc

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static void EmitHeader(const BasicAudioAnnouncementData& announcement_data, 
  // Set the cursor behind the old data

  uint8_t* p_value = data.data() + old_size;



  UINT24_TO_STREAM(p_value, announcement_data.presentation_delay);

  UINT24_TO_STREAM(p_value, announcement_data.presentation_delay_us);

}



static void EmitCodecConfiguration(
@@ -487,7 +487,7 @@ static bool isMetadataSame(std::map<uint8_t, std::vector<uint8_t>> m1, 


bool operator==(const BasicAudioAnnouncementData& lhs,

                const BasicAudioAnnouncementData& rhs) {

  if (lhs.presentation_delay != rhs.presentation_delay) return false;

  if (lhs.presentation_delay_us != rhs.presentation_delay_us) return false;



  if (lhs.subgroup_configs.size() != rhs.subgroup_configs.size()) return false;

system/bta/le_audio/broadcaster/state_machine_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static BasicAudioAnnouncementData prepareAnnouncement( 
    std::map<uint8_t, std::vector<uint8_t>> metadata) {

  BasicAudioAnnouncementData announcement;



  announcement.presentation_delay = 0x004E20;

  announcement.presentation_delay_us = 40000;

  auto const& codec_id = codec_config.GetLeAudioCodecId();



  announcement.subgroup_configs = {{