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

Commit 07ad6096 authored by Naresh Tanniru's avatar Naresh Tanniru
Browse files

hal: remote merge from master to LA.BR.1 branch 

- Merge commit 'b87c2eea'

Conflicts:
	hal/Android.mk
	hal/audio_extn/audio_extn.c
	hal/audio_extn/audio_extn.h
	hal/audio_extn/dolby.c
	hal/audio_hw.c
	hal/msm8916/hw_info.c
	hal/msm8916/platform.c
	hal/msm8916/platform.h
	hal/msm8974/platform.c
	hal/platform_api.h
	policy_hal/AudioPolicyManager.cpp

Change-Id: Ic9e8a18a5d82719b02038999c92c9991f843981b
parents 36124075 b87c2eea

Android.mk

+1 −1
Original line number Diff line number Diff line 
ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8909,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952,$(TARGET_BOARD_PLATFORM)),)



MY_LOCAL_PATH := $(call my-dir)

hal/Android.mk

+61 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ LOCAL_ARM_MODE := arm 


AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter msm8974 msm8226 msm8610 apq8084 msm8994,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msm8974 msm8226 msm8610 apq8084 msm8994 msm8992 msm8996,$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM = msm8974

  MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -24,9 +24,15 @@ endif 
ifneq ($(filter msm8994,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSM8994

endif

ifneq ($(filter msm8992,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSM8994

endif

ifneq ($(filter msm8996,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSM8996

endif

endif



ifneq ($(filter msm8916 msm8909,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msm8916 msm8909 msm8952,$(TARGET_BOARD_PLATFORM)),)

  AUDIO_PLATFORM = msm8916

  MULTIPLE_HW_VARIANTS_ENABLED := true

  LOCAL_CFLAGS := -DPLATFORM_MSM8916
@@ -46,6 +52,14 @@ LOCAL_SRC_FILES += audio_extn/audio_extn.c \ 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_HDMI_EDID)),true)

    LOCAL_SRC_FILES += edid.c

endif



ifeq ($(strip $(AUDIO_USE_LL_AS_PRIMARY_OUTPUT)),true)

    LOCAL_CFLAGS += -DUSE_LL_AS_PRIMARY_OUTPUT

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PCM_OFFLOAD)),true)

    LOCAL_CFLAGS += -DPCM_OFFLOAD_ENABLED

endif
@@ -125,6 +139,11 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE)),true) 
    LOCAL_SRC_FILES += audio_extn/compress_capture.c

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DTS_EAGLE)),true)

    LOCAL_CFLAGS += -DDTS_EAGLE

    LOCAL_SRC_FILES += audio_extn/dts_eagle.c

endif



ifeq ($(strip $(DOLBY_DDP)),true)

    LOCAL_CFLAGS += -DDS1_DOLBY_DDP_ENABLED

    LOCAL_SRC_FILES += audio_extn/dolby.c
@@ -142,7 +161,33 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_MULTIPLE_TUNNEL)), true) 
endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER)),true)

    LOCAL_CFLAGS += -DQTI_FLAC_DECODER

    LOCAL_CFLAGS += -DFLAC_OFFLOAD_ENABLED

    LOCAL_CFLAGS += -DCOMPRESS_METADATA_NEEDED

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_VORBIS_OFFLOAD)),true)

    LOCAL_CFLAGS += -DVORBIS_OFFLOAD_ENABLED

    LOCAL_CFLAGS += -DCOMPRESS_METADATA_NEEDED



endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_WMA_OFFLOAD)),true)

    LOCAL_CFLAGS += -DWMA_OFFLOAD_ENABLED

    LOCAL_CFLAGS += -DCOMPRESS_METADATA_NEEDED

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD)),true)

    LOCAL_CFLAGS += -DALAC_OFFLOAD_ENABLED

    LOCAL_CFLAGS += -DCOMPRESS_METADATA_NEEDED

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_APE_OFFLOAD)),true)

    LOCAL_CFLAGS += -DAPE_OFFLOAD_ENABLED

    LOCAL_CFLAGS += -DCOMPRESS_METADATA_NEEDED

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24)),true)

       LOCAL_CFLAGS += -DPCM_OFFLOAD_ENABLED_24

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DEV_ARBI)),true)
@@ -167,6 +212,19 @@ ifneq ($(strip $(DOLBY_DDP)),true) 
endif

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_HDMI_PASSTHROUGH)),true)

    LOCAL_CFLAGS += -DHDMI_PASSTHROUGH_ENABLED

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_SOURCE_TRACKING)),true)

    LOCAL_CFLAGS += -DSOURCE_TRACKING_ENABLED

    LOCAL_SRC_FILES += audio_extn/source_track.c

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_AUDIOSPHERE)),true)

    LOCAL_CFLAGS += -DAUDIOSPHERE_ENABLED

endif



LOCAL_SHARED_LIBRARIES := \

	liblog \

	libcutils \

hal/audio_extn/audio_defs.h

+25 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are
@@ -48,6 +48,30 @@ 
#define AUDIO_OFFLOAD_CODEC_FLAC_MIN_FRAME_SIZE "music_offload_flac_min_frame_size"

#define AUDIO_OFFLOAD_CODEC_FLAC_MAX_FRAME_SIZE "music_offload_flac_max_frame_size"



#define AUDIO_OFFLOAD_CODEC_ALAC_FRAME_LENGTH "music_offload_alac_frame_length"

#define AUDIO_OFFLOAD_CODEC_ALAC_COMPATIBLE_VERSION "music_offload_alac_compatible_version"

#define AUDIO_OFFLOAD_CODEC_ALAC_BIT_DEPTH "music_offload_alac_bit_depth"

#define AUDIO_OFFLOAD_CODEC_ALAC_PB "music_offload_alac_pb"

#define AUDIO_OFFLOAD_CODEC_ALAC_MB "music_offload_alac_mb"

#define AUDIO_OFFLOAD_CODEC_ALAC_KB "music_offload_alac_kb"

#define AUDIO_OFFLOAD_CODEC_ALAC_NUM_CHANNELS "music_offload_alac_num_channels"

#define AUDIO_OFFLOAD_CODEC_ALAC_MAX_RUN "music_offload_alac_max_run"

#define AUDIO_OFFLOAD_CODEC_ALAC_MAX_FRAME_BYTES "music_offload_alac_max_frame_bytes"

#define AUDIO_OFFLOAD_CODEC_ALAC_AVG_BIT_RATE "music_offload_alac_avg_bit_rate"

#define AUDIO_OFFLOAD_CODEC_ALAC_SAMPLING_RATE "music_offload_alac_sampling_rate"

#define AUDIO_OFFLOAD_CODEC_ALAC_CHANNEL_LAYOUT_TAG "music_offload_alac_channel_layout_tag"



#define AUDIO_OFFLOAD_CODEC_APE_COMPATIBLE_VERSION "music_offload_ape_compatible_version"

#define AUDIO_OFFLOAD_CODEC_APE_COMPRESSION_LEVEL "music_offload_ape_compression_level"

#define AUDIO_OFFLOAD_CODEC_APE_FORMAT_FLAGS "music_offload_ape_format_flags"

#define AUDIO_OFFLOAD_CODEC_APE_BLOCKS_PER_FRAME "music_offload_ape_blocks_per_frame"

#define AUDIO_OFFLOAD_CODEC_APE_FINAL_FRAME_BLOCKS "music_offload_ape_final_frame_blocks"

#define AUDIO_OFFLOAD_CODEC_APE_TOTAL_FRAMES "music_offload_ape_total_frames"

#define AUDIO_OFFLOAD_CODEC_APE_BITS_PER_SAMPLE "music_offload_ape_bits_per_sample"

