Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Zuma 8k] Revert ag/20294157: add 8k encoder profiles for P23 devices (2nd attempt)

Browse source 
Per b/259732944#comment2, using CamcorderProfile.QUALITY_HIGH will
request an 8k stream if 8k is present in media_profiles. This is because
QUALITY_HIGH is the "quality level corresponding to the highest
available resolution".

(https://developer.android.com/reference/android/media/CamcorderProfile#QUALITY_HIGH)

However, the 8k support in camera HAL isn't ready, so we have to remove
8k from media_profiles to avoid breaking apps using QUALITY_HIGH.

Bug: 232811715
Bug: 259732944
Test: build
Test: boot & check GCA video recording
Change-Id: I52a2b6c577acfff1d871cc038916d1490abd0fd6
This commit is contained in:
Linyu He 2022-12-08 20:48:49 +00:00
parent 888a711cd0
commit 63f66a8701
3 changed files with 12 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

21
media_profiles_husky.xml
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="2160p" 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"

21
media_profiles_ripcurrent.xml
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="2160p" fileFormat="mp4" duration="60">
<Video codec="h264"
bitRate="72000000"
@ -1749,14 +1736,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"

21
media_profiles_shiba.xml
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="2160p" 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"