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

Commit 0a5663ca authored by TheMalachite's avatar TheMalachite
Browse files

Revert "bismuth: Disable OMX MTK AVC" 

Better to keep it until I found a better solution
This reverts commit 892da7a3.
parent 4dd3239c

configs/media/media_codecs_mediatek_video.xml

deleted100644 → 0
+0 −196
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8" ?>

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

-->



<!--

<!DOCTYPE MediaCodecs [

<!ELEMENT MediaCodecs (Decoders,Encoders)>

<!ELEMENT Decoders (MediaCodec*)>

<!ELEMENT Encoders (MediaCodec*)>

<!ELEMENT MediaCodec (Type*,Quirk*)>

<!ATTLIST MediaCodec name CDATA #REQUIRED>

<!ATTLIST MediaCodec type CDATA>

<!ELEMENT Type EMPTY>

<!ATTLIST Type name CDATA #REQUIRED>

<!ELEMENT Quirk EMPTY>

<!ATTLIST Quirk name CDATA #REQUIRED>

]>



There's a simple and a complex syntax to declare the availability of a

media codec:



A codec that properly follows the OpenMax spec and therefore doesn't have any

quirks and that only supports a single content type can be declared like so:



    <MediaCodec name="OMX.foo.bar" type="something/interesting" />



If a codec has quirks OR supports multiple content types, the following syntax

can be used:



    <MediaCodec name="OMX.foo.bar" >

        <Type name="something/interesting" />

        <Type name="something/else" />

        ...

        <Quirk name="requires-allocate-on-input-ports" />

        <Quirk name="requires-allocate-on-output-ports" />

        <Quirk name="output-buffers-are-unreadable" />

    </MediaCodec>



Only the three quirks included above are recognized at this point:



"requires-allocate-on-input-ports"

    must be advertised if the component does not properly support specification

    of input buffers using the OMX_UseBuffer(...) API but instead requires

    OMX_AllocateBuffer to be used.



"requires-allocate-on-output-ports"

    must be advertised if the component does not properly support specification

    of output buffers using the OMX_UseBuffer(...) API but instead requires

    OMX_AllocateBuffer to be used.



"output-buffers-are-unreadable"

    must be advertised if the emitted output buffers of a decoder component

    are not readable, i.e. use a custom format even though abusing one of

    the official OMX colorspace constants.

    Clients of such decoders will not be able to access the decoded data,

    naturally making the component much less useful. The only use for

    a component with this quirk is to render the output to the screen.

    Audio decoders MUST NOT advertise this quirk.

    Video decoders that advertise this quirk must be accompanied by a

    corresponding color space converter for thumbnail extraction,

    matching surfaceflinger support that can render the custom format to

    a texture and possibly other code, so just DON'T USE THIS QUIRK.



    2012/07/13 config for MTK OMX Media Codecs, created by Morris Yang (mtk03147)

-->



