sm6375-common: Remove software omx codec references
These are no longer available as of Android 14 QPR3. The C2 codecs available by default in the swcodec apex will be used instead. Change-Id: I8cdf3e700823779a7382c66c3df8410d41209b7c
This commit is contained in:
parent
d1e62103fa
commit
567149e130
3 changed files with 2 additions and 93 deletions
|
@ -267,7 +267,6 @@ PRODUCT_COPY_FILES += \
|
||||||
$(LOCAL_PATH)/media/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml
|
$(LOCAL_PATH)/media/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
$(LOCAL_PATH)/media/holi/media_codecs_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_holi.xml \
|
|
||||||
$(LOCAL_PATH)/media/holi/media_codecs_performance_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_holi.xml \
|
$(LOCAL_PATH)/media/holi/media_codecs_performance_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_holi.xml \
|
||||||
$(LOCAL_PATH)/media/holi/media_profiles_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_holi.xml
|
$(LOCAL_PATH)/media/holi/media_profiles_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_holi.xml
|
||||||
|
|
||||||
|
@ -277,13 +276,9 @@ PRODUCT_COPY_FILES += \
|
||||||
$(LOCAL_PATH)/media/blair/media_profiles_blair.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_blair.xml
|
$(LOCAL_PATH)/media/blair/media_profiles_blair.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_blair.xml
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
|
|
||||||
frameworks/av/media/libstagefright/data/media_codecs_google_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2.xml \
|
frameworks/av/media/libstagefright/data/media_codecs_google_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2.xml \
|
||||||
frameworks/av/media/libstagefright/data/media_codecs_google_c2_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_audio.xml \
|
frameworks/av/media/libstagefright/data/media_codecs_google_c2_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_audio.xml \
|
||||||
frameworks/av/media/libstagefright/data/media_codecs_google_c2_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_video.xml \
|
frameworks/av/media/libstagefright/data/media_codecs_google_c2_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_video.xml
|
||||||
frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \
|
|
||||||
frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \
|
|
||||||
frameworks/av/media/libstagefright/data/media_codecs_google_video_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video_le.xml
|
|
||||||
|
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
android.hardware.media.omx@1.0-service \
|
android.hardware.media.omx@1.0-service \
|
||||||
|
|
|
@ -1,84 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<!--
|
|
||||||
Copyright (c) 2018-2020 Qualcomm Technologies, Inc.
|
|
||||||
All Rights Reserved.
|
|
||||||
Confidential and Proprietary - Qualcomm Technologies, Inc.
|
|
||||||
|
|
||||||
Not a Contribution.
|
|
||||||
|
|
||||||
Copyright (C) 2012-2018 The Linux Foundation. All rights reserved.
|
|
||||||
Copyright (C) 2012-2013 The Android Open Source Project
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!--
|
|
||||||
"performance-point"
|
|
||||||
Vendor-guaranteed performance advertised to the applications
|
|
||||||
<Limit name="performance-point-widthxheight" value="fps" />
|
|
||||||
|
|
||||||
-For each of the resolutions, the advertised fps is the max supported,
|
|
||||||
with HW-friendly color format and considering video-only.
|
|
||||||
-Performance for any intermediate resolution will be that of the
|
|
||||||
next-higher-advertised-resolution.
|
|
||||||
|
|
||||||
standard sizes: 480p/576p (SD), 720p (HD), 1080p (FHD), 2160p (UHD)
|
|
||||||
standard frame rates: 24, 25, 30, 48+, 50, 60, 100*, 120*, 200*, 240* fps
|
|
||||||
* HD+ only
|
|
||||||
+ SD only
|
|
||||||
- All supported standard performance points are listed (unless they are
|
|
||||||
covered by another listed standard performance point)
|
|
||||||
- Non-standard performance points are listed along with all the standard
|
|
||||||
performance points covered by them.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Holi Non-Secure decoder capabilities
|
|
||||||
(MB is defined as 16x16)
|
|
||||||
|
|
||||||
_______________________________________________________
|
|
||||||
| Codec | W H fps Mbps MB/s |
|
|
||||||
|_____________|_________________________________________|
|
|
||||||
| h264 | 1920 1088 60 60 489600 |
|
|
||||||
| hevc | 1920 1080 60 60 489600 |
|
|
||||||
| vp9 | 1920 1088 60 60 489600 |
|
|
||||||
|_____________|_________________________________________|
|
|
||||||
|
|
||||||
Secure decoder capabilities
|
|
||||||
(MB is defined as 16x16)
|
|
||||||
|
|
||||||
_____________________________________________________
|
|
||||||
| Codec | W H fps Mbps MB/s |
|
|
||||||
|__________|_________________________________________|
|
|
||||||
| h264 | 1920 1088 60 35 489600 |
|
|
||||||
| vp9 | 1920 1088 60 35 489600 |
|
|
||||||
| hevc | 1920 1088 60 35 489600 |
|
|
||||||
|__________|_________________________________________|
|
|
||||||
|
|
||||||
|
|
||||||
Non-Secure encoder capabilities (Secure not supported)
|
|
||||||
(MB is defined as 16x16)
|
|
||||||
|
|
||||||
______________________________________________________
|
|
||||||
| Codec | W H fps Mbps MB/s |
|
|
||||||
|__________|_________________________________________|
|
|
||||||
| h264 | 1920 1088 60 60 489600 |
|
|
||||||
| hevc | 1920 1088 60 60 489600 |
|
|
||||||
|__________|_________________________________________|
|
|
||||||
-->
|
|
||||||
|
|
||||||
<MediaCodecs>
|
|
||||||
<Include href="media_codecs_google_audio.xml" />
|
|
||||||
<Include href="media_codecs_google_telephony.xml" />
|
|
||||||
<Include href="media_codecs_google_video.xml" />
|
|
||||||
</MediaCodecs>
|
|
|
@ -83,11 +83,9 @@
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<MediaCodecs>
|
<MediaCodecs>
|
||||||
<Include href="media_codecs_google_audio.xml" />
|
|
||||||
<Include href="media_codecs_vendor_audio.xml" />
|
|
||||||
<Include href="media_codecs_google_telephony.xml" />
|
|
||||||
<Include href="media_codecs_c2_audio.xml" />
|
<Include href="media_codecs_c2_audio.xml" />
|
||||||
<Settings>
|
<Settings>
|
||||||
|
<Domain name="telephony" enabled="true" />
|
||||||
<Setting name="max-video-encoder-input-buffers" value="11" />
|
<Setting name="max-video-encoder-input-buffers" value="11" />
|
||||||
</Settings>
|
</Settings>
|
||||||
<Decoders>
|
<Decoders>
|
||||||
|
|
Loading…
Reference in a new issue