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

Commit 0e695885 authored by Aayush Gupta's avatar Aayush Gupta Committed by Aayush Gupta
Browse files

2e: Copy media_codecs_google* from fw/av 



Signed-off-by: default avatarAayush Gupta <aayushgupta219@gmail.com>
Change-Id: I1cc5b6e63566570f9991319b5cce580213b22f38
parent ba616e12

device.mk

+9 −5
Original line number Diff line number Diff line
@@ -139,12 +139,16 @@ PRODUCT_PACKAGES += \ 
PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \

    $(LOCAL_PATH)/media/media_codecs_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \

    $(LOCAL_PATH)/media/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \

    $(LOCAL_PATH)/media/media_codecs_google_video_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video_le.xml \

    $(LOCAL_PATH)/media/media_codecs_mediatek_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_mediatek_audio.xml \

    $(LOCAL_PATH)/media/media_codecs_mediatek_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_mediatek_video.xml \

    $(LOCAL_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \

    $(LOCAL_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \

    $(LOCAL_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml



PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/media/media_codecs_mediatek_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_mediatek_audio.xml \

    $(LOCAL_PATH)/media/media_codecs_mediatek_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_mediatek_video.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_video_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video_le.xml



PRODUCT_PACKAGES += \

    com.android.media.swcodec \

media/media_codecs_google_audio.xml

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

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

-->



<Included>

    <Decoders>

        <MediaCodec name="OMX.google.mp3.decoder" type="audio/mpeg">

            <Limit name="channel-count" max="2" />

            <Limit name="sample-rate" ranges="8000,11025,12000,16000,22050,24000,32000,44100,48000" />

            <Limit name="bitrate" range="8000-320000" />

        </MediaCodec>

        <MediaCodec name="OMX.google.amrnb.decoder" type="audio/3gpp">

            <Limit name="channel-count" max="1" />

            <Limit name="sample-rate" ranges="8000" />

            <Limit name="bitrate" range="4750-12200" />

        </MediaCodec>

        <MediaCodec name="OMX.google.amrwb.decoder" type="audio/amr-wb">

            <Limit name="channel-count" max="1" />

            <Limit name="sample-rate" ranges="16000" />

            <Limit name="bitrate" range="6600-23850" />

        </MediaCodec>

        <MediaCodec name="OMX.google.aac.decoder" type="audio/mp4a-latm">

            <Limit name="channel-count" max="8" />

            <Limit name="sample-rate" ranges="7350,8000,11025,12000,16000,22050,24000,32000,44100,48000" />

            <Limit name="bitrate" range="8000-960000" />

        </MediaCodec>

        <MediaCodec name="OMX.google.g711.alaw.decoder" type="audio/g711-alaw">

            <Limit name="channel-count" max="1" />

            <Limit name="sample-rate" ranges="8000-48000" />

            <Limit name="bitrate" range="64000" />

        </MediaCodec>

        <MediaCodec name="OMX.google.g711.mlaw.decoder" type="audio/g711-mlaw">

            <Limit name="channel-count" max="1" />

            <Limit name="sample-rate" ranges="8000-48000" />

            <Limit name="bitrate" range="64000" />

        </MediaCodec>

        <MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis">

            <Limit name="channel-count" max="8" />

            <Limit name="sample-rate" ranges="8000-96000" />

            <Limit name="bitrate" range="32000-500000" />

        </MediaCodec>

        <MediaCodec name="OMX.google.opus.decoder" type="audio/opus">

            <Limit name="channel-count" max="8" />

            <Limit name="sample-rate" ranges="48000" />

            <Limit name="bitrate" range="6000-510000" />

        </MediaCodec>

        <MediaCodec name="OMX.google.raw.decoder" type="audio/raw">

            <Limit name="channel-count" max="8" />

            <Limit name="sample-rate" ranges="8000-192000" />

            <Limit name="bitrate" range="1-10000000" />

        </MediaCodec>

        <MediaCodec name="OMX.google.flac.decoder" type="audio/flac">

            <Limit name="channel-count" max="8" />

            <Limit name="sample-rate" ranges="1-655350" />

            <Limit name="bitrate" range="1-21000000" />

        </MediaCodec>

    </Decoders>

    <Encoders>

        <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm">

            <Limit name="channel-count" max="6" />

            <Limit name="sample-rate" ranges="8000,11025,12000,16000,22050,24000,32000,44100,48000" />

            <!-- also may support 64000, 88200  and 96000 Hz -->

            <Limit name="bitrate" range="8000-960000" />

        </MediaCodec>

        <MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp">

            <Limit name="channel-count" max="1" />

            <Limit name="sample-rate" ranges="8000" />

            <Limit name="bitrate" range="4750-12200" />

            <Feature name="bitrate-modes" value="CBR" />

        </MediaCodec>

        <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb">

            <Limit name="channel-count" max="1" />

            <Limit name="sample-rate" ranges="16000" />

            <Limit name="bitrate" range="6600-23850" />

            <Feature name="bitrate-modes" value="CBR" />

        </MediaCodec>

        <MediaCodec name="OMX.google.flac.encoder" type="audio/flac">

            <Limit name="channel-count" max="2" />

            <Limit name="sample-rate" ranges="1-655350" />

            <Limit name="bitrate" range="1-21000000" />

            <Limit name="complexity" range="0-8"  default="5" />

            <Feature name="bitrate-modes" value="CQ" />

        </MediaCodec>

    </Encoders>

</Included>

media/media_codecs_google_video_le.xml

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

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

-->



<Included>

    <Decoders>

        <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es">

            <!-- profiles and levels:  ProfileSimple : Level3 -->

            <Limit name="size" min="2x2" max="352x288" />

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

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

            <Limit name="blocks-per-second" range="12-11880" />

            <Limit name="bitrate" range="1-384000" />

            <Feature name="adaptive-playback" />

        </MediaCodec>

        <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp">

            <!-- profiles and levels:  ProfileBaseline : Level30, ProfileBaseline : Level45

                    ProfileISWV2 : Level30, ProfileISWV2 : Level45 -->

            <Limit name="size" min="2x2" max="352x288" />

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

            <Limit name="bitrate" range="1-384000" />

            <Feature name="adaptive-playback" />

        </MediaCodec>

        <MediaCodec name="OMX.google.h264.decoder" type="video/avc">

            <!-- profiles and levels:  ProfileHigh : Level51 -->

            <Limit name="size" min="2x2" max="1920x1088" />

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

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

            <Limit name="block-count" range="1-16384" />

            <Limit name="blocks-per-second" range="1-491520" />

            <Limit name="bitrate" range="1-40000000" />

            <Feature name="adaptive-playback" />

        </MediaCodec>

        <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc">

            <!-- profiles and levels:  ProfileMain : MainTierLevel51 -->

            <Limit name="size" min="2x2" max="1920x1088" />

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

            <Limit name="block-size" value="8x8" />

            <Limit name="block-count" range="1-65536" />

            <Limit name="blocks-per-second" range="1-491520" />

            <Limit name="bitrate" range="1-5000000" />

            <Feature name="adaptive-playback" />

        </MediaCodec>

        <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8">

            <Limit name="size" min="2x2" max="1920x1088" />

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

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

            <Limit name="block-count" range="1-8192" /> <!-- max 2048x1024 -->

            <Limit name="blocks-per-second" range="1-500000" />

            <Limit name="bitrate" range="1-40000000" />

            <Feature name="adaptive-playback" />

        </MediaCodec>

        <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9">

            <Limit name="size" min="2x2" max="1280x1280" />

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

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

            <Limit name="block-count" range="1-3600" /> <!-- max 1280x720 -->

            <Limit name="blocks-per-second" range="1-108000" />

            <Limit name="bitrate" range="1-5000000" />

            <Feature name="adaptive-playback" />

        </MediaCodec>

    </Decoders>



    <Encoders>

        <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp">

            <!-- profiles and levels:  ProfileBaseline : Level45 -->

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

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

            <Limit name="bitrate" range="1-128000" />

        </MediaCodec>

        <MediaCodec name="OMX.google.h264.encoder" type="video/avc">

            <!-- profiles and levels:  ProfileBaseline : Level3 -->

            <Limit name="size" min="16x16" max="1808x1808" />

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

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

            <Limit name="block-count" range="1-1620" />

            <Limit name="blocks-per-second" range="1-40500" />

            <Limit name="bitrate" range="1-2000000" />

            <Feature name="intra-refresh" />

        </MediaCodec>

        <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es">

            <!-- profiles and levels:  ProfileCore : Level2 -->

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

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

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

            <Limit name="blocks-per-second" range="12-1485" />

            <Limit name="bitrate" range="1-64000" />

        </MediaCodec>

        <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8">

            <!-- profiles and levels:  ProfileMain : Level_Version0-3 -->

            <Limit name="size" min="2x2" max="1280x1280" />

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

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

            <Limit name="block-count" range="1-3600" /> <!-- max 1280x720 -->

            <Limit name="bitrate" range="1-20000000" />

            <Feature name="bitrate-modes" value="VBR,CBR" />

        </MediaCodec>

    </Encoders>

</Included>