aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Buckley <ptrck@blck.io>2015-04-06 10:53:52 -0700
committerPatrick Buckley <ptrck@blck.io>2015-04-06 10:53:52 -0700
commit01d721d1525e0c260733548a0fdd5a7cc768a275 (patch)
treed4094c4909c2026ecace84f25a47af0d91f645bc
parente8ce32fc86b2498124855df223793a8acadef6fa (diff)
parentb562792d9db14dc153d671d18e82afe94337ece0 (diff)
Merge pull request #5 from lssjbrolli/cm-12.0
klimtlte: Tweaks and fixes
-rw-r--r--BoardConfig.mk3
-rw-r--r--configs/PARAM.ini2
-rw-r--r--configs/PDC.ini28
-rw-r--r--configs/audio_effects.conf96
-rw-r--r--configs/media_codecs.xml71
-rw-r--r--device.mk10
-rw-r--r--proprietary-files.txt4
-rw-r--r--rootdir/Android.mk8
-rw-r--r--rootdir/etc/lpm.rc89
9 files changed, 100 insertions, 211 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index a28eef6..a3f7536 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -52,6 +52,9 @@ COMMON_GLOBAL_CFLAGS += -DDISABLE_HW_ID_MATCH_CHECK
COMMON_GLOBAL_CFLAGS += -DSAMSUNG_CAMERA_HARDWARE
COMMON_GLOBAL_CFLAGS += -DSAMSUNG_DVFS
+# Fonts
+EXTENDED_FONT_FOOTPRINT := true
+
# Force the screenshot path to CPU consumer
COMMON_GLOBAL_CFLAGS += -DFORCE_SCREENSHOT_CPU_PATH
diff --git a/configs/PARAM.ini b/configs/PARAM.ini
new file mode 100644
index 0000000..0c2fef5
--- /dev/null
+++ b/configs/PARAM.ini
@@ -0,0 +1,2 @@
+DGAIN = 2
+DOEENABLE = 1
diff --git a/configs/PDC.ini b/configs/PDC.ini
new file mode 100644
index 0000000..4239cd9
--- /dev/null
+++ b/configs/PDC.ini
@@ -0,0 +1,28 @@
+#Sec Default AK8963 2013-03-04 Average
+HPRMS0 = 0
+HPRMS1 = 0
+HPRMS2 = 0
+HPRMS3 = 0
+HPRMS4 = 0
+HPRMS5 = 0
+HPRMS6 = 0
+HPRMS7 = 0
+HPRMS8 = 0
+HPRMS9 = 0
+HPRMS10 = 0
+HPRMS11 = 0
+HPRMS12 = 0
+HPRMS13 = 0
+HPRMS14 = 0
+HPRMS15 = 0
+HPRMS16 = 0
+HPRMS17 = 0
+HPRMS18 = 0
+HPRMS19 = 0
+HPRMS20 = 0
+HPRMS21 = 0
+HPRMS22 = 0
+HPRMS23 = 0
+HPRMS24 = 0
+HPRMS25 = 0
+HPRMS26 = 0
diff --git a/configs/audio_effects.conf b/configs/audio_effects.conf
index 181ab0d..f19861c 100644
--- a/configs/audio_effects.conf
+++ b/configs/audio_effects.conf
@@ -6,29 +6,23 @@
# }
# }
libraries {
+ audio_pre_processing {
+ path /system/lib/soundfx/libaudiopreprocessing.so
+ }
bundle {
path /system/lib/soundfx/libbundlewrapper.so
}
- cm {
- path /system/lib/soundfx/libcyanogen-dsp.so
- }
reverb {
path /system/lib/soundfx/libreverbwrapper.so
}
- visualizer_sw {
+ visualizer {
path /system/lib/soundfx/libvisualizer.so
}
- visualizer_hw {
- path /system/lib/soundfx/libqcomvisualizer.so
- }
downmix {
path /system/lib/soundfx/libdownmix.so
}
- proxy {
- path /system/lib/soundfx/libeffectproxy.so
- }
- audio_pre_processing {
- path /system/lib/soundfx/libqcomvoiceprocessing.so
+ loudness_enhancer {
+ path /system/lib/soundfx/libldnhncr.so
}
}
@@ -48,73 +42,61 @@ libraries {
# }
effects {
- compression {
- library cm
- uuid f27317f4-c984-4de6-9a90-545759495bf2
+ visualizer {
+ library visualizer
+ uuid d069d9e0-8329-11df-9168-0002a5d5c51b
}
bassboost {
-# library bundle
-# uuid 8631f300-72e2-11df-b57e-0002a5d5c51b
- library cm
- uuid 42b5cbf5-4dd8-4e79-a5fb-cceb2cb54e13
+ library bundle
+ uuid 8631f300-72e2-11df-b57e-0002a5d5c51b
}
virtualizer {
-# library bundle
-# uuid 1d4033c0-8557-11df-9f2d-0002a5d5c51b
- library cm
- uuid 7c6cc5f8-6f34-4449-a282-bed84f1a5b5a
+ library bundle
+ uuid 1d4033c0-8557-11df-9f2d-0002a5d5c51b
}
equalizer {
-# library bundle
-# uuid ce772f20-847d-11df-bb17-0002a5d5c51b
- library cm
- uuid 58bc9000-0d7f-462e-90d2-035eddd8b434
+ library bundle
+ uuid ce772f20-847d-11df-bb17-0002a5d5c51b
}
volume {
library bundle
- uuid 119341a0-8469-11df-81f9-0002a5d5c51b
+ uuid 119341a0-8469-11df-81f9-0002a5d5c51b
}
reverb_env_aux {
library reverb
- uuid 4a387fc0-8ab3-11df-8bad-0002a5d5c51b
+ uuid 4a387fc0-8ab3-11df-8bad-0002a5d5c51b
}
reverb_env_ins {
library reverb
- uuid c7a511a0-a3bb-11df-860e-0002a5d5c51b
+ uuid c7a511a0-a3bb-11df-860e-0002a5d5c51b
}
reverb_pre_aux {
library reverb
- uuid f29a1400-a3bb-11df-8ddc-0002a5d5c51b
+ uuid f29a1400-a3bb-11df-8ddc-0002a5d5c51b
}
reverb_pre_ins {
library reverb
- uuid 172cdf00-a3bc-11df-a72f-0002a5d5c51b
- }
- visualizer {
- library proxy
- uuid 1d0a1a53-7d5d-48f2-8e71-27fbd10d842c
-
- libsw {
- library visualizer_sw
- uuid d069d9e0-8329-11df-9168-0002a5d5c51b
- }
-
- libhw {
- library visualizer_hw
- uuid 7a8044a0-1a71-11e3-a184-0002a5d5c51b
- }
+ uuid 172cdf00-a3bc-11df-a72f-0002a5d5c51b
}
downmix {
library downmix
- uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f
+ uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f
+ }
+ loudness_enhancer {
+ library loudness_enhancer
+ uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c
+ }
+ agc {
+ library audio_pre_processing
+ uuid aa8130e0-66fc-11e0-bad0-0002a5d5c51b
}
aec {
library audio_pre_processing
- uuid 0f8d0d2a-59e5-45fe-b6e4-248c8a799109
+ uuid bb392ec0-8d4d-11e0-a896-0002a5d5c51b
}
- ns {
+ ns {
library audio_pre_processing
- uuid 1d97bb0b-9e2f-4403-9ae3-58c2554306f8
+ uuid c06c8400-8e06-11e0-9cb6-0002a5d5c51b
}
}
# Audio preprocessor configurations.
@@ -153,6 +135,14 @@ effects {
# ...
# }
-#
-# TODO: add default audio pre processor configurations after debug and tuning phase
-#
+audience_pre_processing {
+ voice_communication {
+ aec {}
+ ns {}
+ }
+ camcorder {
+ agc {}
+ }
+}
+
+
diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml
index cc9115e..e2d5fa9 100644
--- a/configs/media_codecs.xml
+++ b/configs/media_codecs.xml
@@ -76,21 +76,15 @@ Only the three quirks included above are recognized at this point:
-->
<MediaCodecs>
+
<Decoders>
- <MediaCodec name="OMX.google.mp3.decoder" type="audio/mpeg" />
-
+ <!-- Video Hardware -->
<MediaCodec name="OMX.Exynos.MPEG4.Decoder" type="video/mp4v-es" >
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
<Quirk name="video-controller-check-enable" />
</MediaCodec>
- <MediaCodec name="OMX.Exynos.H263.Decoder" type="video/3gpp" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Quirk name="video-controller-check-enable" />
- </MediaCodec>
-
<MediaCodec name="OMX.Exynos.AVC.Decoder" type="video/avc" >
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
@@ -102,71 +96,34 @@ Only the three quirks included above are recognized at this point:
<Quirk name="requires-allocate-on-output-ports" />
<Quirk name="video-controller-check-enable" />
</MediaCodec>
-
- <MediaCodec name="OMX.google.amrnb.decoder" type="audio/3gpp" />
- <MediaCodec name="OMX.google.amrwb.decoder" type="audio/amr-wb" />
- <MediaCodec name="OMX.google.aac.decoder" type="audio/mp4a-latm" />
- <MediaCodec name="OMX.google.g711.alaw.decoder" type="audio/g711-alaw">
- <Quirk name="decoder-lies-about-samplingrate" />
- </MediaCodec>
- <MediaCodec name="OMX.google.g711.mlaw.decoder" type="audio/g711-mlaw">
- <Quirk name="decoder-lies-about-samplingrate" />
- </MediaCodec>
- <MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis" />
- <MediaCodec name="OMX.google.raw.decoder" type="audio/raw" />
- <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" />
- <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" />
- <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" />
- <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" />
-
- <!-- ffmpeg audio codecs -->
- <MediaCodec name="OMX.ffmpeg.ra.decoder" type="audio/vnd.rn-realaudio"/>
- <MediaCodec name="OMX.ffmpeg.flac.decoder" type="audio/flac"/>
- <MediaCodec name="OMX.ffmpeg.mp2.decoder" type="audio/mpeg-L2"/>
- <MediaCodec name="OMX.ffmpeg.ac3.decoder" type="audio/ac3"/>
- <MediaCodec name="OMX.ffmpeg.ape.decoder" type="audio/x-ape"/>
- <MediaCodec name="OMX.ffmpeg.dts.decoder" type="audio/vnd.dts"/>
- <MediaCodec name="OMX.ffmpeg.atrial.decoder" type="audio/ffmpeg"/>
-
- <!-- ffmpeg video codecs -->
- <MediaCodec name="OMX.ffmpeg.mpeg2v.decoder" type="video/mpeg2"/>
- <MediaCodec name="OMX.ffmpeg.wmv.decoder" type="video/x-ms-wmv"/>
- <MediaCodec name="OMX.ffmpeg.rv.decoder" type="video/vnd.rn-realvideo"/>
- <MediaCodec name="OMX.ffmpeg.vc1.decoder" type="video/vc1"/>
- <MediaCodec name="OMX.ffmpeg.flv1.decoder" type="video/x-flv"/>
- <MediaCodec name="OMX.ffmpeg.divx.decoder" type="video/divx"/>
- <MediaCodec name="OMX.ffmpeg.hevc.decoder" type="video/hevc"/>
- <MediaCodec name="OMX.ffmpeg.vtrial.decoder" type="video/ffmpeg"/>
- <MediaCodec name="OMX.ffmpeg.h264.decoder" type="video/avc" />
+
</Decoders>
-
+
<Encoders>
-
+ <!-- Video Hardware -->
<MediaCodec name="OMX.Exynos.MPEG4.Encoder" type="video/mp4v-es" >
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
<Quirk name="video-controller-check-enable" />
</MediaCodec>
- <MediaCodec name="OMX.Exynos.H263.Encoder" type="video/3gpp" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Quirk name="video-controller-check-enable" />
- </MediaCodec>
+
<MediaCodec name="OMX.Exynos.AVC.Encoder" type="video/avc" >
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
<Quirk name="video-controller-check-enable" />
</MediaCodec>
+
<MediaCodec name="OMX.Exynos.VP8.Encoder" type="video/x-vnd.on2.vp8" >
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
<Quirk name="video-controller-check-enable" />
- </MediaCodec>
-
+ </MediaCodec>
- <MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp" />
- <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" />
- <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" />
- <MediaCodec name="OMX.google.flac.encoder" type="audio/flac" />
</Encoders>
+
+ <Include href="media_codecs_google_telephony.xml" />
+ <Include href="media_codecs_google_audio.xml" />
+ <Include href="media_codecs_google_video.xml" />
+ <Include href="media_codecs_ffmpeg.xml" />
+
</MediaCodecs>
diff --git a/device.mk b/device.mk
index 9e3dd7a..f788e91 100644
--- a/device.mk
+++ b/device.mk
@@ -169,14 +169,18 @@ PRODUCT_PACKAGES += \
# Recovery
PRODUCT_PACKAGES += \
init.recovery.universal5420.rc
+
+# Samsung Service Mode
+PRODUCT_PACKAGES += \
+ SamsungServiceMode
# Sensors
PRODUCT_PACKAGES += \
sensors.universal5420
-# Torch
-PRODUCT_PACKAGES += \
- Torch
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/configs/PARAM.ini:system/etc/PARAM.ini \
+ $(LOCAL_PATH)/configs/PDC.ini:system/etc/PDC.ini
# Wifi
PRODUCT_COPY_FILES += \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 9f30253..556ce80 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -95,5 +95,7 @@ usr/idc/Synaptics_HID_TouchPad.idc
usr/keylayout/gpio-keys.kl
# Radio
+lib/libril.so
lib/libsec-ril.so
-bin/cbd \ No newline at end of file
+bin/cbd
+bin/rild \ No newline at end of file
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 35689ed..ceb9a56 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -50,14 +50,6 @@ LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
-LOCAL_MODULE := lpm.rc
-LOCAL_MODULE_TAGS := optional eng
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES := etc/lpm.rc
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
LOCAL_MODULE := ueventd.universal5420.rc
LOCAL_MODULE_TAGS := optional eng
LOCAL_MODULE_CLASS := ETC
diff --git a/rootdir/etc/lpm.rc b/rootdir/etc/lpm.rc
deleted file mode 100644
index 8054100..0000000
--- a/rootdir/etc/lpm.rc
+++ /dev/null
@@ -1,89 +0,0 @@
-on early-init
- start ueventd
-
-on init
-
- export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
- export LD_LIBRARY_PATH /vendor/lib:/system/lib
- export ANDROID_ROOT /system
- export ANDROID_DATA /data
- export EXTERNAL_STORAGE /sdcard
-
- symlink /system/etc /etc
-
-# Right now vendor lives on the same filesystem as system,
-# but someday that may change.
- symlink /system/vendor /vendor
-
- mkdir /sdcard
- mkdir /preload
- mkdir /system
- mkdir /data
- mkdir /cache
- mkdir /efs
- mkdir /tmp
- mkdir /dbdata
- mkdir /mnt 0775 root root
- #mount /tmp /tmp tmpfs
-
- write /proc/sys/kernel/hung_task_timeout_secs 0
-
-on early-fs
- insmod /lib/modules/vibrator.ko
-
- mount ext4 /dev/block/mmcblk0p20 /system ro wait noatime
- mount ext4 /dev/block/mmcblk0p3 /efs noatime nosuid nodev journal_async_commit
-
- mkdir /data/log 0777
-
- chmod 0666 /dev/log/radio
- chmod 0666 /dev/log/main
- chmod 0666 /dev/log/event
-
-on boot
-# write /sys/class/sec/switch/usb_sel PDA
-
-# CPU Frequency Governor
- write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor pegasusq
-
-# EHCI runtime enable for LPA
- write /sys/devices/platform/s5p-ehci/power/control auto
-
- ifup lo
- hostname localhost
- domainname localdomain
-
- class_start default
-
-service debuggerd /system/bin/debuggerd
-
- service ueventd /sbin/ueventd
- critical
-
-#service console /bin/sh
-service console /system/bin/sh
- console
-
-service playlpm /system/bin/playlpm
- user root
-
-service immvibed /system/bin/immvibed
- oneshot
-
-service lpmkey /system/bin/lpmkey
- user root
-
-# adbd is controlled by the persist.service.adb.enable system property
-service adbd /sbin/adbd
- disabled
-
-# adbd on at boot in emulator
-on property:ro.kernel.qemu=1
- start adbd
-
-on property:persist.service.adb.enable=1
- start adbd
-
-on property:persist.service.adb.enable=0
- stop adbd
-