#define AUDIO_OFFLOAD_CODEC_APE_NUM_CHANNELS "music_offload_ape_num_channels"

#define AUDIO_OFFLOAD_CODEC_APE_SAMPLE_RATE "music_offload_ape_sample_rate"

#define AUDIO_OFFLOAD_CODEC_APE_SEEK_TABLE_PRESENT "music_offload_seek_table_present"



/* Query handle fm parameter*/

#define AUDIO_PARAMETER_KEY_HANDLE_FM "handle_fm"

hal/audio_extn/audio_extn.c

+447 −25

File changed.

Preview size limit exceeded, changes collapsed.

hal/audio_extn/audio_extn.h

+98 −8
Original line number Diff line number Diff line
@@ -15,6 +15,24 @@ 
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 * This file was modified by DTS, Inc. The portions of the

 * code modified by DTS, Inc are copyrighted and

 * licensed separately, as follows:

 *

 * (C) 2014 DTS, Inc.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 * http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef AUDIO_EXTN_H
@@ -51,15 +69,34 @@ 
#define AUDIO_DEVICE_IN_FM_RX_A2DP (AUDIO_DEVICE_BIT_IN | 0x10000)

#endif



#ifndef QTI_FLAC_DECODER

#define AUDIO_FORMAT_FLAC 0x19000000UL

#define AUDIO_OFFLOAD_CODEC_FLAC_MIN_BLK_SIZE "music_offload_flac_min_blk_size"

#define AUDIO_OFFLOAD_CODEC_FLAC_MAX_BLK_SIZE "music_offload_flac_max_blk_size"

#define AUDIO_OFFLOAD_CODEC_FLAC_MIN_FRAME_SIZE "music_offload_flac_min_frame_size"

#define AUDIO_OFFLOAD_CODEC_FLAC_MAX_FRAME_SIZE "music_offload_flac_max_frame_size"

#define PCM_OUTPUT_BIT_WIDTH (CODEC_BACKEND_DEFAULT_BIT_WIDTH)

#ifndef FLAC_OFFLOAD_ENABLED

#define AUDIO_FORMAT_FLAC 0x1D000000UL

#endif



#ifndef WMA_OFFLOAD_ENABLED

#define AUDIO_FORMAT_WMA 0x13000000UL

#define AUDIO_FORMAT_WMAPRO 0x14000000UL

#endif



#ifndef ALAC_OFFLOAD_ENABLED

#define AUDIO_FORMAT_ALAC 0x1F000000UL

#endif



#ifndef APE_OFFLOAD_ENABLED

#define AUDIO_FORMAT_APE 0x20000000UL

#endif



#ifndef COMPRESS_METADATA_NEEDED

#define audio_extn_parse_compress_metadata(out, parms) (0)

#else

int audio_extn_parse_compress_metadata(struct stream_out *out,

                                       struct str_parms *parms);

#endif



#ifdef PCM_OFFLOAD_ENABLED_24

#define PCM_OUTPUT_BIT_WIDTH (config->offload_info.bit_width)

#else

#define PCM_OUTPUT_BIT_WIDTH (CODEC_BACKEND_DEFAULT_BIT_WIDTH)

#endif



#define MAX_LENGTH_MIXER_CONTROL_IN_INT                  (128)
@@ -251,6 +288,28 @@ size_t audio_extn_compr_cap_read(struct stream_in *in, 
void audio_extn_compr_cap_deinit();

#endif



#ifndef DTS_EAGLE

#define audio_extn_dts_eagle_set_parameters(adev, parms)     (0)

#define audio_extn_dts_eagle_get_parameters(adev, query, reply) (0)

#define audio_extn_dts_eagle_fade(adev, fade_in, out) (0)

#define audio_extn_dts_create_state_notifier_node(stream_out) (0)

#define audio_extn_dts_notify_playback_state(stream_out, has_video, sample_rate, \

                                    channels, is_playing) (0)

