summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--board-info.txt4
-rwxr-xr-xfactory-images/generate-factory-images-package.sh116
-rwxr-xr-xinit.herring.rc6
-rw-r--r--media_profiles_korea.xml124
-rw-r--r--overlay/packages/apps/Mms/res/xml/mms_config.xml39
-rwxr-xr-xself-extractors/generate-packages.sh18
6 files changed, 249 insertions, 58 deletions
diff --git a/board-info.txt b/board-info.txt
index f188d59..5f44dd5 100644
--- a/board-info.txt
+++ b/board-info.txt
@@ -1,3 +1,3 @@
require board=herring
-require version-bootloader=I9020XXJK1|I9020XXKA3|I9020XXKI1|I9020XXKL1
-require version-baseband=I9020XXJK8|I9020XXKB1|I9020XXKD1|I9020XXKF1|I9020XXKI1|I9020UCKB2|I9020UCKD1|I9020UCKF1|I9020KRKB3|M200KRKC1
+require version-bootloader=I9020XXKA3|I9020XXKI1|I9020XXKL1
+require version-baseband=I9020XXKI1|I9020UCKB2|I9020UCKD1|I9020UCKF1|I9020UCKJ1|I9020KRKB3|M200KRKC1
diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh
new file mode 100755
index 0000000..44477ee
--- /dev/null
+++ b/factory-images/generate-factory-images-package.sh
@@ -0,0 +1,116 @@
+#!/bin/sh
+
+# Copyright (C) 2011 The Android Open Source Project
+#
+# 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.
+
+# 299849 = IMM76D
+
+PRODUCT=soju
+DEVICE=crespo
+BUILD=299849
+VERSION=imm76d
+RADIOSRC=radio.xx.img
+BOOTLOADER=i9020xxkl1
+RADIO=i9020xxki1
+
+if test "$RADIOSRC" = ""
+then
+ RADIOSRC=radio.img
+fi
+rm -rf tmp
+mkdir -p tmp/$PRODUCT-$VERSION
+unzip -d tmp signed-$PRODUCT-target_files-$BUILD.zip RADIO/$RADIOSRC RADIO/bootloader.img
+if test "$CDMARADIO" != ""
+then
+ unzip -d tmp signed-$PRODUCT-target_files-$BUILD.zip RADIO/radio-cdma.img
+fi
+cp signed-$PRODUCT-img-$BUILD.zip tmp/$PRODUCT-$VERSION/image-$PRODUCT-$VERSION.zip
+cp tmp/RADIO/bootloader.img tmp/$PRODUCT-$VERSION/bootloader-$DEVICE-$BOOTLOADER.img
+cp tmp/RADIO/$RADIOSRC tmp/$PRODUCT-$VERSION/radio-$DEVICE-$RADIO.img
+if test "$CDMARADIO" != ""
+then
+ cp tmp/RADIO/radio-cdma.img tmp/$PRODUCT-$VERSION/radio-cdma-$DEVICE-$CDMARADIO.img
+fi
+cat > tmp/$PRODUCT-$VERSION/flash-all.sh << EOF
+#!/bin/sh
+
+# Copyright (C) 2011 The Android Open Source Project
+#
+# 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.
+
+fastboot flash bootloader bootloader-$DEVICE-$BOOTLOADER.img
+fastboot reboot-bootloader
+sleep 5
+fastboot flash radio radio-$DEVICE-$RADIO.img
+fastboot reboot-bootloader
+sleep 5
+EOF
+if test "$CDMARADIO" != ""
+then
+cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF
+fastboot flash radio-cdma radio-cdma-$DEVICE-$CDMARADIO.img
+fastboot reboot-bootloader
+sleep 5
+EOF
+fi
+cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF
+fastboot -w update image-$PRODUCT-$VERSION.zip
+EOF
+chmod a+x tmp/$PRODUCT-$VERSION/flash-all.sh
+cat > tmp/$PRODUCT-$VERSION/flash-base.sh << EOF
+#!/bin/sh
+
+# Copyright (C) 2011 The Android Open Source Project
+#
+# 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.
+
+fastboot flash bootloader bootloader-$DEVICE-$BOOTLOADER.img
+fastboot reboot-bootloader
+sleep 5
+fastboot flash radio radio-$DEVICE-$RADIO.img
+fastboot reboot-bootloader
+sleep 5
+EOF
+if test "$CDMARADIO" != ""
+then
+cat >> tmp/$PRODUCT-$VERSION/flash-base.sh << EOF
+fastboot flash radio-cdma radio-cdma-$DEVICE-$CDMARADIO.img
+fastboot reboot-bootloader
+sleep 5
+EOF
+fi
+chmod a+x tmp/$PRODUCT-$VERSION/flash-base.sh
+(cd tmp ; tar zcvf ../$PRODUCT-$VERSION-factory.tgz $PRODUCT-$VERSION)
+mv $PRODUCT-$VERSION-factory.tgz $PRODUCT-$VERSION-factory-$(sha1sum < $PRODUCT-$VERSION-factory.tgz | cut -b -8).tgz
+rm -rf tmp
diff --git a/init.herring.rc b/init.herring.rc
index f96b476..45ae2d2 100755
--- a/init.herring.rc
+++ b/init.herring.rc
@@ -56,8 +56,6 @@ on fs
# We chown/chmod /efs because mount is run as root + defaults
chown radio radio /efs
chmod 0775 /efs
- mkdir /data/radio 0775 radio radio
- mkdir /data/radio/log 0775 radio radio
# permissions for NFC
setprop ro.nfc.port "I2C"
@@ -72,6 +70,10 @@ on post-fs-data
mkdir /data/misc/wifi/sockets 0770 wifi wifi
mkdir /data/misc/dhcp 0770 dhcp dhcp
+# create radio & log for ril daemon
+ mkdir /data/radio 0775 radio radio
+ mkdir /data/radio/log 0775 radio radio
+
setprop vold.post_fs_data_done 1
service gpsd /system/vendor/bin/gpsd -c /vendor/etc/gps.xml
diff --git a/media_profiles_korea.xml b/media_profiles_korea.xml
index 2d02319..7c00e3c 100644
--- a/media_profiles_korea.xml
+++ b/media_profiles_korea.xml
@@ -22,7 +22,7 @@
AudioDecoderCap)>
<!ELEMENT CamcorderProfiles (EncoderProfile+, ImageEncoding+, ImageDecoding, Camera)>
<!ELEMENT EncoderProfile (Video, Audio)>
-<!ATTLIST EncoderProfile quality (high|low) #REQUIRED>
+<!ATTLIST EncoderProfile quality (480p|qcif) #REQUIRED>
<!ATTLIST EncoderProfile fileFormat (mp4|3gp) #REQUIRED>
<!ATTLIST EncoderProfile duration (30|60) #REQUIRED>
<!ATTLIST EncoderProfile cameraId (0|1) #REQUIRED>
@@ -70,6 +70,16 @@
<!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>
+<!ATTLIST VideoEditorCap maxPrefetchYUVFrames 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
@@ -79,7 +89,7 @@
<!-- Each camcorder profile defines a set of predefined configuration parameters -->
<CamcorderProfiles cameraId="0">
- <EncoderProfile quality="high" fileFormat="mp4" duration="60">
+ <EncoderProfile quality="480p" fileFormat="mp4" duration="60">
<Video codec="h264"
bitRate="3000000"
width="720"
@@ -92,7 +102,7 @@
channels="1" />
</EncoderProfile>
- <EncoderProfile quality="low" fileFormat="3gp" duration="30">
+ <EncoderProfile quality="qcif" fileFormat="3gp" duration="30">
<Video codec="h263"
bitRate="256000"
width="176"
@@ -106,6 +116,33 @@
</EncoderProfile>
+ <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="60">
+ <Video codec="h264"
+ bitRate="3000000"
+ width="720"
+ height="480"
+ frameRate="30" />
+
+ <!-- Audio settings are not used for timealpse video recording -->
+ <Audio codec="aac"
+ bitRate="96000"
+ sampleRate="16000"
+ channels="1" />
+ </EncoderProfile>
+
+ <EncoderProfile quality="timelapseqcif" fileFormat="3gp" duration="30">
+ <Video codec="h264"
+ bitRate="256000"
+ width="176"
+ height="144"
+ frameRate="30" />
+ <!-- Audio settings are not used for timealpse video recording -->
+ <Audio codec="amrnb"
+ bitRate="12200"
+ sampleRate="8000"
+ channels="1" />
+ </EncoderProfile>
+
<ImageEncoding quality="90" />
<ImageEncoding quality="80" />
<ImageEncoding quality="70" />
@@ -115,12 +152,12 @@
<CamcorderProfiles cameraId="1">
- <EncoderProfile quality="high" fileFormat="mp4" duration="60">
+ <EncoderProfile quality="480p" fileFormat="mp4" duration="60">
<Video codec="h264"
bitRate="1000000"
width="640"
height="480"
- frameRate="30" />
+ frameRate="15" />
<Audio codec="aac"
bitRate="96000"
@@ -128,12 +165,12 @@
channels="1" />
</EncoderProfile>
- <EncoderProfile quality="low" fileFormat="3gp" duration="30">
+ <EncoderProfile quality="qcif" fileFormat="3gp" duration="30">
<Video codec="h263"
bitRate="256000"
width="176"
height="144"
- frameRate="30" />
+ frameRate="15" />
<Audio codec="amrnb"
bitRate="12200"
@@ -142,6 +179,33 @@
</EncoderProfile>
+ <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="60">
+ <Video codec="h264"
+ bitRate="1000000"
+ width="640"
+ height="480"
+ frameRate="15" />
+
+ <!-- Audio settings are not used for timealpse video recording -->
+ <Audio codec="aac"
+ bitRate="96000"
+ sampleRate="16000"
+ channels="1" />
+ </EncoderProfile>
+
+ <EncoderProfile quality="timelapseqcif" fileFormat="3gp" duration="30">
+ <Video codec="h264"
+ bitRate="256000"
+ width="176"
+ height="144"
+ frameRate="15" />
+ <!-- Audio settings are not used for timealpse video recording -->
+ <Audio codec="amrnb"
+ bitRate="12200"
+ sampleRate="8000"
+ channels="1" />
+ </EncoderProfile>
+
<ImageEncoding quality="90" />
<ImageEncoding quality="80" />
<ImageEncoding quality="70" />
@@ -160,21 +224,21 @@
-->
<VideoEncoderCap name="h264" enabled="true"
minBitRate="64000" maxBitRate="3000000"
- minFrameWidth="176" maxFrameWidth="800"
+ minFrameWidth="176" maxFrameWidth="720"
minFrameHeight="144" maxFrameHeight="480"
- minFrameRate="1" maxFrameRate="30" />
+ minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h263" enabled="true"
minBitRate="64000" maxBitRate="1000000"
- minFrameWidth="176" maxFrameWidth="800"
+ minFrameWidth="176" maxFrameWidth="720"
minFrameHeight="144" maxFrameHeight="480"
- minFrameRate="1" maxFrameRate="30" />
+ minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="m4v" enabled="true"
minBitRate="64000" maxBitRate="2000000"
- minFrameWidth="176" maxFrameWidth="800"
+ minFrameWidth="176" maxFrameWidth="720"
minFrameHeight="144" maxFrameHeight="480"
- minFrameRate="1" maxFrameRate="30" />
+ minFrameRate="15" maxFrameRate="30" />
<AudioEncoderCap name="aac" enabled="true"
minBitRate="8192" maxBitRate="96000"
@@ -200,4 +264,38 @@
-->
<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/overlay/packages/apps/Mms/res/xml/mms_config.xml b/overlay/packages/apps/Mms/res/xml/mms_config.xml
deleted file mode 100644
index cc04ebc..0000000
--- a/overlay/packages/apps/Mms/res/xml/mms_config.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- 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.
--->
-
-<!-- Version History
- version 1 - initial version.
- version 2 - added recipientLimit.
- version 3 - added min/max recycler values.
- version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-
- <!-- Maximum height for an attached image -->
- <int name="maxImageHeight">1920</int>
-
- <!-- Maximum width for an attached image -->
- <int name="maxImageWidth">2560</int>
-
- <!-- UAProf URL -->
- <string name="uaProfUrl">http://wap.samsungmobile.com/uaprof/nexuss.xml</string>
-
- <!-- User-Agent parameter used in MMS http request -->
- <!-- this is default to "Android-Mms/0.1". Override if necessary. Optional -->
- <string name="userAgent">nexuss</string>
-
-</mms_config>
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index cf72db1..1a99385 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -28,8 +28,22 @@
# 138179 = IRJ89
# 146649 = IRK18
# 185907 = IRK76
-ZIP=soju-ota-185907.zip
-BUILD=irk76
+# 236517 = IML70C
+# 237179 = IML73
+# 237867 = IML74B
+# 238432 = IML74E
+# 238649 = IML74G
+# 239410 = IML74K
+# 257829 = IMM30B
+# 262866 = IMM30D
+# 299849 = IMM76D
+# end ics-mr1
+BRANCH=ics-mr1
+if test $BRANCH=ics-mr1
+then
+ ZIP=soju-ota-299849.zip
+ BUILD=imm76d
+fi # ics-mr1
ROOTDEVICE=crespo
DEVICE=crespo
MANUFACTURER=samsung
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 14:30:41 +0000