leo: update to latest
* use device_htc_7x30-recovery for recovery * fixed postrecoveryboot * amended media_profiles.xml Change-Id: I37bec28702aaa55155bfdb8a1a95d63b4bf45eb6
This commit is contained in:
parent
40364b7f71
commit
98364a4494
@ -102,5 +102,4 @@ BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := leo
|
||||
BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 3200
|
||||
|
||||
TARGET_PREBUILT_RECOVERY_KERNEL := device/htc/leo/prebuilt/recovery_kernel
|
||||
|
||||
BOARD_USES_RECOVERY_CHARGEMODE := true
|
||||
-include device/htc/7x30-recovery/BoardConfigCommon.mk
|
||||
|
3
leo.mk
3
leo.mk
@ -88,7 +88,7 @@ PRODUCT_COPY_FILES += \
|
||||
PRODUCT_COPY_FILES += \
|
||||
vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
|
||||
|
||||
|
||||
# kernel modules
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/htc/leo/prebuilt/modules/bcm4329.ko:system/lib/modules/bcm4329.ko \
|
||||
device/htc/leo/prebuilt/modules/cifs.ko:system/lib/modules/cifs.ko \
|
||||
@ -97,6 +97,7 @@ PRODUCT_COPY_FILES += \
|
||||
device/htc/leo/prebuilt/modules/tun.ko:system/lib/modules/tun.ko \
|
||||
device/htc/leo/prebuilt/modules/fuse.ko:system/lib/modules/fuse.ko
|
||||
|
||||
# kernel
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/htc/leo/prebuilt/kernel:boot/zImage \
|
||||
|
||||
|
@ -21,5 +21,5 @@
|
||||
for different hardware and product builds. -->
|
||||
<resources>
|
||||
<!-- Autofocus parameters -->
|
||||
<string name="touchFocusParameter">touch-focus</string>
|
||||
<!-- <string name="touchFocusParameter">touch-focus</string> -->
|
||||
</resources>
|
||||
|
@ -14,4 +14,3 @@ fi
|
||||
#cat >> /etc/fstab << EOF
|
||||
#/dev/block/mmcblk0p2 /sd-ext $FS rw
|
||||
#EOF
|
||||
|
||||
|
@ -22,7 +22,7 @@
|
||||
AudioDecoderCap)>
|
||||
<!ELEMENT CamcorderProfiles (EncoderProfile+, ImageEncoding+, ImageDecoding, Camera)>
|
||||
<!ELEMENT EncoderProfile (Video, Audio)>
|
||||
<!ATTLIST EncoderProfile quality (high|low) #REQUIRED>
|
||||
<!ATTLIST EncoderProfile quality (hd|high|low) #REQUIRED>
|
||||
<!ATTLIST EncoderProfile fileFormat (mp4|3gp) #REQUIRED>
|
||||
<!ATTLIST EncoderProfile duration (30|60) #REQUIRED>
|
||||
<!ELEMENT Video EMPTY>
|
||||
@ -77,10 +77,10 @@
|
||||
-->
|
||||
<MediaSettings>
|
||||
<!-- Each camcorder profile defines a set of predefined configuration parameters -->
|
||||
<CamcorderProfiles cameraId="0">
|
||||
<!--
|
||||
<CamcorderProfiles>
|
||||
|
||||
<EncoderProfile quality="hd" fileFormat="mp4" duration="60">
|
||||
<Video codec="m4v"
|
||||
<Video codec="h264"
|
||||
bitRate="6000000"
|
||||
width="1280"
|
||||
height="720"
|
||||
@ -88,55 +88,21 @@
|
||||
|
||||
<Audio codec="aac"
|
||||
bitRate="96000"
|
||||
sampleRate="16000"
|
||||
sampleRate="48000"
|
||||
channels="1" />
|
||||
</EncoderProfile>
|
||||
-->
|
||||
|
||||
<EncoderProfile quality="high" fileFormat="mp4" duration="60">
|
||||
<Video codec="h264"
|
||||
bitRate="3000000"
|
||||
width="720"
|
||||
height="480"
|
||||
frameRate="24" />
|
||||
|
||||
<Audio codec="aac"
|
||||
bitRate="96000"
|
||||
sampleRate="16000"
|
||||
channels="1" />
|
||||
</EncoderProfile>
|
||||
|
||||
<EncoderProfile quality="low" fileFormat="3gp" duration="30">
|
||||
<Video codec="h263"
|
||||
bitRate="256000"
|
||||
width="176"
|
||||
height="144"
|
||||
frameRate="15" />
|
||||
|
||||
<Audio codec="amrnb"
|
||||
bitRate="12200"
|
||||
sampleRate="8000"
|
||||
channels="1" />
|
||||
|
||||
</EncoderProfile>
|
||||
|
||||
<ImageEncoding quality="90" />
|
||||
<ImageEncoding quality="80" />
|
||||
<ImageEncoding quality="70" />
|
||||
</CamcorderProfiles>
|
||||
|
||||
<CamcorderProfiles cameraId="1">
|
||||
<EncoderProfile quality="high" fileFormat="mp4" duration="60">
|
||||
<Video codec="h264"
|
||||
<Video codec="m4v"
|
||||
bitRate="2000000"
|
||||
width="640"
|
||||
width="800"
|
||||
height="480"
|
||||
frameRate="24" />
|
||||
frameRate="30" />
|
||||
|
||||
<Audio codec="aac"
|
||||
bitRate="96000"
|
||||
sampleRate="16000"
|
||||
bitRate="48000"
|
||||
sampleRate="22050"
|
||||
channels="1" />
|
||||
|
||||
</EncoderProfile>
|
||||
|
||||
<EncoderProfile quality="low" fileFormat="3gp" duration="30">
|
||||
@ -150,17 +116,17 @@
|
||||
bitRate="12200"
|
||||
sampleRate="8000"
|
||||
channels="1" />
|
||||
|
||||
</EncoderProfile>
|
||||
|
||||
<ImageEncoding quality="90" />
|
||||
<ImageEncoding quality="80" />
|
||||
<ImageEncoding quality="70" />
|
||||
<ImageDecoding memCap="20000000" />
|
||||
|
||||
<ImageDecoding memCap="10000000" />
|
||||
|
||||
<Camera previewFrameRate="0" />
|
||||
</CamcorderProfiles>
|
||||
|
||||
|
||||
<EncoderOutputFileFormat name="3gp" />
|
||||
<EncoderOutputFileFormat name="mp4" />
|
||||
|
||||
@ -171,25 +137,25 @@
|
||||
-->
|
||||
<VideoEncoderCap name="h264" enabled="true"
|
||||
minBitRate="64000" maxBitRate="6000000"
|
||||
minFrameWidth="176" maxFrameWidth="800"
|
||||
minFrameHeight="144" maxFrameHeight="480"
|
||||
minFrameWidth="176" maxFrameWidth="1280"
|
||||
minFrameHeight="144" maxFrameHeight="720"
|
||||
minFrameRate="1" maxFrameRate="30" />
|
||||
|
||||
<VideoEncoderCap name="h263" enabled="true"
|
||||
minBitRate="64000" maxBitRate="6000000"
|
||||
minBitRate="64000" maxBitRate="2000000"
|
||||
minFrameWidth="176" maxFrameWidth="800"
|
||||
minFrameHeight="144" maxFrameHeight="480"
|
||||
minFrameRate="1" maxFrameRate="30" />
|
||||
|
||||
<VideoEncoderCap name="m4v" enabled="true"
|
||||
minBitRate="64000" maxBitRate="8000000"
|
||||
minFrameWidth="176" maxFrameWidth="1280"
|
||||
minFrameHeight="144" maxFrameHeight="720"
|
||||
minBitRate="64000" maxBitRate="2000000"
|
||||
minFrameWidth="176" maxFrameWidth="800"
|
||||
minFrameHeight="144" maxFrameHeight="480"
|
||||
minFrameRate="1" maxFrameRate="30" />
|
||||
|
||||
<AudioEncoderCap name="aac" enabled="true"
|
||||
minBitRate="8192" maxBitRate="96000"
|
||||
minSampleRate="8000" maxSampleRate="16000"
|
||||
minSampleRate="8000" maxSampleRate="48000"
|
||||
minChannels="1" maxChannels="1" />
|
||||
|
||||
<AudioEncoderCap name="amrwb" enabled="true"
|
||||
@ -211,4 +177,4 @@
|
||||
-->
|
||||
<VideoDecoderCap name="wmv" enabled="false"/>
|
||||
<AudioDecoderCap name="wma" enabled="false"/>
|
||||
</MediaSettings>
|
||||
</MediaSettings>
|
Loading…
x
Reference in New Issue
Block a user