[Zuma 8k] Re-enable 8K in "shusky" (P23) media_profiles on main

Please see b/292155636 for context.

Bug: 292155636
Test: python gca_smoke.py
Test: manually test 8K per go/zuma-8k-video-recording-bring-up-log
Change-Id: Ie42bdee12d09ee6c9acf12a28fc67ea74dbaad85
This commit is contained in:
Linyu He 2023-07-20 23:51:59 +00:00
parent a425a1da89
commit 528f96acfb
3 changed files with 51 additions and 12 deletions

View file

@ -79,6 +79,19 @@
<!-- 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"
@ -1749,14 +1762,14 @@
-->
<VideoEncoderCap name="hevc" enabled="true"
minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="2160"
minFrameWidth="128" maxFrameWidth="7680"
minFrameHeight="96" maxFrameHeight="4320"
minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h264" enabled="true"
minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="2160"
minFrameWidth="128" maxFrameWidth="7680"
minFrameHeight="96" maxFrameHeight="4320"
minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h263" enabled="true"

View file

@ -79,6 +79,19 @@
<!-- 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"
@ -1749,14 +1762,14 @@
-->
<VideoEncoderCap name="hevc" enabled="true"
minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="2160"
minFrameWidth="128" maxFrameWidth="7680"
minFrameHeight="96" maxFrameHeight="4320"
minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h264" enabled="true"
minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="2160"
minFrameWidth="128" maxFrameWidth="7680"
minFrameHeight="96" maxFrameHeight="4320"
minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h263" enabled="true"

View file

@ -79,6 +79,19 @@
<!-- 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"
@ -1381,14 +1394,14 @@
-->
<VideoEncoderCap name="hevc" enabled="true"
minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="2160"
minFrameWidth="128" maxFrameWidth="7680"
minFrameHeight="96" maxFrameHeight="4320"
minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h264" enabled="true"
minBitRate="64000" maxBitRate="100000000"
minFrameWidth="128" maxFrameWidth="3840"
minFrameHeight="96" maxFrameHeight="2160"
minFrameWidth="128" maxFrameWidth="7680"
minFrameHeight="96" maxFrameHeight="4320"
minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h263" enabled="true"