Merge "Support 4k60 for physical outer front camera" into tm-qpr-dev am: 2b31d3c72d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/19357500 Change-Id: Ib4e6266b4184a06eb17aaf01a0275e4cc4416131 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
Automerger Merge Worker
commit
611f33b3e6
1 changed files with 158 additions and 185 deletions
|
|
@ -1014,190 +1014,6 @@
|
||||||
|
|
||||||
<CamcorderProfiles cameraId="5">
|
<CamcorderProfiles cameraId="5">
|
||||||
|
|
||||||
<EncoderProfile quality="2160p" fileFormat="mp4" duration="60">
|
|
||||||
<Video codec="h264"
|
|
||||||
bitRate="48000000"
|
|
||||||
width="3840"
|
|
||||||
height="2160"
|
|
||||||
frameRate="30" />
|
|
||||||
|
|
||||||
<Audio codec="aac"
|
|
||||||
bitRate="96000"
|
|
||||||
sampleRate="48000"
|
|
||||||
channels="1" />
|
|
||||||
</EncoderProfile>
|
|
||||||
|
|
||||||
<EncoderProfile quality="1080p" fileFormat="mp4" duration="60">
|
|
||||||
<Video codec="h264"
|
|
||||||
bitRate="22000000"
|
|
||||||
width="1920"
|
|
||||||
height="1080"
|
|
||||||
frameRate="30" />
|
|
||||||
|
|
||||||
<Audio codec="aac"
|
|
||||||
bitRate="96000"
|
|
||||||
sampleRate="48000"
|
|
||||||
channels="1" />
|
|
||||||
</EncoderProfile>
|
|
||||||
|
|
||||||
<EncoderProfile quality="720p" fileFormat="mp4" duration="60">
|
|
||||||
<Video codec="h264"
|
|
||||||
bitRate="12000000"
|
|
||||||
width="1280"
|
|
||||||
height="720"
|
|
||||||
frameRate="30" />
|
|
||||||
|
|
||||||
<Audio codec="aac"
|
|
||||||
bitRate="96000"
|
|
||||||
sampleRate="48000"
|
|
||||||
channels="1" />
|
|
||||||
</EncoderProfile>
|
|
||||||
|
|
||||||
<EncoderProfile quality="480p" fileFormat="mp4" duration="60">
|
|
||||||
<Video codec="h264"
|
|
||||||
bitRate="6000000"
|
|
||||||
width="720"
|
|
||||||
height="480"
|
|
||||||
frameRate="30" />
|
|
||||||
|
|
||||||
<Audio codec="aac"
|
|
||||||
bitRate="96000"
|
|
||||||
sampleRate="48000"
|
|
||||||
channels="1" />
|
|
||||||
</EncoderProfile>
|
|
||||||
|
|
||||||
<EncoderProfile quality="cif" fileFormat="mp4" duration="60">
|
|
||||||
<Video codec="h264"
|
|
||||||
bitRate="1200000"
|
|
||||||
width="352"
|
|
||||||
height="288"
|
|
||||||
frameRate="30" />
|
|
||||||
|
|
||||||
<Audio codec="aac"
|
|
||||||
bitRate="96000"
|
|
||||||
sampleRate="48000"
|
|
||||||
channels="1" />
|
|
||||||
</EncoderProfile>
|
|
||||||
|
|
||||||
<EncoderProfile quality="qvga" fileFormat="mp4" duration="60">
|
|
||||||
<Video codec="h264"
|
|
||||||
bitRate="512000"
|
|
||||||
width="320"
|
|
||||||
height="240"
|
|
||||||
frameRate="30" />
|
|
||||||
|
|
||||||
<Audio codec="aac"
|
|
||||||
bitRate="96000"
|
|
||||||
sampleRate="48000"
|
|
||||||
channels="1" />
|
|
||||||
</EncoderProfile>
|
|
||||||
|
|
||||||
<EncoderProfile quality="qcif" fileFormat="3gp" duration="60">
|
|
||||||
<Video codec="h264"
|
|
||||||
bitRate="128000"
|
|
||||||
width="176"
|
|
||||||
height="144"
|
|
||||||
frameRate="30" />
|
|
||||||
|
|
||||||
<Audio codec="amrnb"
|
|
||||||
bitRate="12200"
|
|
||||||
sampleRate="8000"
|
|
||||||
channels="1" />
|
|
||||||
</EncoderProfile>
|
|
||||||
|
|
||||||
<EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="60">
|
|
||||||
<Video codec="h264"
|
|
||||||
bitRate="48000000"
|
|
||||||
width="3840"
|
|
||||||
height="2160"
|
|
||||||
frameRate="30" />
|
|
||||||
|
|
||||||
<!-- Audio settings are not used for timealpse video recording -->
|
|
||||||
<Audio codec="aac"
|
|
||||||
bitRate="96000"
|
|
||||||
sampleRate="48000"
|
|
||||||
channels="1" />
|
|
||||||
</EncoderProfile>
|
|
||||||
|
|
||||||
<EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="60">
|
|
||||||
<Video codec="h264"
|
|
||||||
bitRate="22000000"
|
|
||||||
width="1920"
|
|
||||||
height="1080"
|
|
||||||
frameRate="30" />
|
|
||||||
|
|
||||||
<!-- Audio settings are not used for timealpse video recording -->
|
|
||||||
<Audio codec="aac"
|
|
||||||
bitRate="96000"
|
|
||||||
sampleRate="48000"
|
|
||||||
channels="1" />
|
|
||||||
</EncoderProfile>
|
|
||||||
|
|
||||||
<EncoderProfile quality="timelapse720p" fileFormat="mp4" duration="60">
|
|
||||||
<Video codec="h264"
|
|
||||||
bitRate="12000000"
|
|
||||||
width="1280"
|
|
||||||
height="720"
|
|
||||||
frameRate="30" />
|
|
||||||
|
|
||||||
<!-- Audio settings are not used for timealpse video recording -->
|
|
||||||
<Audio codec="aac"
|
|
||||||
bitRate="96000"
|
|
||||||
sampleRate="48000"
|
|
||||||
channels="1" />
|
|
||||||
</EncoderProfile>
|
|
||||||
|
|
||||||
<EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="60">
|
|
||||||
<Video codec="h264"
|
|
||||||
bitRate="6000000"
|
|
||||||
width="720"
|
|
||||||
height="480"
|
|
||||||
frameRate="30" />
|
|
||||||
|
|
||||||
<!-- Audio settings are not used for timealpse video recording -->
|
|
||||||
<Audio codec="aac"
|
|
||||||
bitRate="96000"
|
|
||||||
sampleRate="48000"
|
|
||||||
channels="1" />
|
|
||||||
</EncoderProfile>
|
|
||||||
|
|
||||||
<EncoderProfile quality="timelapsecif" fileFormat="mp4" duration="60">
|
|
||||||
<Video codec="h264"
|
|
||||||
bitRate="1200000"
|
|
||||||
width="352"
|
|
||||||
height="288"
|
|
||||||
frameRate="30" />
|
|
||||||
|
|
||||||
<!-- Audio settings are not used for timealpse video recording -->
|
|
||||||
<Audio codec="aac"
|
|
||||||
bitRate="96000"
|
|
||||||
sampleRate="48000"
|
|
||||||
channels="1" />
|
|
||||||
</EncoderProfile>
|
|
||||||
|
|
||||||
<EncoderProfile quality="timelapseqcif" fileFormat="mp4" duration="60">
|
|
||||||
<Video codec="h264"
|
|
||||||
bitRate="192000"
|
|
||||||
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" />
|
|
||||||
<ImageDecoding memCap="20000000" />
|
|
||||||
|
|
||||||
</CamcorderProfiles>
|
|
||||||
|
|
||||||
<CamcorderProfiles cameraId="6">
|
|
||||||
|
|
||||||
<EncoderProfile quality="2160p" fileFormat="mp4" duration="60">
|
<EncoderProfile quality="2160p" fileFormat="mp4" duration="60">
|
||||||
<Video codec="h264"
|
<Video codec="h264"
|
||||||
bitRate="72000000"
|
bitRate="72000000"
|
||||||
|
|
@ -1291,9 +1107,37 @@
|
||||||
|
|
||||||
<EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="60">
|
<EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="60">
|
||||||
<Video codec="h264"
|
<Video codec="h264"
|
||||||
bitRate="48000000"
|
bitRate="72000000"
|
||||||
width="3840"
|
width="3840"
|
||||||
height="2160"
|
height="2160"
|
||||||
|
frameRate="60" />
|
||||||
|
|
||||||
|
<!-- Audio settings are not used for timealpse video recording -->
|
||||||
|
<Audio codec="aac"
|
||||||
|
bitRate="96000"
|
||||||
|
sampleRate="48000"
|
||||||
|
channels="1" />
|
||||||
|
</EncoderProfile>
|
||||||
|
|
||||||
|
<EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="60">
|
||||||
|
<Video codec="h264"
|
||||||
|
bitRate="33000000"
|
||||||
|
width="1920"
|
||||||
|
height="1080"
|
||||||
|
frameRate="60" />
|
||||||
|
|
||||||
|
<!-- Audio settings are not used for timealpse video recording -->
|
||||||
|
<Audio codec="aac"
|
||||||
|
bitRate="96000"
|
||||||
|
sampleRate="48000"
|
||||||
|
channels="1" />
|
||||||
|
</EncoderProfile>
|
||||||
|
|
||||||
|
<EncoderProfile quality="timelapse720p" fileFormat="mp4" duration="60">
|
||||||
|
<Video codec="h264"
|
||||||
|
bitRate="12000000"
|
||||||
|
width="1280"
|
||||||
|
height="720"
|
||||||
frameRate="30" />
|
frameRate="30" />
|
||||||
|
|
||||||
<!-- Audio settings are not used for timealpse video recording -->
|
<!-- Audio settings are not used for timealpse video recording -->
|
||||||
|
|
@ -1303,6 +1147,135 @@
|
||||||
channels="1" />
|
channels="1" />
|
||||||
</EncoderProfile>
|
</EncoderProfile>
|
||||||
|
|
||||||
|
<EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="60">
|
||||||
|
<Video codec="h264"
|
||||||
|
bitRate="6000000"
|
||||||
|
width="720"
|
||||||
|
height="480"
|
||||||
|
frameRate="30" />
|
||||||
|
|
||||||
|
<!-- Audio settings are not used for timealpse video recording -->
|
||||||
|
<Audio codec="aac"
|
||||||
|
bitRate="96000"
|
||||||
|
sampleRate="48000"
|
||||||
|
channels="1" />
|
||||||
|
</EncoderProfile>
|
||||||
|
|
||||||
|
<EncoderProfile quality="timelapsecif" fileFormat="mp4" duration="60">
|
||||||
|
<Video codec="h264"
|
||||||
|
bitRate="1200000"
|
||||||
|
width="352"
|
||||||
|
height="288"
|
||||||
|
frameRate="30" />
|
||||||
|
|
||||||
|
<!-- Audio settings are not used for timealpse video recording -->
|
||||||
|
<Audio codec="aac"
|
||||||
|
bitRate="96000"
|
||||||
|
sampleRate="48000"
|
||||||
|
channels="1" />
|
||||||
|
</EncoderProfile>
|
||||||
|
|
||||||
|
<EncoderProfile quality="timelapseqcif" fileFormat="mp4" duration="60">
|
||||||
|
<Video codec="h264"
|
||||||
|
bitRate="192000"
|
||||||
|
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" />
|
||||||
|
<ImageDecoding memCap="20000000" />
|
||||||
|
|
||||||
|
</CamcorderProfiles>
|
||||||
|
|
||||||
|
<CamcorderProfiles cameraId="6">
|
||||||
|
|
||||||
|
<EncoderProfile quality="1080p" fileFormat="mp4" duration="60">
|
||||||
|
<Video codec="h264"
|
||||||
|
bitRate="22000000"
|
||||||
|
width="1920"
|
||||||
|
height="1080"
|
||||||
|
frameRate="30" />
|
||||||
|
|
||||||
|
<Audio codec="aac"
|
||||||
|
bitRate="96000"
|
||||||
|
sampleRate="48000"
|
||||||
|
channels="1" />
|
||||||
|
</EncoderProfile>
|
||||||
|
|
||||||
|
<EncoderProfile quality="720p" fileFormat="mp4" duration="60">
|
||||||
|
<Video codec="h264"
|
||||||
|
bitRate="12000000"
|
||||||
|
width="1280"
|
||||||
|
height="720"
|
||||||
|
frameRate="30" />
|
||||||
|
|
||||||
|
<Audio codec="aac"
|
||||||
|
bitRate="96000"
|
||||||
|
sampleRate="48000"
|
||||||
|
channels="1" />
|
||||||
|
</EncoderProfile>
|
||||||
|
|
||||||
|
<EncoderProfile quality="480p" fileFormat="mp4" duration="60">
|
||||||
|
<Video codec="h264"
|
||||||
|
bitRate="6000000"
|
||||||
|
width="720"
|
||||||
|
height="480"
|
||||||
|
frameRate="30" />
|
||||||
|
|
||||||
|
<Audio codec="aac"
|
||||||
|
bitRate="96000"
|
||||||
|
sampleRate="48000"
|
||||||
|
channels="1" />
|
||||||
|
</EncoderProfile>
|
||||||
|
|
||||||
|
<EncoderProfile quality="cif" fileFormat="mp4" duration="60">
|
||||||
|
<Video codec="h264"
|
||||||
|
bitRate="1200000"
|
||||||
|
width="352"
|
||||||
|
height="288"
|
||||||
|
frameRate="30" />
|
||||||
|
|
||||||
|
<Audio codec="aac"
|
||||||
|
bitRate="96000"
|
||||||
|
sampleRate="48000"
|
||||||
|
channels="1" />
|
||||||
|
</EncoderProfile>
|
||||||
|
|
||||||
|
<EncoderProfile quality="qvga" fileFormat="mp4" duration="60">
|
||||||
|
<Video codec="h264"
|
||||||
|
bitRate="512000"
|
||||||
|
width="320"
|
||||||
|
height="240"
|
||||||
|
frameRate="30" />
|
||||||
|
|
||||||
|
<Audio codec="aac"
|
||||||
|
bitRate="96000"
|
||||||
|
sampleRate="48000"
|
||||||
|
channels="1" />
|
||||||
|
</EncoderProfile>
|
||||||
|
|
||||||
|
<EncoderProfile quality="qcif" fileFormat="3gp" duration="60">
|
||||||
|
<Video codec="h264"
|
||||||
|
bitRate="128000"
|
||||||
|
width="176"
|
||||||
|
height="144"
|
||||||
|
frameRate="30" />
|
||||||
|
|
||||||
|
<Audio codec="amrnb"
|
||||||
|
bitRate="12200"
|
||||||
|
sampleRate="8000"
|
||||||
|
channels="1" />
|
||||||
|
</EncoderProfile>
|
||||||
|
|
||||||
<EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="60">
|
<EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="60">
|
||||||
<Video codec="h264"
|
<Video codec="h264"
|
||||||
bitRate="22000000"
|
bitRate="22000000"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue