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

Commit c975c23b authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "stagefright: add codec capability info for google audio codecs" into lmp-dev

parents 475da7ef 037f9b61

media/libstagefright/data/media_codecs_google_audio.xml

+69 −14
Original line number Original line Diff line number Diff line
@@ -16,21 +16,76 @@ 




<Included>

<Included>

    <Decoders>

    <Decoders>

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

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

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

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

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

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

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

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

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

        </MediaCodec>

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

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

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

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

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

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

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

            <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" />

            <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" />

            <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,11025,12000,16000,22050,24000,32000,44100,48000,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-96000" />

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

        </MediaCodec>

    </Decoders>

    </Decoders>



    <Encoders>

    <Encoders>

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

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

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

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

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

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

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

            <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>

    </Encoders>

</Included>
 
</Included>

media/libstagefright/data/media_codecs_google_telephony.xml

+5 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,10 @@ 




<Included>

<Included>

    <Decoders>

    <Decoders>

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

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

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

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

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

        </MediaCodec>

    </Decoders>

    </Decoders>

</Included>
 
</Included>