sm6150-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:
Aaron Kling 2024-06-28 22:09:34 -05:00 committed by basamaryan
parent 5f487d9349
commit 940cae663a
No known key found for this signature in database
GPG Key ID: 707BA6C82329E8F9
3 changed files with 1 additions and 63 deletions

View File

@ -56,24 +56,6 @@ limitations under the License.
<Limit name="measured-frame-rate-1280x720" range="26-56" /> <Limit name="measured-frame-rate-1280x720" range="26-56" />
<Limit name="measured-frame-rate-1920x1080" range="20-44" /> <Limit name="measured-frame-rate-1920x1080" range="20-44" />
</MediaCodec> </MediaCodec>
<MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
<Limit name="measured-frame-rate-320x240" range="215-473" />
<Limit name="measured-frame-rate-720x480" range="100-220" />
<Limit name="measured-frame-rate-1280x720" range="56-123" />
<Limit name="measured-frame-rate-1920x1080" range="30-66" />
</MediaCodec>
<MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
<Limit name="measured-frame-rate-176x144" range="200-200" />
</MediaCodec>
<MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
<Limit name="measured-frame-rate-176x144" range="250-550" />
</MediaCodec>
<MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
<Limit name="measured-frame-rate-320x180" range="70-154" />
<Limit name="measured-frame-rate-640x360" range="32-70" />
<Limit name="measured-frame-rate-1280x720" range="17-37" />
<Limit name="measured-frame-rate-1920x1080" range="8-17" />
</MediaCodec>
<MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true"> <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
<Limit name="measured-frame-rate-320x240" range="178-250" /> <Limit name="measured-frame-rate-320x240" range="178-250" />
<Limit name="measured-frame-rate-720x480" range="69-95" /> <Limit name="measured-frame-rate-720x480" range="69-95" />
@ -138,42 +120,6 @@ limitations under the License.
<Limit name="measured-frame-rate-1280x720" range="200-420" /> <Limit name="measured-frame-rate-1280x720" range="200-420" />
<Limit name="measured-frame-rate-1920x1088" range="189-301" /> <Limit name="measured-frame-rate-1920x1088" range="189-301" />
</MediaCodec> </MediaCodec>
<MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
<Limit name="measured-frame-rate-320x240" range="270-594" />
<Limit name="measured-frame-rate-720x480" range="68-149" />
<Limit name="measured-frame-rate-1280x720" range="32-70" />
<Limit name="measured-frame-rate-1920x1080" range="13-30" />
</MediaCodec>
<MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
<Limit name="measured-frame-rate-176x144" range="272-600" />
<Limit name="measured-frame-rate-352x288" range="236-520" />
</MediaCodec>
<MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
<Limit name="measured-frame-rate-352x288" range="250-550" />
<Limit name="measured-frame-rate-640x360" range="227-500" />
<Limit name="measured-frame-rate-720x480" range="225-495" />
<Limit name="measured-frame-rate-1280x720" range="88-193" />
<Limit name="measured-frame-rate-1920x1080" range="48-105" />
</MediaCodec>
<MediaCodec name="OMX.google.mpeg4.decoder" update="true">
<Type name="video/mp4v-es">
<Limit name="measured-frame-rate-176x144" range="430-946" />
</Type>
</MediaCodec>
<MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
<Limit name="measured-frame-rate-320x180" range="800-1760" />
<Limit name="measured-frame-rate-320x240" range="330-726" />
<Limit name="measured-frame-rate-640x360" range="370-405" />
<Limit name="measured-frame-rate-1280x720" range="22-48" />
<Limit name="measured-frame-rate-1920x1080" range="30-66" />
</MediaCodec>
<MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
<Limit name="measured-frame-rate-320x180" range="640-720" />
<Limit name="measured-frame-rate-320x240" range="200-230" />
<Limit name="measured-frame-rate-640x360" range="81-90" />
<Limit name="measured-frame-rate-1280x720" range="60-85" />
<Limit name="measured-frame-rate-1920x1080" range="33-55" />
</MediaCodec>
<MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true"> <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
<Limit name="measured-frame-rate-320x240" range="117-160" /> <Limit name="measured-frame-rate-320x240" range="117-160" />
<Limit name="measured-frame-rate-720x480" range="36-49" /> <Limit name="measured-frame-rate-720x480" range="36-49" />

View File

@ -121,10 +121,8 @@ Only the three quirks included above are recognized at this point:
--> -->
<MediaCodecs> <MediaCodecs>
<Include href="media_codecs_google_audio.xml" />
<Include href="media_codecs_vendor_audio.xml" />
<Include href="media_codecs_google_telephony.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>
<Encoders> <Encoders>
@ -444,5 +442,4 @@ Only the three quirks included above are recognized at this point:
</MediaCodec> </MediaCodec>
<!-- Audio Software --> <!-- Audio Software -->
</Decoders> </Decoders>
<Include href="media_codecs_google_video.xml" />
</MediaCodecs> </MediaCodecs>

View File

@ -266,11 +266,6 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/media/media_codecs_vendor_sdmmagpie_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ $(LOCAL_PATH)/configs/media/media_codecs_vendor_sdmmagpie_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
$(LOCAL_PATH)/configs/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml $(LOCAL_PATH)/configs/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
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_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
# Network # Network
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.system.net.netd@1.1.vendor \ android.system.net.netd@1.1.vendor \