summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrogersb11 <brettrogers11@gmail.com>2015-10-23 09:38:12 -0400
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-11-02 05:55:26 -0800
commit1b729b23e629491d25dd8e987ad9343f3098eaa2 (patch)
treede9e7d6b240ae17f69f9e789e3e0218c3510acc4
parent3e4ba9e3cc639283571030e9f36c4466a239fbff (diff)
downloaddevice_samsung_smdk4412-common-1b729b23e629491d25dd8e987ad9343f3098eaa2.tar.gz
device_samsung_smdk4412-common-1b729b23e629491d25dd8e987ad9343f3098eaa2.tar.bz2
device_samsung_smdk4412-common-1b729b23e629491d25dd8e987ad9343f3098eaa2.zip
M updates
Remove video from profiles and fixup init rc file More in t0lte Change-Id: Ieb1d1a5521c7438c51252c912b7e1d38077320c2
-rw-r--r--configs/media_profiles.xml44
-rwxr-xr-xrootdir/init.smdk4x12.rc47
2 files changed, 5 insertions, 86 deletions
diff --git a/configs/media_profiles.xml b/configs/media_profiles.xml
index 4dc5f0d..d01cafe 100644
--- a/configs/media_profiles.xml
+++ b/configs/media_profiles.xml
@@ -71,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
@@ -337,38 +328,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/rootdir/init.smdk4x12.rc b/rootdir/init.smdk4x12.rc
index 37592c5..9a39e7c 100755
--- a/rootdir/init.smdk4x12.rc
+++ b/rootdir/init.smdk4x12.rc
@@ -4,30 +4,10 @@ import /init.target.rc
import /init.smdk4x12.usb.rc
on init
- chmod 0701 /mnt/media_rw
- chown root root /mnt/media_rw
- mkdir /mnt/shell/emulated 0700 shell shell
- mkdir /storage 0550 system sdcard_r
- mkdir /storage/emulated 0555 root root
- mkdir /storage/sdcard1 0775 system system
- mkdir /storage/usbdisk0 0775 system system
- mkdir /mnt/media_rw/sdcard1 0775 system system
- mkdir /mnt/media_rw/usbdisk0 0775 system system
-
- export EXTERNAL_STORAGE /storage/emulated/legacy
- export SECONDARY_STORAGE /storage/sdcard1:/storage/usbdisk0
- export EMULATED_STORAGE_SOURCE /mnt/shell/emulated
- export EMULATED_STORAGE_TARGET /storage/emulated
-
- # for backwards compatibility
- symlink /storage/emulated/legacy /sdcard
- symlink /storage/emulated/legacy /mnt/sdcard
- symlink /storage/emulated/legacy /storage/sdcard0
- symlink /mnt/shell/emulated/0 /storage/emulated/legacy
- symlink /storage/sdcard1 /extSdCard
- symlink /storage/sdcard1 /mnt/extSdCard
- symlink /storage/usbdisk0 /usbdisk0
- symlink /storage/usbdisk0 /mnt/usbdisk0
+
+ # Support legacy paths
+ symlink /sdcard /mnt/sdcard
+ symlink /sdcard /storage/sdcard0
mkdir /efs 0771 radio system
mkdir /tombstones
@@ -37,8 +17,6 @@ on fs
mkdir /preload
mount_all /fstab.smdk4x12
- setprop ro.crypto.fuse_sdcard true
-
chown radio system /efs
chmod 0771 /efs
@@ -50,9 +28,6 @@ on charger
write /sys/devices/platform/s5p-ehci/power/control auto
on post-fs-data
- # we will remap this as /mnt/sdcard with the sdcard fuse tool
- mkdir /data/media 0775 media_rw media_rw
- chown media_rw media_rw /data/media
# data/log
mkdir /data/log 0775 system log
@@ -444,20 +419,6 @@ service sec_keyboard /system/bin/sec_keyboard /dev/ttySAC2
on property:ro.uart_debug=0
start sec_keyboard
-# create virtual SD card at /mnt/sdcard, based on the /data/media directory
-# daemon will drop to user/group system/media_rw after initializing
-# underlying files in /data/media wil be created with user and group media_rw (1023)
-service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated
- class late_start
-
-service fuse_sdcard1 /system/bin/sdcard -u 1023 -g 1023 -w 1023 /mnt/media_rw/sdcard1 /storage/sdcard1
- class late_start
- disabled
-
-service fuse_usbdisk0 /system/bin/sdcard -u 1023 -g 1023 /mnt/media_rw/usbdisk0 /storage/usbdisk0
- class late_start
- disabled
-
service charger /sbin/healthd -c
class charger
critical