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

Commit 4e02e557 authored by Ravi Kumar Alamanda's avatar Ravi Kumar Alamanda Committed by Eric Laurent
Browse files

hal: Add support for Tunnel mode audio playback 

- Initial implementation to support audio playback in tunnel mode.

Change-Id: I4ffa660bd9beb855fdfe6a7572d8f6b7eade7bd9
parent be3335ab

hal/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -20,12 +20,14 @@ LOCAL_SHARED_LIBRARIES := \ 
	liblog \

	libcutils \

	libtinyalsa \

	libtinycompress \

	libaudioroute \

	libdl





LOCAL_C_INCLUDES += \

	external/tinyalsa/include \

	external/tinycompress/include \

	$(call include-path-for, audio-route) \

	$(call include-path-for, audio-effects) \

	$(LOCAL_PATH)/$(AUDIO_PLATFORM)

hal/audio_hw.c

+429 −25

File changed.

Preview size limit exceeded, changes collapsed.

hal/audio_hw.h

+37 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <hardware/audio.h>



#include <tinyalsa/asoundlib.h>

#include <tinycompress/tinycompress.h>



#include <audio_route/audio_route.h>
@@ -49,13 +50,13 @@ typedef enum { 
    USECASE_AUDIO_PLAYBACK_DEEP_BUFFER = 0,

    USECASE_AUDIO_PLAYBACK_LOW_LATENCY,

    USECASE_AUDIO_PLAYBACK_MULTI_CH,

    USECASE_AUDIO_PLAYBACK_OFFLOAD,



    /* Capture usecases */

    USECASE_AUDIO_RECORD,

    USECASE_AUDIO_RECORD_LOW_LATENCY,



    USECASE_VOICE_CALL,



    AUDIO_USECASE_MAX

} audio_usecase_t;
@@ -70,14 +71,38 @@ typedef enum { 
 * the buffer size of an input/output stream

 */



enum {

    OFFLOAD_CMD_EXIT,               /* exit compress offload thread loop*/

    OFFLOAD_CMD_DRAIN,              /* send a full drain request to DSP */

    OFFLOAD_CMD_PARTIAL_DRAIN,      /* send a partial drain request to DSP */

    OFFLOAD_CMD_WAIT_FOR_BUFFER,    /* wait for buffer released by DSP */

};



enum {

    OFFLOAD_STATE_IDLE,

    OFFLOAD_STATE_PLAYING,

    OFFLOAD_STATE_PAUSED,

};



struct offload_cmd {

    struct listnode node;

    int cmd;

    int data[];

};



struct stream_out {

    struct audio_stream_out stream;

    pthread_mutex_t lock; /* see note below on mutex acquisition order */

    pthread_cond_t  cond;

    struct pcm_config config;

    struct compr_config compr_config;

    struct pcm *pcm;

    struct compress *compr;

    int standby;

    int pcm_device_id;

    unsigned int sample_rate;

    audio_channel_mask_t channel_mask;

    audio_format_t format;

    audio_devices_t devices;

    audio_output_flags_t flags;

    audio_usecase_t usecase;
@@ -85,6 +110,17 @@ struct stream_out { 
    audio_channel_mask_t supported_channel_masks[MAX_SUPPORTED_CHANNEL_MASKS + 1];

    bool muted;



    int non_blocking;

    int playback_started;

    int offload_state;

    pthread_cond_t offload_cond;

    pthread_t offload_thread;

    struct listnode offload_cmd_list;

    bool offload_thread_blocked;



    stream_callback_t offload_callback;

    void *offload_cookie;



    struct audio_device *dev;

};

hal/msm8974/platform.c

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ static const int pcm_device_table[AUDIO_USECASE_MAX][2] = { 
    [USECASE_AUDIO_PLAYBACK_DEEP_BUFFER] = {0, 0},

    [USECASE_AUDIO_PLAYBACK_LOW_LATENCY] = {15, 15},

    [USECASE_AUDIO_PLAYBACK_MULTI_CH] = {1, 1},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD] = {9, 9},

    [USECASE_AUDIO_RECORD] = {0, 0},

    [USECASE_AUDIO_RECORD_LOW_LATENCY] = {15, 15},

    [USECASE_VOICE_CALL] = {2, 2},