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

Commit bea3d3e0 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Clean up references to AUDIO_FORMAT_PCM_8_24_BIT"

parents 0b83a15d b7f08d38

media/libeffects/testlibs/AudioFormatAdapter.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ public: 
        while (numSamples > 0) {

            uint32_t numSamplesIter = min(numSamples, mMaxSamplesPerCall);

            uint32_t nSamplesChannels = numSamplesIter * mNumChannels;

            // This branch of "if" is untested

            if (mPcmFormat == AUDIO_FORMAT_PCM_8_24_BIT) {

                if (mBehavior == EFFECT_BUFFER_ACCESS_WRITE) {

                    mpProcessor->process(

media/libeffects/testlibs/EffectEqualizer.cpp

+1 −2
Original line number Diff line number Diff line
@@ -234,8 +234,7 @@ int Equalizer_setConfig(EqualizerContext *pContext, effect_config_t *pConfig) 
              (pConfig->inputCfg.channels == AUDIO_CHANNEL_OUT_STEREO));

    CHECK_ARG(pConfig->outputCfg.accessMode == EFFECT_BUFFER_ACCESS_WRITE

              || pConfig->outputCfg.accessMode == EFFECT_BUFFER_ACCESS_ACCUMULATE);

    CHECK_ARG(pConfig->inputCfg.format == AUDIO_FORMAT_PCM_8_24_BIT

              || pConfig->inputCfg.format == AUDIO_FORMAT_PCM_16_BIT);

    CHECK_ARG(pConfig->inputCfg.format == AUDIO_FORMAT_PCM_16_BIT);



    int channelCount;

    if (pConfig->inputCfg.channels == AUDIO_CHANNEL_OUT_MONO) {