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

Commit a2c6a74a authored by Jeremy Wu's avatar Jeremy Wu Committed by Automerger Merge Worker
Browse files

Merge "Floss: added an error check in a2dp_aac_encoder_init" into main am:... 

Merge "Floss: added an error check in a2dp_aac_encoder_init" into main am: 58bf9832 am: c3b59e85

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2689106



Change-Id: I95b47f9c88211bc1ea1db6fe33a5ebfd0849ba98
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85976094 c3b59e85

system/stack/a2dp/a2dp_aac_encoder_linux.cc

+9 −2
Original line number Diff line number Diff line
@@ -314,9 +314,16 @@ void a2dp_aac_encoder_init(const tA2DP_ENCODER_INIT_PEER_PARAMS* p_peer_params, 
  tA2DP_BITS_PER_SAMPLE bits_per_sample =

      a2dp_codec_config->getAudioBitsPerSample();



  uint32_t pcm_samples_per_frame =

  int pcm_samples_per_frame =

      codec_intf.prepare_context(sample_rate, channel_count, bit_rate);



  if (pcm_samples_per_frame < 0) {

    LOG_ERROR("%s: Failed to prepare context: %d", __func__,

              pcm_samples_per_frame);

    codec_intf.clear_context();

    return;  // TODO(b/294165759): need to return an error

  }



  uint32_t encoder_interval_ms = pcm_samples_per_frame * 1000 / sample_rate;



  a2dp_aac_encoder_cb = tA2DP_AAC_ENCODER_CB{
@@ -337,7 +344,7 @@ void a2dp_aac_encoder_init(const tA2DP_ENCODER_INIT_PEER_PARAMS* p_peer_params, 
                                 channel_count * encoder_interval_ms) /

                                1000,

          },

      .pcm_samples_per_frame = pcm_samples_per_frame,

      .pcm_samples_per_frame = static_cast<uint32_t>(pcm_samples_per_frame),

      .encoder_interval_ms = encoder_interval_ms,

      .stats =

          a2dp_aac_encoder_stats_t{