Merge "Remove 8K from media_profiles" into main

This commit is contained in:
Treehugger Robot 2023-09-29 19:38:12 +00:00 committed by Android (Google) Code Review
commit fdf822c070
3 changed files with 12 additions and 51 deletions

View file

@ -79,19 +79,6 @@
<!-- Each camcorder profile defines a set of predefined configuration parameters -->
<CamcorderProfiles cameraId="0">
<EncoderProfile quality="8kuhd" fileFormat="mp4" duration="60">
<Video codec="h264"
bitRate="80000000"
width="7680"
height="4320"
frameRate="30" />
<Audio codec="aac"
bitRate="96000"
sampleRate="48000"
channels="1" />
</EncoderProfile>
<EncoderProfile quality="high" fileFormat="mp4" duration="60">
<Video codec="h264"
bitRate="72000000"
@ -1762,14 +1749,14 @@
-->
<VideoEncoderCap name="hevc" enabled="true"
minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="7680"
minFrameHeight="96" maxFrameHeight="4320"
minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="2160"
minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h264" enabled="true"
minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="7680"
minFrameHeight="96" maxFrameHeight="4320"
minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="2160"
minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h263" enabled="true"

View file

@ -79,19 +79,6 @@
<!-- Each camcorder profile defines a set of predefined configuration parameters -->
<CamcorderProfiles cameraId="0">
<EncoderProfile quality="8kuhd" fileFormat="mp4" duration="60">
<Video codec="h264"
bitRate="80000000"
width="7680"
height="4320"
frameRate="30" />
<Audio codec="aac"
bitRate="96000"
sampleRate="48000"
channels="1" />
</EncoderProfile>
<EncoderProfile quality="high" fileFormat="mp4" duration="60">
<Video codec="h264"
bitRate="72000000"
@ -1762,14 +1749,14 @@
-->
<VideoEncoderCap name="hevc" enabled="true"
minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="7680"
minFrameHeight="96" maxFrameHeight="4320"
minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="2160"
minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h264" enabled="true"
minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="7680"
minFrameHeight="96" maxFrameHeight="4320"
minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="2160"
minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h263" enabled="true"

View file

@ -79,19 +79,6 @@
<!-- Each camcorder profile defines a set of predefined configuration parameters -->
<CamcorderProfiles cameraId="0">
<EncoderProfile quality="8kuhd" fileFormat="mp4" duration="60">
<Video codec="h264"
bitRate="80000000"
width="7680"
height="4320"
frameRate="30" />
<Audio codec="aac"
bitRate="96000"
sampleRate="48000"
channels="1" />
</EncoderProfile>
<EncoderProfile quality="high" fileFormat="mp4" duration="60">
<Video codec="h264"
bitRate="72000000"
@ -1394,14 +1381,14 @@
-->
<VideoEncoderCap name="hevc" enabled="true"
minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="7680"
minFrameHeight="96" maxFrameHeight="4320"
minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="2160"
minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h264" enabled="true"
minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="7680"
minFrameHeight="96" maxFrameHeight="4320"
minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="2160"
minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h263" enabled="true"