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

Commit 2909affb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "audiohal: Fix compilation error"

parents 10761b69 1657c05d

hal/audio_extn/a2dp.c

+8 −2
Original line number Diff line number Diff line
@@ -221,7 +221,13 @@ struct celt_enc_cfg_t 
    struct custom_enc_cfg_t  custom_cfg;

    struct celt_specific_enc_cfg_t celt_cfg;

};



/* In LE BT source code uses system/audio.h for below

 * structure definition. To avoid multiple definition

 * compilation error for audiohal in LE , masking structure

 * definition under "LINUX_ENABLED" which is defined only

 * in LE

 */

#ifndef LINUX_ENABLED

/* TODO: Define the following structures only for O using PLATFORM_VERSION */

/* Information about BT SBC encoder configuration

 * This data is used between audio HAL module and
@@ -238,7 +244,6 @@ typedef struct { 
    uint32_t bitrate;        /* 320kbps to 512kbps */

} audio_sbc_encoder_config;





/* Information about BT APTX encoder configuration

 * This data is used between audio HAL module and

 * BT IPC library to configure DSP encoder
@@ -261,6 +266,7 @@ typedef struct { 
    uint32_t sampling_rate;

    uint32_t bitrate;

} audio_aac_encoder_config;

#endif



/* Information about BT CELT encoder configuration

 * This data is used between audio HAL module and

hal/audio_hw_extn_api.c

+3 −0
Original line number Diff line number Diff line
@@ -376,6 +376,9 @@ static int qahwi_open_output_stream(struct audio_hw_device *dev, 
        return -EINVAL;

    }



    if (flags & AUDIO_OUTPUT_FLAG_DIRECT_PCM)

        flags = (flags & ~AUDIO_OUTPUT_FLAG_DIRECT_PCM ) | AUDIO_OUTPUT_FLAG_DIRECT;



    ret = adev->qahwi_dev.base.open_output_stream(dev, handle, devices, flags,

                                                 config, stream_out, address);

    if (ret)

qahw_api/test/qahw_playback_test.c

+2 −1
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ static bool request_wake_lock(bool wakelock_acquired, bool enable) 
   if (enable) {

       if (!wakelock_acquired) {

           system_ret = system("echo audio_services > /sys/power/wake_lock");

           if (system_ret < 0) {

               fprintf(stderr, "%s.Failed to acquire audio_service lock\n", __func__);

               fprintf(log_file, "%s.Failed to acquire audio_service lock\n", __func__);

           } else {
@@ -1029,7 +1030,7 @@ void get_file_format(stream_config *stream_info) 
            else

                stream_info->config.offload_info.format = AUDIO_FORMAT_PCM_16_BIT;

            if (!(stream_info->flags_set))

                stream_info->flags = AUDIO_OUTPUT_FLAG_DIRECT_PCM|AUDIO_OUTPUT_FLAG_DIRECT;

                stream_info->flags = AUDIO_OUTPUT_FLAG_DIRECT;

            break;



        case FILE_MP3: