Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02288236 authored by Sahil Sonar's avatar Sahil Sonar 💬
Browse files

FP5: Drop lahaina & yupik_v0 media configs

   - We don't need them on yupik_iot.
parent bcb8a638
Loading
Loading
Loading
Loading
+0 −3
Original line number Original line Diff line number Diff line
@@ -268,17 +268,14 @@ PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
    $(LOCAL_PATH)/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
    $(LOCAL_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
    $(LOCAL_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
    $(LOCAL_PATH)/media/media_codecs_performance_yupik_iot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_yupik_iot.xml \
    $(LOCAL_PATH)/media/media_codecs_performance_yupik_iot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_yupik_iot.xml \
    $(LOCAL_PATH)/media/media_codecs_performance_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_yupik_v0.xml \
    $(LOCAL_PATH)/media/media_codecs_performance_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_yupik_v1.xml \
    $(LOCAL_PATH)/media/media_codecs_performance_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_yupik_v1.xml \
    $(LOCAL_PATH)/media/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \
    $(LOCAL_PATH)/media/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \
    $(LOCAL_PATH)/media/media_codecs_yupik_iot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_iot.xml \
    $(LOCAL_PATH)/media/media_codecs_yupik_iot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_iot.xml \
    $(LOCAL_PATH)/media/media_codecs_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_v0.xml \
    $(LOCAL_PATH)/media/media_codecs_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_v1.xml \
    $(LOCAL_PATH)/media/media_codecs_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_v1.xml \
    $(LOCAL_PATH)/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \
    $(LOCAL_PATH)/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \
    $(LOCAL_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \
    $(LOCAL_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \
    $(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 \
    $(LOCAL_PATH)/media/media_profiles_yupik_iot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_iot.xml \
    $(LOCAL_PATH)/media/media_profiles_yupik_iot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_iot.xml \
    $(LOCAL_PATH)/media/media_profiles_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_v0.xml \
    $(LOCAL_PATH)/media/media_profiles_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_v1.xml
    $(LOCAL_PATH)/media/media_profiles_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_v1.xml


PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
+0 −151
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8" ?>
<!--
    Copyright (c) 2018-2021 Qualcomm Technologies, Inc.
    All Rights Reserved.
    Confidential and Proprietary - Qualcomm Technologies, Inc.

    Not a Contribution.

    Copyright (C) 2012-2017 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.
-->

<MediaCodecs>
    <Decoders>
        <!-- C2 HW decoders -->
        <MediaCodec name="c2.qti.avc.decoder" type="video/avc" update="true">
            <Limit name="measured-frame-rate-320x240" range="480-510" />
            <Limit name="measured-frame-rate-720x480" range="460-490" />
            <Limit name="measured-frame-rate-1280x720" range="350-400" />
            <Limit name="measured-frame-rate-1920x1080" range="41-58" />
        </MediaCodec>
        <MediaCodec name="c2.qti.avc.decoder.low_latency" type="video/avc" update="true">
            <Limit name="measured-frame-rate-320x240" range="296-641" />
            <Limit name="measured-frame-rate-720x480" range="278-594" />
            <Limit name="measured-frame-rate-1280x720" range="200-420" />
            <Limit name="measured-frame-rate-1920x1080" range="76-167" />
        </MediaCodec>
        <MediaCodec name="c2.qti.hevc.decoder" type="video/hevc" update="true">
            <Limit name="measured-frame-rate-352x288" range="510-530" />
            <Limit name="measured-frame-rate-720x480" range="465-620" />
            <Limit name="measured-frame-rate-1280x720" range="200-390" />
            <Limit name="measured-frame-rate-1920x1080" range="46-66" />
            <Limit name="measured-frame-rate-3840x2160" range="65-75" />
        </MediaCodec>
        <MediaCodec name="c2.qti.hevc.decoder.low_latency" type="video/hevc" update="true">
            <Limit name="measured-frame-rate-352x288" range="800-850" />
            <Limit name="measured-frame-rate-720x480" range="440-600" />
            <Limit name="measured-frame-rate-1280x720" range="215-425" />
            <Limit name="measured-frame-rate-1920x1080" range="118-259" />
            <Limit name="measured-frame-rate-3840x2160" range="30-66" />
        </MediaCodec>
        <MediaCodec name="c2.qti.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
            <Limit name="measured-frame-rate-320x240" range="377-377" />
            <Limit name="measured-frame-rate-640x360" range="486-751" />
            <Limit name="measured-frame-rate-1280x720" range="262-262" />
            <Limit name="measured-frame-rate-1920x1080" range="50-71" />
            <Limit name="measured-frame-rate-3840x2160" range="51-51" />
        </MediaCodec>
        <!-- TODO: add C2 mpeg2 decoder performance data -->

        <!-- C2 SW codecs -->
        <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
            <Limit name="measured-frame-rate-320x240" range="189-497" />
            <Limit name="measured-frame-rate-720x480" range="78-109" />
            <Limit name="measured-frame-rate-1280x720" range="38-55" />
            <Limit name="measured-frame-rate-1920x1080" range="21-31" />
        </MediaCodec>
        <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true">
            <Limit name="measured-frame-rate-352x288" range="191-408" />
            <Limit name="measured-frame-rate-640x360" range="186-254" />
            <Limit name="measured-frame-rate-720x480" range="173-237" />
            <Limit name="measured-frame-rate-1280x720" range="47-74" />
            <Limit name="measured-frame-rate-1920x1080" range="29-43" />
        </MediaCodec>
        <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
            <Limit name="measured-frame-rate-320x180" range="310-690" />
            <Limit name="measured-frame-rate-640x360" range="233-321" />
            <Limit name="measured-frame-rate-1280x720" range="64-91" />
            <Limit name="measured-frame-rate-1920x1080" range="22-33" />
        </MediaCodec>
        <MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
            <Limit name="measured-frame-rate-320x180" range="406-1104" />
            <Limit name="measured-frame-rate-640x360" range="203-330" />
            <Limit name="measured-frame-rate-1280x720" range="108-152" />
            <Limit name="measured-frame-rate-1920x1080" range="85-132" />
        </MediaCodec>
        <MediaCodec name="c2.android.h263.decoder" type="video/3gpp" update="true">
            <Limit name="measured-frame-rate-176x144" range="893-2369" />
            <Limit name="measured-frame-rate-352x288" range="650-780" />
        </MediaCodec>
        <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
            <Limit name="measured-frame-rate-176x144" range="730-1470" />
            <Limit name="measured-frame-rate-480x360" range="1500-2000" />
            <Limit name="measured-frame-rate-1280x720" range="300-800" />
        </MediaCodec>
    </Decoders>

    <Encoders>
        <!-- C2 HW encoders -->
        <MediaCodec name="c2.qti.avc.encoder" type="video/avc" update="true">
            <Limit name="measured-frame-rate-320x240" range="337-452" />
            <Limit name="measured-frame-rate-720x480" range="182-312" />
            <Limit name="measured-frame-rate-1280x720" range="66-94" />
            <Limit name="measured-frame-rate-1920x1080" range="55-65" />
        </MediaCodec>
        <MediaCodec name="c2.qti.hevc.encoder" type="video/hevc" update="true">
            <Limit name="measured-frame-rate-320x240" range="332-443" />
            <Limit name="measured-frame-rate-720x480" range="194-317" />
            <Limit name="measured-frame-rate-1280x720" range="65-94" />
            <Limit name="measured-frame-rate-1920x1080" range="55-65" />
            <Limit name="measured-frame-rate-3840x2160" range="20-27" />
        </MediaCodec>
        <MediaCodec name="c2.qti.hevc.encoder.cq" type="video/hevc" update="true">
            <Limit name="measured-frame-rate-320x240" range="340-400" />
        </MediaCodec>

        <!-- C2 SW encoders -->
        <MediaCodec name="c2.android.h263.encoder" type="video/3gpp" update="true">
            <Limit name="measured-frame-rate-176x144" range="523-746" />
        </MediaCodec>
        <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
            <Limit name="measured-frame-rate-320x240" range="167-248" />
            <Limit name="measured-frame-rate-720x480" range="62-90" />
            <Limit name="measured-frame-rate-1280x720" range="48-56" />
            <Limit name="measured-frame-rate-1920x1080" range="24-34" />
        </MediaCodec>
        <MediaCodec name="c2.android.hevc.encoder" type="video/hevc" update="true">
            <Limit name="measured-frame-rate-320x240" range="28-40" />
            <Limit name="measured-frame-rate-720x480" range="10-16" />
        </MediaCodec>
        <MediaCodec name="c2.android.mpeg4.encoder" type="video/mp4v-es" update="true">
            <Limit name="measured-frame-rate-176x144" range="315-379" />
        </MediaCodec>
        <MediaCodec name="c2.android.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
            <Limit name="measured-frame-rate-320x180" range="225-315" />
            <Limit name="measured-frame-rate-640x360" range="76-105" />
            <Limit name="measured-frame-rate-1280x720" range="26-32" />
            <Limit name="measured-frame-rate-1920x1080" range="19-26" />
        </MediaCodec>
        <MediaCodec name="c2.android.vp9.encoder" type="video/x-vnd.on2.vp9" update="true">
            <!-- measured 93%:99-156 med:109/109 N=24 -->
            <Limit name="measured-frame-rate-320x180" range="109-109" /> <!-- v93%=1.3 -->
            <!-- measured 95%:54-67 med:61/61 N=36 -->
            <Limit name="measured-frame-rate-640x360" range="61-61" /> <!-- v95%=1.1 -->
            <!-- measured 95%:16-26 med:20/20 N=32 -->
            <Limit name="measured-frame-rate-1280x720" range="20-20" /> <!-- v95%=1.3 -->
        </MediaCodec>
    </Encoders>
</MediaCodecs>

media/media_codecs_yupik_v0.xml

deleted100644 → 0
+0 −294

File deleted.

Preview size limit exceeded, changes collapsed.

media/media_profiles_yupik_v0.xml

deleted100644 → 0
+0 −1814

File deleted.

Preview size limit exceeded, changes collapsed.

+1 −7
Original line number Original line Diff line number Diff line
@@ -1011,25 +1011,19 @@ vendor/bin/init.qti.media.sh
vendor/etc/init/init.qti.media.rc
vendor/etc/init/init.qti.media.rc
vendor/etc/init/vendor.qti.media.c2@1.0-service.rc
vendor/etc/init/vendor.qti.media.c2@1.0-service.rc
vendor/etc/media/video_system_specs.json
vendor/etc/media/video_system_specs.json
vendor/etc/media_lahaina/video_system_specs.json
vendor/etc/media_yupik_v1/video_system_specs.json
vendor/etc/media_yupik_v1/video_system_specs.json
vendor/etc/seccomp_policy/codec2.vendor.base-arm.policy
vendor/etc/seccomp_policy/codec2.vendor.base-arm.policy
vendor/etc/seccomp_policy/codec2.vendor.ext-arm.policy
vendor/etc/seccomp_policy/codec2.vendor.ext-arm.policy
vendor/etc/vintf/manifest/c2_manifest_vendor.xml
vendor/etc/vintf/manifest/c2_manifest_vendor.xml
vendor/etc/media_codecs.xml
vendor/etc/media_codecs.xml
vendor/etc/media_codecs_lahaina.xml
vendor/etc/media_codecs_lahaina_vendor.xml
vendor/etc/media_codecs_performance.xml
vendor/etc/media_codecs_performance.xml
vendor/etc/media_codecs_performance_lahaina.xml
vendor/etc/media_codecs_performance_lahaina_vendor.xml
vendor/etc/media_codecs_performance_yupik_v1.xml
vendor/etc/media_codecs_performance_yupik_v1.xml
vendor/etc/media_codecs_vendor_audio.xml
vendor/etc/media_codecs_vendor_audio.xml
vendor/etc/media_codecs_yupik_v1.xml
vendor/etc/media_codecs_yupik_v1.xml
vendor/etc/media_profiles.xml
vendor/etc/media_profiles.xml
vendor/etc/media_profiles_V1_0.xml
vendor/etc/media_profiles_V1_0.xml
vendor/etc/media_profiles_lahaina.xml
vendor/etc/media_profiles_lahaina_vendor.xml
vendor/etc/media_profiles_yupik_v1.xml
vendor/etc/media_profiles_yupik_v1.xml
vendor/etc/media_yupik_iot/video_system_specs.json
vendor/etc/video_system_specs.json
vendor/etc/video_system_specs.json
vendor/lib/libqc2vppfilter.so
vendor/lib/libqc2vppfilter.so
vendor/lib/libqcodec2_base.so
vendor/lib/libqcodec2_base.so