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

Commit 8ffacf69 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Enable 12 channel decoding of raw audio format" into main am: edf33cea am: 7a0616fe 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2658260



Change-Id: I3597e62c03dea4d18a84d76eaaf2ee4010a9493c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2568200f 7a0616fe

media/codec2/components/raw/C2SoftRawDec.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ public: 
        addParameter(

        addParameter(

                DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT)

                DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT)

                .withDefault(new C2StreamChannelCountInfo::output(0u, 2))

                .withDefault(new C2StreamChannelCountInfo::output(0u, 2))

                .withFields({C2F(mChannelCount, value).inRange(1, 8)})

                .withFields({C2F(mChannelCount, value).inRange(1, 12)})

                .withSetter(Setter<decltype(*mChannelCount)>::StrictValueWithNoDeps)

                .withSetter(Setter<decltype(*mChannelCount)>::StrictValueWithNoDeps)

                .build());

                .build());

media/libstagefright/data/media_codecs_google_c2_audio.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ 
        </MediaCodec>

        </MediaCodec>

        <MediaCodec name="c2.android.raw.decoder" type="audio/raw">

        <MediaCodec name="c2.android.raw.decoder" type="audio/raw">

            <Alias name="OMX.google.raw.decoder" />

            <Alias name="OMX.google.raw.decoder" />

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

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

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

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

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

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

        </MediaCodec>

        </MediaCodec>

media/libstagefright/data/media_codecs_sw.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@ 
        </MediaCodec>

        </MediaCodec>

        <MediaCodec name="c2.android.raw.decoder" type="audio/raw">

        <MediaCodec name="c2.android.raw.decoder" type="audio/raw">

            <Alias name="OMX.google.raw.decoder" />

            <Alias name="OMX.google.raw.decoder" />

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

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

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

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

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

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

            <Attribute name="software-codec" />

            <Attribute name="software-codec" />