#define audio_extn_dts_remove_state_notifier_node(stream_out) (0)

#define audio_extn_check_and_set_dts_hpx_state(adev)       (0)

#else

void audio_extn_dts_eagle_set_parameters(struct audio_device *adev,

                                         struct str_parms *parms);

int audio_extn_dts_eagle_get_parameters(const struct audio_device *adev,

                  struct str_parms *query, struct str_parms *reply);

int audio_extn_dts_eagle_fade(const struct audio_device *adev, bool fade_in, const struct stream_out *out);

void audio_extn_dts_create_state_notifier_node(int stream_out);

void audio_extn_dts_notify_playback_state(int stream_out, int has_video, int sample_rate,

                                  int channels, int is_playing);

void audio_extn_dts_remove_state_notifier_node(int stream_out);

void audio_extn_check_and_set_dts_hpx_state(const struct audio_device *adev);

#endif



#if defined(DS1_DOLBY_DDP_ENABLED) || defined(DS1_DOLBY_DAP_ENABLED)

void audio_extn_dolby_set_dmid(struct audio_device *adev);

#else
@@ -288,6 +347,34 @@ int audio_extn_dolby_get_snd_codec_id(struct audio_device *adev, 
void audio_extn_ddp_set_parameters(struct audio_device *adev,

                                   struct str_parms *parms);

void audio_extn_dolby_send_ddp_endp_params(struct audio_device *adev);



#endif



#ifndef HDMI_PASSTHROUGH_ENABLED

#define audio_extn_dolby_update_passt_formats(adev, out)                   (0)

#define audio_extn_dolby_update_passt_stream_configuration(adev, out)      (0)

#define audio_extn_dolby_is_passt_convert_supported(adev, out)             (0)

#define audio_extn_dolby_is_passt_supported(adev, out)                     (0)

#define audio_extn_dolby_is_passthrough_stream(flags)                      (0)

#define audio_extn_dolby_set_hdmi_config(adev, out)                        (0)

#define audio_extn_dolby_get_passt_buffer_size(info)                       (0)

#define audio_extn_dolby_set_passt_volume(out, mute)                       (0)

#define audio_extn_dolby_set_passt_latency(out, latency)                   (0)

#else

int audio_extn_dolby_update_passt_formats(struct audio_device *adev,

                                          struct stream_out *out);

bool audio_extn_dolby_is_passt_convert_supported(struct audio_device *adev,

                                                 struct stream_out *out);

bool audio_extn_dolby_is_passt_supported(struct audio_device *adev,

                                         struct stream_out *out);

void audio_extn_dolby_update_passt_stream_configuration(struct audio_device *adev,

                                                 struct stream_out *out);

bool audio_extn_dolby_is_passthrough_stream(int flags);

int audio_extn_dolby_set_hdmi_config(struct audio_device *adev,

                                     struct stream_out *out);

int audio_extn_dolby_get_passt_buffer_size(audio_offload_info_t* info);

int audio_extn_dolby_set_passt_volume(struct stream_out *out, int mute);

int audio_extn_dolby_set_passt_latency(struct stream_out *out, int latency);

#endif



#ifndef HFP_ENABLED
@@ -373,11 +460,14 @@ void audio_extn_ds2_set_parameters(struct audio_device *adev, 
typedef enum {

    DAP_STATE_ON = 0,

    DAP_STATE_BYPASS,

};

} dap_state;

#ifndef AUDIO_FORMAT_E_AC3_JOC

#define AUDIO_FORMAT_E_AC3_JOC  0x19000000UL

#endif



int b64decode(char *inp, int ilen, uint8_t* outp);

int b64encode(uint8_t *inp, int ilen, char* outp);



#ifndef KPI_OPTIMIZE_ENABLED

#define audio_extn_perf_lock_init() (0)

#define audio_extn_perf_lock_acquire() (0)