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

Commit 3deb9317 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Support more audio decoder sample rates"

parents 8acbb6ce d7f88ee7

media/codec2/components/aac/C2SoftAacDec.cpp

+2 −1
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ public: 
                DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE)

                .withDefault(new C2StreamSampleRateInfo::output(0u, 44100))

                .withFields({C2F(mSampleRate, value).oneOf({

                    7350, 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000

                    7350, 8000, 11025, 12000, 16000, 22050, 24000, 32000,

                    44100, 48000, 64000, 88200, 96000

                })})

                .withSetter(Setter<decltype(*mSampleRate)>::NonStrictValueWithNoDeps)

                .build());

media/codec2/components/opus/C2SoftOpusDec.cpp

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

                DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE)

                .withDefault(new C2StreamSampleRateInfo::output(0u, 48000))

                .withFields({C2F(mSampleRate, value).equalTo(48000)})

                .withFields({C2F(mSampleRate, value).inRange(8000, 48000)})

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

                .build());

media/codec2/components/xaac/C2SoftXaacDec.cpp

+2 −1
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ public: 
                DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE)

                .withDefault(new C2StreamSampleRateInfo::output(0u, 44100))

                .withFields({C2F(mSampleRate, value).oneOf({

                    7350, 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000

                    7350, 8000, 11025, 12000, 16000, 22050, 24000, 32000,

                    44100, 48000, 64000, 88200, 96000

                })})

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

                .build());