From 4a1056b77d057acd8271b2f541ee48bb66d62fe3 Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Mon, 23 Jul 2012 16:38:51 +0200 Subject: jellybeaned --- configs/audio_policy.conf | 82 ++++++++++++++++ configs/tiny_hw.xml | 225 +++++++++++++++++++++++++++++++++++++++++++ p5110.mk | 5 + proprietary-common-files.txt | 26 ----- recovery.fstab | 4 +- system.prop | 1 + 6 files changed, 315 insertions(+), 28 deletions(-) create mode 100644 configs/audio_policy.conf create mode 100644 configs/tiny_hw.xml diff --git a/configs/audio_policy.conf b/configs/audio_policy.conf new file mode 100644 index 0000000..924811f --- /dev/null +++ b/configs/audio_policy.conf @@ -0,0 +1,82 @@ +# Global configuration section: lists input and output devices always present on the device +# as well as the output device selected by default. +# Devices are designated by a string that corresponds to the enum in audio.h + +global_configuration { + attached_output_devices AUDIO_DEVICE_OUT_SPEAKER + default_output_device AUDIO_DEVICE_OUT_SPEAKER + attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC +} + +# audio hardware module section: contains descriptors for all audio hw modules present on the +# device. Each hw module node is named after the corresponding hw module library base name. +# For instance, "primary" corresponds to audio.primary..so. +# The "primary" module is mandatory and must include at least one output with +# AUDIO_OUTPUT_FLAG_PRIMARY flag. +# Each module descriptor contains one or more output profile descriptors and zero or more +# input profile descriptors. Each profile lists all the parameters supported by a given output +# or input stream category. +# The "channel_masks", "formats", "devices" and "flags" are specified using strings corresponding +# to enums in audio.h and audio_policy.h. They are concatenated by use of "|" without space or "\n". + +audio_hw_modules { + primary { + outputs { + primary { + sampling_rates 44100 + channel_masks AUDIO_CHANNEL_OUT_STEREO + formats AUDIO_FORMAT_PCM_16_BIT + devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET + flags AUDIO_OUTPUT_FLAG_PRIMARY + } + deep_buffer { + sampling_rates 44100 + channel_masks AUDIO_CHANNEL_OUT_STEREO + formats AUDIO_FORMAT_PCM_16_BIT + devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE + flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER + } + hdmi { + sampling_rates 44100|48000 + channel_masks dynamic + formats AUDIO_FORMAT_PCM_16_BIT + devices AUDIO_DEVICE_OUT_AUX_DIGITAL + flags AUDIO_OUTPUT_FLAG_DIRECT + } + } + inputs { + primary { + sampling_rates 8000|11025|16000|22050|24000|32000|44100|48000 + channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO + formats AUDIO_FORMAT_PCM_16_BIT + devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET + } + } + } + a2dp { + outputs { + a2dp { + sampling_rates 44100 + channel_masks AUDIO_CHANNEL_OUT_STEREO + formats AUDIO_FORMAT_PCM_16_BIT + devices AUDIO_DEVICE_OUT_ALL_A2DP + } + } + } + usb { + outputs { + usb_accessory { + sampling_rates 44100 + channel_masks AUDIO_CHANNEL_OUT_STEREO + formats AUDIO_FORMAT_PCM_16_BIT + devices AUDIO_DEVICE_OUT_USB_ACCESSORY + } + usb_device { + sampling_rates 44100 + channel_masks AUDIO_CHANNEL_OUT_STEREO + formats AUDIO_FORMAT_PCM_16_BIT + devices AUDIO_DEVICE_OUT_USB_DEVICE + } + } + } +} diff --git a/configs/tiny_hw.xml b/configs/tiny_hw.xml new file mode 100644 index 0000000..f6fcc55 --- /dev/null +++ b/configs/tiny_hw.xml @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/p5110.mk b/p5110.mk index 0bad169..01172f4 100644 --- a/p5110.mk +++ b/p5110.mk @@ -20,5 +20,10 @@ LOCAL_PATH := device/samsung/p5110 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay +# Audio +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/configs/tiny_hw.xml:system/etc/sound/espresso10wifi \ + $(LOCAL_PATH)/configs/audio_policy.conf:system/etc/audio_policy.conf + # Use the non-open-source parts, if they're present $(call inherit-product, vendor/samsung/p51xx/p5110-vendor.mk) diff --git a/proprietary-common-files.txt b/proprietary-common-files.txt index 1c092d4..546367e 100644 --- a/proprietary-common-files.txt +++ b/proprietary-common-files.txt @@ -1,26 +1,12 @@ system/bin/geomagneticd system/bin/gpsd system/bin/orientationd -system/etc/audio/LVVEFS_Rx_Configuration.txt -system/etc/audio/LVVEFS_Tx_Configuration.txt -system/etc/audio/Rx_ControlParams_BLUETOOTH_HEADSET.txt -system/etc/audio/Rx_ControlParams_EARPIECE_WIDEBAND.txt -system/etc/audio/Rx_ControlParams_SPEAKER_WIDEBAND.txt -system/etc/audio/Rx_ControlParams_WIRED_HEADPHONE_WIDEBAND.txt -system/etc/audio/Rx_ControlParams_WIRED_HEADSET_WIDEBAND.txt -system/etc/audio/Tx_ControlParams_BLUETOOTH_HEADSET.txt -system/etc/audio/Tx_ControlParams_EARPIECE_WIDEBAND.txt -system/etc/audio/Tx_ControlParams_SPEAKER_WIDEBAND.txt -system/etc/audio/Tx_ControlParams_WIRED_HEADPHONE_WIDEBAND.txt -system/etc/audio/Tx_ControlParams_WIRED_HEADSET_WIDEBAND.txt system/etc/wifi/bcmdhd_apsta.bin system/etc/wifi/bcmdhd_mfg.bin system/etc/wifi/bcmdhd_p2p.bin system/etc/wifi/bcmdhd_sta.bin system/etc/wifi/nvram_mfg.txt system/etc/wifi/nvram_net.txt -system/lib/hw/audio.primary.piranha.so -system/lib/hw/audio_policy.piranha.so system/lib/hw/camera.omap4.so system/lib/hw/gps.omap4.so system/lib/hw/sensors.omap4.so @@ -33,25 +19,13 @@ system/lib/libOMX.TI.DUCATI1.VIDEO.H264E.so system/lib/libOMX.TI.DUCATI1.VIDEO.MPEG4E.so system/lib/libOMX_Core.so system/lib/libQmageDecoder.so -system/lib/lib_SamsungRec_V01003.so -system/lib/lib_Samsung_Resampler.so -system/lib/lib_Samsung_SB_AM_for_ICS_v03002.so -system/lib/lib_SoundAlive_for_ICS_V01012.so -system/lib/libaudiopolicy_sec.so -system/lib/libcontrolcsc.so system/lib/libdomx.so system/lib/libion.so -system/lib/liblibSoundAlive_VSP_ver305.so -system/lib/liblvvefs.so system/lib/libmm_osal.so system/lib/libril.so -system/lib/libsamsungRecord.so -system/lib/libsamsungSoundbooster.so system/lib/libsec-ril.so system/lib/libsecnativefeature.so system/lib/libsecril-client.so -system/lib/libsoundalive.so -system/lib/libtinyalsa.so system/lib/libtiutils.so system/vendor/bin/pvrsrvinit system/vendor/firmware/BCM4330.hcd diff --git a/recovery.fstab b/recovery.fstab index 673990a..3de882f 100644 --- a/recovery.fstab +++ b/recovery.fstab @@ -10,5 +10,5 @@ /bootloader emmc /dev/block/mmcblk0p2 /preload ext4 /dev/block/mmcblk0p11 -/emmc datamedia /dev/null -/sdcard vfat /dev/block/mmcblk1p1 +/sdcard datamedia /dev/null +/external_sd vfat /dev/block/mmcblk1p1 diff --git a/system.prop b/system.prop index 113af17..83ef816 100644 --- a/system.prop +++ b/system.prop @@ -4,3 +4,4 @@ rild.libpath=/vendor/lib/libsec-ril.so rild.libargs=-d /dev/ttys0 telephony.lteOnCdmaDevice=0 +ro.sf.lcd_density=160 -- cgit v1.1