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

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

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



Change-Id: Ic18c3b47bceabbb91ecefcc3d6c806df6dcabc52
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7352adcb edf33cea

media/codec2/components/raw/C2SoftRawDec.cpp

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

                DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT)

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

                .build());

media/libstagefright/data/media_codecs_google_c2_audio.xml

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

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

            <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="bitrate" range="1-10000000" />

        </MediaCodec>

media/libstagefright/data/media_codecs_sw.xml

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

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

            <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="bitrate" range="1-10000000" />

            <Attribute name="software-codec" />