[Zuma 8k] Remove 8K from "shusky" (P23) media_profiles on udc-d1-dev am: 3f86a05db9 am: 78071a0821

Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/23770369

Change-Id: Id1265f1fa7fb889424804d44f1cb4572384e8347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Linyu He 2023-06-24 00:06:08 +00:00 committed by Automerger Merge Worker
commit 765a3f6a1f
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 --> <!-- Each camcorder profile defines a set of predefined configuration parameters -->
<CamcorderProfiles cameraId="0"> <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"> <EncoderProfile quality="high" fileFormat="mp4" duration="60">
<Video codec="h264" <Video codec="h264"
bitRate="72000000" bitRate="72000000"
@ -1762,14 +1749,14 @@
--> -->
<VideoEncoderCap name="hevc" enabled="true" <VideoEncoderCap name="hevc" enabled="true"
minBitRate="64000" maxBitRate="100000000" minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="7680" minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="4320" minFrameHeight="96" maxFrameHeight="2160"
minFrameRate="15" maxFrameRate="30" /> minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h264" enabled="true" <VideoEncoderCap name="h264" enabled="true"
minBitRate="64000" maxBitRate="100000000" minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="7680" minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="4320" minFrameHeight="96" maxFrameHeight="2160"
minFrameRate="15" maxFrameRate="30" /> minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h263" enabled="true" <VideoEncoderCap name="h263" enabled="true"

View file

@ -79,19 +79,6 @@
<!-- Each camcorder profile defines a set of predefined configuration parameters --> <!-- Each camcorder profile defines a set of predefined configuration parameters -->
<CamcorderProfiles cameraId="0"> <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"> <EncoderProfile quality="high" fileFormat="mp4" duration="60">
<Video codec="h264" <Video codec="h264"
bitRate="72000000" bitRate="72000000"
@ -1762,14 +1749,14 @@
--> -->
<VideoEncoderCap name="hevc" enabled="true" <VideoEncoderCap name="hevc" enabled="true"
minBitRate="64000" maxBitRate="100000000" minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="7680" minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="4320" minFrameHeight="96" maxFrameHeight="2160"
minFrameRate="15" maxFrameRate="30" /> minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h264" enabled="true" <VideoEncoderCap name="h264" enabled="true"
minBitRate="64000" maxBitRate="100000000" minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="7680" minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="4320" minFrameHeight="96" maxFrameHeight="2160"
minFrameRate="15" maxFrameRate="30" /> minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h263" enabled="true" <VideoEncoderCap name="h263" enabled="true"

View file

@ -79,19 +79,6 @@
<!-- Each camcorder profile defines a set of predefined configuration parameters --> <!-- Each camcorder profile defines a set of predefined configuration parameters -->
<CamcorderProfiles cameraId="0"> <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"> <EncoderProfile quality="high" fileFormat="mp4" duration="60">
<Video codec="h264" <Video codec="h264"
bitRate="72000000" bitRate="72000000"
@ -1394,14 +1381,14 @@
--> -->
<VideoEncoderCap name="hevc" enabled="true" <VideoEncoderCap name="hevc" enabled="true"
minBitRate="64000" maxBitRate="100000000" minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="7680" minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="4320" minFrameHeight="96" maxFrameHeight="2160"
minFrameRate="15" maxFrameRate="30" /> minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h264" enabled="true" <VideoEncoderCap name="h264" enabled="true"
minBitRate="64000" maxBitRate="100000000" minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="7680" minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="4320" minFrameHeight="96" maxFrameHeight="2160"
minFrameRate="15" maxFrameRate="30" /> minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h263" enabled="true" <VideoEncoderCap name="h263" enabled="true"