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

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

Merge "Floss: remove speed optimization in MMC test build" into main am: e1d1e720 

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



Change-Id: I72195861a3f292270bb03374827611439026fbd8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e1a66f6 e1d1e720

system/stack/mmc/proto/BUILD.gn

+0 −10
Original line number Diff line number Diff line
@@ -23,11 +23,6 @@ proto_library("mmc_config_proto") { 
    "${proto_in_dir}/mmc_config.proto",

  ]

  standalone=true

  if (use.test) {

    # Override optimize_for option in proto file.

    gen_cpp_mode = "speed"

    all_dependent_pkg_deps = [ "protobuf" ]

  }

}



proto_library("mmc_service_proto") {
@@ -38,9 +33,4 @@ proto_library("mmc_service_proto") { 
  ]

  deps = [ ":mmc_config_proto" ]

  standalone=true

  if (use.test) {

    # Override optimize_for option in proto file.

    gen_cpp_mode = "speed"

    all_dependent_pkg_deps = [ "protobuf" ]

  }

}

system/stack/mmc/test/hfp_lc3_mmc_decoder_test.cc

+12 −26
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "mmc/codec_server/hfp_lc3_mmc_decoder.h"



#include <gmock/gmock.h>

#include <google/protobuf/text_format.h>

#include <gtest/gtest.h>



#include <cerrno>
@@ -31,20 +30,11 @@ 


namespace {



using ::google::protobuf::TextFormat;

using ::testing::Contains;

using ::testing::Each;

using ::testing::Ne;

using ::testing::Test;



constexpr char kLc3EncoderConfig[] = R"(

  hfp_lc3_encoder_param: {}

)";



constexpr char kLc3DecoderConfig[] = R"(

  hfp_lc3_decoder_param: {}

)";



const int kInputLen = mmc::HFP_LC3_PKT_FRAME_LEN;

const int kOutputLen = mmc::HFP_LC3_PCM_BYTES + 1;

