summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-15 11:54:10 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-15 11:54:10 +0100
commit60e5a34630c69e575f157a2babac70048cc3bdb1 (patch)
tree9691d92caa5fba82bf307cf2af3374c616053bb8 /configs
parent8d57bd027ab7f354e1707510d3ba5654ba16c0aa (diff)
parent02a3b7b2c85b056f6172668ac9d2008a941a6df5 (diff)
downloaddevice_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.zip
device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.gz
device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.bz2
Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0
Conflicts: BoardCommonConfig.mk camera/Android.mk common.mk configs/80cfw lpm.rc overlay/frameworks/base/core/res/res/values/config.xml overlay/packages/apps/Camera2/res/values/config.xml
Diffstat (limited to 'configs')
-rw-r--r--configs/98netflix6
-rw-r--r--configs/audio_policy.conf24
-rw-r--r--configs/excluded-input-devices.xml9
-rwxr-xr-x[-rw-r--r--]configs/media_codecs.xml24
-rw-r--r--configs/media_profiles.xml165
-rw-r--r--configs/p2p_supplicant_overlay.conf11
-rw-r--r--configs/vold.fstab5
-rw-r--r--configs/wpa_supplicant.conf9
-rw-r--r--configs/wpa_supplicant_overlay.conf4
9 files changed, 71 insertions, 186 deletions
diff --git a/configs/98netflix b/configs/98netflix
new file mode 100644
index 0000000..92bf878
--- /dev/null
+++ b/configs/98netflix
@@ -0,0 +1,6 @@
+#!/system/bin/sh
+
+if [ -f /data/data/com.netflix.mediaclient/shared_prefs/nfxpref.xml ]; then
+ grep -q nflx_player_type.*6 /data/data/com.netflix.mediaclient/shared_prefs/nfxpref.xml && exit 0
+ cp /data/data/com.netflix.mediaclient/shared_prefs/nfxpref.xml /data/data/com.netflix.mediaclient/shared_prefs/nfxpref.xml.orig && sed -e 's|<int name="nflx_player_type".*||g; s|</map>|<int name="nflx_player_type" value="6" />\n</map>|g' /data/data/com.netflix.mediaclient/shared_prefs/nfxpref.xml.orig > /data/data/com.netflix.mediaclient/shared_prefs/nfxpref.xml && rm /data/data/com.netflix.mediaclient/shared_prefs/nfxpref.xml.orig
+fi
diff --git a/configs/audio_policy.conf b/configs/audio_policy.conf
index ef45a58..b9f065b 100644
--- a/configs/audio_policy.conf
+++ b/configs/audio_policy.conf
@@ -5,7 +5,7 @@
global_configuration {
attached_output_devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER
default_output_device AUDIO_DEVICE_OUT_SPEAKER
- attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC
+ attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX
}
# audio hardware module section: contains descriptors for all audio hw modules present on the
@@ -26,7 +26,7 @@ audio_hw_modules {
sampling_rates 44100
channel_masks AUDIO_CHANNEL_OUT_STEREO
formats AUDIO_FORMAT_PCM_16_BIT
- devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET
+ devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL
flags AUDIO_OUTPUT_FLAG_PRIMARY
}
deep_buffer {
@@ -75,7 +75,25 @@ audio_hw_modules {
sampling_rates 44100
channel_masks AUDIO_CHANNEL_OUT_STEREO
formats AUDIO_FORMAT_PCM_16_BIT
- devices AUDIO_DEVICE_OUT_USB_DEVICE
+ devices AUDIO_DEVICE_OUT_USB_DEVICE|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET
+ }
+ }
+ }
+ r_submix {
+ outputs {
+ submix {
+ sampling_rates 48000
+ channel_masks AUDIO_CHANNEL_OUT_STEREO
+ formats AUDIO_FORMAT_PCM_16_BIT
+ devices AUDIO_DEVICE_OUT_REMOTE_SUBMIX
+ }
+ }
+ inputs {
+ submix {
+ sampling_rates 48000
+ channel_masks AUDIO_CHANNEL_IN_STEREO
+ formats AUDIO_FORMAT_PCM_16_BIT
+ devices AUDIO_DEVICE_IN_REMOTE_SUBMIX
}
}
}
diff --git a/configs/excluded-input-devices.xml b/configs/excluded-input-devices.xml
new file mode 100644
index 0000000..17db3d9
--- /dev/null
+++ b/configs/excluded-input-devices.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Description : this file should include all system input the devices
+ that are not HCI devices such as mouse, touch-screen and keyboards.
+-->
+
+<devices>
+ <device name="sii9234_rcp"/>
+</devices>
diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml
index c8719db..b628b68 100644..100755
--- a/configs/media_codecs.xml
+++ b/configs/media_codecs.xml
@@ -76,34 +76,20 @@ Only the three quirks included above are recognized at this point:
-->
<MediaCodecs>
+ <Include href="media_codecs_google_audio.xml" />
+ <Include href="media_codecs_google_telephony.xml" />
+
<Decoders>
- <MediaCodec name="OMX.SEC.AVC.Decoder" type="video/avc" />
<MediaCodec name="OMX.SEC.MPEG4.Decoder" type="video/mp4v-es" />
<MediaCodec name="OMX.SEC.H263.Decoder" type="video/3gpp" />
<MediaCodec name="OMX.SEC.AVC.Decoder" type="video/avc" />
- <MediaCodec name="OMX.SEC.VP8.Decoder" type="video/x-vnd.on2.vp8" />
-
- <MediaCodec name="OMX.google.mp3.decoder" type="audio/mpeg" />
- <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" />
- <MediaCodec name="OMX.google.g711.mlaw.decoder" type="audio/g711-mlaw" />
- <MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis" />
- <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" />
- <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" />
- <MediaCodec name="OMX.google.h264.decoder" type="video/avc" />
- <MediaCodec name="OMX.google.vpx.decoder" type="video/x-vnd.on2.vp8" />
</Decoders>
<Encoders>
<MediaCodec name="OMX.SEC.MPEG4.Encoder" type="video/mp4v-es" />
<MediaCodec name="OMX.SEC.H263.Encoder" type="video/3gpp" />
<MediaCodec name="OMX.SEC.AVC.Encoder" type="video/avc" />
-
- <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_video.xml" />
+ <Include href="media_codecs_ffmpeg.xml" />
</MediaCodecs>
diff --git a/configs/media_profiles.xml b/configs/media_profiles.xml
index 41c5848..870fe9b 100644
--- a/configs/media_profiles.xml
+++ b/configs/media_profiles.xml
@@ -25,6 +25,7 @@
<!ATTLIST EncoderProfile quality (timelapse1080p|timelapse720p|timelapse480p|timelapsehigh|timelapselow|480p|qcif|high|low) #REQUIRED>
<!ATTLIST EncoderProfile fileFormat (mp4|3gp) #REQUIRED>
<!ATTLIST EncoderProfile duration (30|60) #REQUIRED>
+ <!ATTLIST EncoderProfile cameraId (0|1) #REQUIRED>
<!ELEMENT Video EMPTY>
<!ATTLIST Video codec (h264|h263|m4v) #REQUIRED>
<!ATTLIST Video bitRate CDATA #REQUIRED>
@@ -70,15 +71,6 @@
<!ELEMENT AudioDecoderCap EMPTY>
<!ATTLIST AudioDecoderCap name (wma) #REQUIRED>
<!ATTLIST AudioDecoderCap enabled (true|false) #REQUIRED>
- <!ELEMENT VideoEditorCap EMPTY>
- <!ATTLIST VideoEditorCap maxInputFrameWidth CDATA #REQUIRED>
- <!ATTLIST VideoEditorCap maxInputFrameHeight CDATA #REQUIRED>
- <!ATTLIST VideoEditorCap maxOutputFrameWidth CDATA #REQUIRED>
- <!ATTLIST VideoEditorCap maxOutputFrameHeight CDATA #REQUIRED>
- <!ELEMENT ExportVideoProfile EMPTY>
- <!ATTLIST ExportVideoProfile name (h264|h263|m4v) #REQUIRED>
- <!ATTLIST ExportVideoProfile profile CDATA #REQUIRED>
- <!ATTLIST ExportVideoProfile level CDATA #REQUIRED>
]>
<!--
This file is used to declare the multimedia profiles and capabilities
@@ -89,30 +81,17 @@
<!-- Back Camera -->
<CamcorderProfiles cameraId="0">
- <EncoderProfile quality="low" fileFormat="mp4" duration="30">
+ <EncoderProfile quality="qvga" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="384000"
- width="176"
- height="144"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="128000"
- sampleRate="48000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="qcif" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="384000"
- width="176"
- height="144"
- frameRate="30" />
+ width="320"
+ height="240"
+ frameRate="15" />
<Audio codec="aac"
bitRate="128000"
sampleRate="48000"
- channels="1" />
+ channels="2" />
</EncoderProfile>
<EncoderProfile quality="480p" fileFormat="mp4" duration="30">
@@ -154,40 +133,6 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="timelapselow" fileFormat="3gp" duration="30">
- <Video codec="h264"
- bitRate="384000"
- width="176"
- height="144"
- frameRate="30" />
-
- <!--
- The Audio part of the profile will not be used since time lapse mode
- does not capture audio
- -->
- <Audio codec="aac"
- bitRate="128000"
- sampleRate="48000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="17000000"
- width="1920"
- height="1080"
- frameRate="30" />
-
- <!--
- The Audio part of the profile will not be used since time lapse mode
- does not capture audio
- -->
- <Audio codec="aac"
- bitRate="128000"
- sampleRate="48000"
- channels="1" />
- </EncoderProfile>
-
<EncoderProfile quality="timelapseqcif" fileFormat="3gp" duration="30">
<Video codec="h264"
bitRate="384000"
@@ -266,38 +211,12 @@
<!-- Front Camera -->
<CamcorderProfiles cameraId="1">
- <EncoderProfile quality="low" fileFormat="3gp" duration="30">
- <Video codec="h264"
- bitRate="384000"
- width="176"
- height="144"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="128000"
- sampleRate="48000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="high" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="3078000"
- width="640"
- height="480"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="128000"
- sampleRate="48000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="qcif" fileFormat="3gp" duration="30">
+ <EncoderProfile quality="qvga" fileFormat="3gp" duration="30">
<Video codec="h264"
bitRate="384000"
- width="176"
- height="144"
- frameRate="30" />
+ width="320"
+ height="240"
+ frameRate="15" />
<Audio codec="aac"
bitRate="128000"
@@ -318,34 +237,13 @@
channels="1" />
</EncoderProfile>
- <EncoderProfile quality="timelapselow" fileFormat="3gp" duration="30">
- <Video codec="h264"
- bitRate="384000"
- width="176"
- height="144"
- frameRate="30" />
-
- <!--
- The Audio part of the profile will not be used since time lapse mode
- does not capture audio
- -->
- <Audio codec="aac"
- bitRate="128000"
- sampleRate="48000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
+ <EncoderProfile quality="720p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="3078000"
- width="640"
- height="480"
+ bitRate="12000000"
+ width="1280"
+ height="720"
frameRate="30" />
- <!--
- The Audio part of the profile will not be used since time lapse mode
- does not capture audio
- -->
<Audio codec="aac"
bitRate="128000"
sampleRate="48000"
@@ -443,38 +341,5 @@
-->
<VideoDecoderCap name="wmv" enabled="false"/>
<AudioDecoderCap name="wma" enabled="false"/>
- <!--
- The VideoEditor Capability configuration:
- - maxInputFrameWidth: maximum video width of imported video clip.
- - maxInputFrameHeight: maximum video height of imported video clip.
- - maxOutputFrameWidth: maximum video width of exported video clip.
- - maxOutputFrameHeight: maximum video height of exported video clip.
- - maxPrefetchYUVFrames: maximum prefetch YUV frames for encoder,
- used to limit the amount of memory for prefetched YUV frames.
- For this platform, it allows maximum 8MB(1.3MB per 720p frame x 6
- frames) memory.
- -->
- <VideoEditorCap maxInputFrameWidth="1280"
- maxInputFrameHeight="720" maxOutputFrameWidth="1280"
- maxOutputFrameHeight="720" maxPrefetchYUVFrames="6"/>
- <!--
- The VideoEditor Export codec profile and level values
- correspond to the values in OMX_Video.h.
- E.g. for h264, profile value 1 means OMX_VIDEO_AVCProfileBaseline
- and level 2048 means OMX_VIDEO_AVCLevel4.
- Please note that the values are in decimal.
- These values are for video encoder.
- -->
- <!--
- Codec = h.264, Baseline profile, level 4
- -->
- <ExportVideoProfile name="h264" profile= "1" level="2048"/>
- <!--
- Codec = h.263, Baseline profile, level 0
- -->
- <ExportVideoProfile name="h263" profile= "1" level="1"/>
- <!--
- Codec = mpeg4, Simple profile, level 5
- -->
- <ExportVideoProfile name="m4v" profile= "1" level="128"/>
+
</MediaSettings>
diff --git a/configs/p2p_supplicant_overlay.conf b/configs/p2p_supplicant_overlay.conf
new file mode 100644
index 0000000..1566988
--- /dev/null
+++ b/configs/p2p_supplicant_overlay.conf
@@ -0,0 +1,11 @@
+disable_scan_offload=1
+p2p_listen_reg_class=81
+p2p_listen_channel=1
+p2p_oper_reg_class=124
+p2p_oper_channel=149
+manufacturer=SAMSUNG_ELECTRONICS
+model_name=SAMSUNG_MOBILE
+model_number=2014
+serial_number=19691101
+update_config=1
+no_ctrl_interface=
diff --git a/configs/vold.fstab b/configs/vold.fstab
deleted file mode 100644
index 6efc0ee..0000000
--- a/configs/vold.fstab
+++ /dev/null
@@ -1,5 +0,0 @@
-# external sdcard
-dev_mount sdcard1 /storage/sdcard1 auto /devices/platform/s3c-sdhci.2/mmc_host/mmc1/
-
-# usbdisk
-dev_mount usbdisk0 /storage/usbdisk0 auto /devices/platform/s5p-ehci
diff --git a/configs/wpa_supplicant.conf b/configs/wpa_supplicant.conf
deleted file mode 100644
index 314897f..0000000
--- a/configs/wpa_supplicant.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-update_config=1
-ctrl_interface=wlan0
-eapol_version=1
-ap_scan=1
-fast_reauth=1
-p2p_listen_reg_class=81
-p2p_listen_channel=1
-p2p_oper_reg_class=115
-p2p_oper_channel=48
diff --git a/configs/wpa_supplicant_overlay.conf b/configs/wpa_supplicant_overlay.conf
new file mode 100644
index 0000000..46504a2
--- /dev/null
+++ b/configs/wpa_supplicant_overlay.conf
@@ -0,0 +1,4 @@
+p2p_disabled=1
+autoscan=samsung_exponential:8:128
+update_config=1
+no_ctrl_interface=