<Included>

    <Decoders>

        <MediaCodec name="OMX.MTK.VIDEO.DECODER.MPEG2" type="video/mpeg2" >

            <Limit name="size" min="16x16" max="2048x1088" />

            <Quirk name="requires-allocate-on-input-ports" />

            <Quirk name="requires-allocate-on-output-ports" />

            <Limit name="concurrent-instances" max="16" />

        </MediaCodec>

        <MediaCodec name="OMX.MTK.VIDEO.DECODER.HEVC" type="video/hevc" >

            <Limit name="size" min="16x16" max="3840x2176" />

            <Quirk name="requires-allocate-on-input-ports" />

            <Quirk name="requires-allocate-on-output-ports" />

            <Feature name="adaptive-playback"/>

            <Limit name="concurrent-instances" max="16" />

        </MediaCodec>

        <MediaCodec name="OMX.MTK.VIDEO.DECODER.MPEG4" type="video/mp4v-es" >

            <Limit name="size" min="16x16" max="2048x1088" />

            <Quirk name="requires-allocate-on-input-ports" />

            <Quirk name="requires-allocate-on-output-ports" />

            <Feature name="adaptive-playback"/>

            <Limit name="concurrent-instances" max="16" />

        </MediaCodec>

        <MediaCodec name="OMX.MTK.VIDEO.DECODER.H263" type="video/3gpp" >

            <Limit name="size" min="128x96" max="1408x1152" />

            <Quirk name="requires-allocate-on-input-ports" />

            <Quirk name="requires-allocate-on-output-ports" />

            <Feature name="adaptive-playback"/>

            <Limit name="concurrent-instances" max="16" />

        </MediaCodec>

        <!--

        <MediaCodec name="OMX.MTK.VIDEO.DECODER.AVC" type="video/avc" >

            <Limit name="size" min="64x64" max="3840x2176" />

            <Quirk name="wants-NAL-fragments" />

            <Quirk name="requires-allocate-on-input-ports" />

            <Quirk name="requires-allocate-on-output-ports" />

            <Feature name="adaptive-playback"/>

            <Feature name="can-swap-width-height"/>

            <Limit name="concurrent-instances" max="16" />

        </MediaCodec>

        -->

        <MediaCodec name="OMX.MTK.VIDEO.DECODER.VPX" type="video/x-vnd.on2.vp8" >

            <Limit name="size" min="16x16" max="1920x1088" />

            <Quirk name="requires-allocate-on-input-ports" />

            <Quirk name="requires-allocate-on-output-ports" />

            <Feature name="adaptive-playback"/>

            <Limit name="concurrent-instances" max="16" />

        </MediaCodec>

        <MediaCodec name="OMX.MTK.VIDEO.DECODER.VP9" type="video/x-vnd.on2.vp9" >

            <Limit name="size" min="16x16" max="3840x2176" />

            <Quirk name="requires-allocate-on-input-ports" />

            <Quirk name="requires-allocate-on-output-ports" />

            <Feature name="adaptive-playback"/>

            <Limit name="concurrent-instances" max="16" />

        </MediaCodec>

        <MediaCodec name="OMX.MTK.VIDEO.DECODER.DIVX" type="video/divx" >

            <Limit name="size" min="16x16" max="1920x1088" />

            <Quirk name="requires-allocate-on-input-ports" />

            <Quirk name="requires-allocate-on-output-ports" />

            <Limit name="concurrent-instances" max="16" />

        </MediaCodec>

        <MediaCodec name="OMX.MTK.VIDEO.DECODER.DIVX3" type="video/divx3" >

            <Limit name="size" min="16x16" max="1920x1088" />

            <Quirk name="requires-allocate-on-input-ports" />

            <Quirk name="requires-allocate-on-output-ports" />

            <Limit name="concurrent-instances" max="16" />

        </MediaCodec>

        <MediaCodec name="OMX.MTK.VIDEO.DECODER.XVID" type="video/xvid" >

            <Limit name="size" min="16x16" max="1920x1088" />

            <Quirk name="requires-allocate-on-input-ports" />

            <Quirk name="requires-allocate-on-output-ports" />

            <Limit name="concurrent-instances" max="16" />

        </MediaCodec>

        <MediaCodec name="OMX.MTK.VIDEO.DECODER.VC1" type="video/x-ms-wmv" >

            <Limit name="size" min="16x16" max="1920x1088" />

            <Quirk name="requires-allocate-on-input-ports" />

            <Quirk name="requires-allocate-on-output-ports" />

            <Limit name="concurrent-instances" max="16" />

        </MediaCodec>

    </Decoders>



    <Encoders>

        <MediaCodec name="OMX.MTK.VIDEO.ENCODER.MPEG4" type="video/mp4v-es" >

            <Limit name="size" min="176x144" max="176x144" />

            <Limit name="alignment" value="16x16" />

            <Limit name="block-size" value="16x16" />

            <Quirk name="requires-allocate-on-input-ports" />

            <Quirk name="requires-allocate-on-output-ports" />

            <Limit name="concurrent-instances" max="16" />

        </MediaCodec>

        <MediaCodec name="OMX.MTK.VIDEO.ENCODER.H263" type="video/3gpp" >

            <Limit name="size" min="176x144" max="176x144" />

            <Limit name="alignment" value="16x16" />

            <Limit name="block-size" value="16x16" />

            <Quirk name="requires-allocate-on-input-ports" />

            <Quirk name="requires-allocate-on-output-ports" />

            <Limit name="concurrent-instances" max="16" />

        </MediaCodec>

        <!--

        <MediaCodec name="OMX.MTK.VIDEO.ENCODER.AVC" type="video/avc" >

            <Limit name="size" min="128x96" max="1920x1080" />

            <Limit name="alignment" value="2x2" />

            <Limit name="block-size" value="16x16" />

            <Quirk name="requires-allocate-on-input-ports" />

            <Quirk name="requires-allocate-on-output-ports" />

            <Feature name="can-swap-width-height" />

            <Limit name="concurrent-instances" max="16" />

        </MediaCodec>

        -->

        <MediaCodec name="OMX.MTK.VIDEO.ENCODER.HEVC" type="video/hevc" >

            <Limit name="size" min="176x144" max="640x480" />

            <Limit name="alignment" value="16x16" />

            <Limit name="block-size" value="16x16" />

            <Quirk name="requires-allocate-on-input-ports" />

            <Quirk name="requires-allocate-on-output-ports" />

            <Limit name="concurrent-instances" max="16" />

        </MediaCodec>

    </Encoders>

</Included>

device.mk

+0 −4
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ PRODUCT_COPY_FILES += \ 
    $(LOCAL_PATH)/idc/mtk-kpd.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-kpd.idc \

    $(LOCAL_PATH)/keylayout/mtk-kpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-kpd.kl



# Media

PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/configs/media/media_codecs_mediatek_video.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/media_codecs_mediatek_video.xml



# NFC

PRODUCT_PACKAGES += \

    android.hardware.nfc@1.0:64 \

rootdir/etc/init.mt6771.rc

+0 −1
Original line number Diff line number Diff line
@@ -15,5 +15,4 @@ on post-fs 
    umount /vendor/etc/fstab.mt6771



on zygote-start

   mount none /system/etc/media_codecs_mediatek_video.xml /vendor/etc/media_codecs_mediatek_video.xml bind

   mount none /system/overlay/DummyOverlay.apk /vendor/overlay/framework-res__auto_generated_rro.apk bind