const uint8_t kInputBuf[kInputLen] = {0};
@@ -82,10 +72,9 @@ class HfpLc3DecoderWithInitTest : public HfpLc3DecoderTest { 
    std::fill(kOutputBuf, kOutputBuf + kOutputLen, 1);



    HfpLc3DecoderTest::SetUp();

    mmc::ConfigParam lc3_decoder_config;

    ASSERT_TRUE(

        TextFormat::ParseFromString(kLc3DecoderConfig, &lc3_decoder_config));

    ASSERT_EQ(decoder_->init(lc3_decoder_config), mmc::HFP_LC3_PKT_FRAME_LEN);

    mmc::ConfigParam config;

    *config.mutable_hfp_lc3_decoder_param() = mmc::Lc3Param();

    ASSERT_EQ(decoder_->init(config), mmc::HFP_LC3_PKT_FRAME_LEN);

  }

  void TearDown() override {

    HfpLc3DecoderTest::TearDown();
@@ -98,25 +87,23 @@ class HfpLc3DecoderWithInitTest : public HfpLc3DecoderTest { 
};



TEST_F(HfpLc3DecoderTest, InitWrongCodec) {

  mmc::ConfigParam lc3_encoder_config;

  ASSERT_TRUE(

      TextFormat::ParseFromString(kLc3EncoderConfig, &lc3_encoder_config));

  mmc::ConfigParam config;

  *config.mutable_hfp_lc3_encoder_param() = mmc::Lc3Param();



  int ret = decoder_->init(lc3_encoder_config);

  int ret = decoder_->init(config);

  EXPECT_EQ(ret, -EINVAL);

  EXPECT_EQ(get_func_call_count("lc3_setup_decoder"), 0);

}



TEST_F(HfpLc3DecoderTest, InitWrongConfig) {

  mmc::ConfigParam lc3_decoder_config;

  ASSERT_TRUE(

      TextFormat::ParseFromString(kLc3DecoderConfig, &lc3_decoder_config));

  mmc::ConfigParam config;

  *config.mutable_hfp_lc3_decoder_param() = mmc::Lc3Param();



  // lc3_setup_decoder failed due to wrong parameters (returned nullptr).

  test::mock::embdrv_lc3::lc3_setup_decoder.body =

      [](int dt_us, int sr_hz, int sr_pcm_hz, void* mem) { return nullptr; };



  int ret = decoder_->init(lc3_decoder_config);

  int ret = decoder_->init(config);

  EXPECT_EQ(ret, -EINVAL);

  EXPECT_EQ(get_func_call_count("lc3_setup_decoder"), 1);
@@ -124,9 +111,8 @@ TEST_F(HfpLc3DecoderTest, InitWrongConfig) { 
}



TEST_F(HfpLc3DecoderTest, InitSuccess) {

  mmc::ConfigParam lc3_decoder_config;

  ASSERT_TRUE(

      TextFormat::ParseFromString(kLc3DecoderConfig, &lc3_decoder_config));

  mmc::ConfigParam config;

  *config.mutable_hfp_lc3_decoder_param() = mmc::Lc3Param();



  // lc3_setup_decoder returns decoder instance pointer.

  struct lc3_decoder lc3_decoder;
@@ -135,7 +121,7 @@ TEST_F(HfpLc3DecoderTest, InitSuccess) { 
        return &lc3_decoder;

      };



  int ret = decoder_->init(lc3_decoder_config);

  int ret = decoder_->init(config);

  EXPECT_EQ(ret, mmc::HFP_LC3_PKT_FRAME_LEN);

  EXPECT_EQ(get_func_call_count("lc3_setup_decoder"), 1);

system/stack/mmc/test/hfp_lc3_mmc_encoder_test.cc

+12 −26
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "mmc/codec_server/hfp_lc3_mmc_encoder.h"



#include <gmock/gmock.h>

#include <google/protobuf/text_format.h>

#include <gtest/gtest.h>



#include <cerrno>
@@ -31,20 +30,11 @@ 


namespace {



using ::google::protobuf::TextFormat;

using ::testing::Contains;

using ::testing::Each;

using ::testing::Ne;

using ::testing::Test;



constexpr char kLc3EncoderConfig[] = R"(

  hfp_lc3_encoder_param: {}

)";



constexpr char kLc3DecoderConfig[] = R"(

  hfp_lc3_decoder_param: {}

)";



const int kInputLen = mmc::HFP_LC3_PCM_BYTES;

const int kOutputLen = mmc::HFP_LC3_PKT_FRAME_LEN;

const uint8_t kInputBuf[kInputLen] = {0};
@@ -82,10 +72,9 @@ class HfpLc3EncoderWithInitTest : public HfpLc3EncoderTest { 
    std::fill(kOutputBuf, kOutputBuf + kOutputLen, 1);



    HfpLc3EncoderTest::SetUp();

    mmc::ConfigParam lc3_encoder_config;

    ASSERT_TRUE(

        TextFormat::ParseFromString(kLc3EncoderConfig, &lc3_encoder_config));

    ASSERT_EQ(encoder_->init(lc3_encoder_config), mmc::HFP_LC3_PCM_BYTES);

    mmc::ConfigParam config;

    *config.mutable_hfp_lc3_encoder_param() = mmc::Lc3Param();

    ASSERT_EQ(encoder_->init(config), mmc::HFP_LC3_PCM_BYTES);

  }

  void TearDown() override {

    HfpLc3EncoderTest::TearDown();
@@ -98,25 +87,23 @@ class HfpLc3EncoderWithInitTest : public HfpLc3EncoderTest { 
};



TEST_F(HfpLc3EncoderTest, InitWrongCodec) {

  mmc::ConfigParam lc3_decoder_config;

  ASSERT_TRUE(

      TextFormat::ParseFromString(kLc3DecoderConfig, &lc3_decoder_config));

  mmc::ConfigParam config;

  *config.mutable_hfp_lc3_decoder_param() = mmc::Lc3Param();



  int ret = encoder_->init(lc3_decoder_config);

  int ret = encoder_->init(config);

  EXPECT_EQ(ret, -EINVAL);

  EXPECT_EQ(get_func_call_count("lc3_setup_encoder"), 0);

}



TEST_F(HfpLc3EncoderTest, InitWrongConfig) {

  mmc::ConfigParam lc3_encoder_config;

  ASSERT_TRUE(

      TextFormat::ParseFromString(kLc3EncoderConfig, &lc3_encoder_config));

  mmc::ConfigParam config;

  *config.mutable_hfp_lc3_encoder_param() = mmc::Lc3Param();



  // lc3_setup_encoder failed due to wrong parameters (returned nullptr).

  test::mock::embdrv_lc3::lc3_setup_encoder.body =

      [](int dt_us, int sr_hz, int sr_pcm_hz, void* mem) { return nullptr; };



  int ret = encoder_->init(lc3_encoder_config);

  int ret = encoder_->init(config);

  EXPECT_EQ(ret, -EINVAL);

  EXPECT_EQ(get_func_call_count("lc3_setup_encoder"), 1);
@@ -124,9 +111,8 @@ TEST_F(HfpLc3EncoderTest, InitWrongConfig) { 
}



TEST_F(HfpLc3EncoderTest, InitSuccess) {

  mmc::ConfigParam lc3_encoder_config;

  ASSERT_TRUE(

      TextFormat::ParseFromString(kLc3EncoderConfig, &lc3_encoder_config));

  mmc::ConfigParam config;

  *config.mutable_hfp_lc3_encoder_param() = mmc::Lc3Param();



  // lc3_setup_encoder returns encoder instance pointer.

  struct lc3_encoder lc3_encoder;
@@ -135,7 +121,7 @@ TEST_F(HfpLc3EncoderTest, InitSuccess) { 
        return &lc3_encoder;

      };



  int ret = encoder_->init(lc3_encoder_config);

  int ret = encoder_->init(config);

  EXPECT_EQ(ret, mmc::HFP_LC3_PCM_BYTES);

  EXPECT_EQ(get_func_call_count("lc3_setup_encoder"), 1);