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

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

Merge "audio_channel_in/out_mask_from_count"

parents eb76ff27 ab334fd3

cmds/stagefright/SimplePlayer.cpp

+1 −2
Original line number Diff line number Diff line
@@ -583,8 +583,7 @@ status_t SimplePlayer::onOutputFormatChanged( 
                AUDIO_STREAM_MUSIC,

                sampleRate,

                AUDIO_FORMAT_PCM_16_BIT,

                (channelCount == 1)

                    ? AUDIO_CHANNEL_OUT_MONO : AUDIO_CHANNEL_OUT_STEREO,

                audio_channel_out_mask_from_count(channelCount),

                0);



        state->mNumFramesWritten = 0;

cmds/stagefright/audioloop.cpp

+1 −3
Original line number Diff line number Diff line
@@ -32,9 +32,7 @@ int main() { 
    sp<MediaSource> source = new AudioSource(

            AUDIO_SOURCE_DEFAULT,

            kSampleRate,

            kNumChannels == 1

                ? AUDIO_CHANNEL_IN_MONO

                : AUDIO_CHANNEL_IN_STEREO);

            audio_channel_in_mask_from_count(kNumChannels));

#endif



    sp<MetaData> meta = new MetaData;

media/libaah_rtp/aah_decoder_pump.cpp

+2 −3
Original line number Diff line number Diff line
@@ -105,9 +105,8 @@ void AAH_DecoderPump::queueToRenderer(MediaBuffer* decoded_sample) { 
                AudioTrack::getMinFrameCount(&frameCount,

                        AUDIO_STREAM_DEFAULT,

                        static_cast<int>(format_sample_rate_));

                int ch_format = (format_channels_ == 1)

                    ? AUDIO_CHANNEL_OUT_MONO

                    : AUDIO_CHANNEL_OUT_STEREO;

                audio_channel_mask_t ch_format =

                        audio_channel_out_mask_from_count(format_channels_);



                res = renderer_->set(AUDIO_STREAM_DEFAULT,

                        format_sample_rate_,

media/libaah_rtp/aah_decoder_pump.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ class AAH_DecoderPump : public MediaSource { 
    void stopAndCleanupRenderer();



    sp<MetaData>        format_;

    int32_t             format_channels_;

    int32_t             format_channels_;   // channel count, not channel mask

    int32_t             format_sample_rate_;



    sp<MediaSource>     decoder_;

media/libeffects/preprocessing/PreProcessing.cpp

+4 −5
Original line number Diff line number Diff line
@@ -956,10 +956,9 @@ void Session_GetConfig(preproc_session_t *session, effect_config_t *config) 
    memset(config, 0, sizeof(effect_config_t));

    config->inputCfg.samplingRate = config->outputCfg.samplingRate = session->samplingRate;

    config->inputCfg.format = config->outputCfg.format = AUDIO_FORMAT_PCM_16_BIT;

    config->inputCfg.channels = session->inChannelCount == 1 ?

                                    AUDIO_CHANNEL_IN_MONO : AUDIO_CHANNEL_IN_STEREO;

    config->outputCfg.channels = session->outChannelCount == 1 ?

                                    AUDIO_CHANNEL_IN_MONO : AUDIO_CHANNEL_IN_STEREO;

    config->inputCfg.channels = audio_channel_in_mask_from_count(session->inChannelCount);

    // "out" doesn't mean output device, so this is the correct API to convert channel count to mask

    config->outputCfg.channels = audio_channel_in_mask_from_count(session->outChannelCount);

    config->inputCfg.mask = config->outputCfg.mask =

            (EFFECT_CONFIG_SMP_RATE | EFFECT_CONFIG_CHANNELS | EFFECT_CONFIG_FORMAT);

}
@@ -999,7 +998,7 @@ void Session_GetReverseConfig(preproc_session_t *session, effect_config_t *confi 
    config->inputCfg.samplingRate = config->outputCfg.samplingRate = session->samplingRate;

    config->inputCfg.format = config->outputCfg.format = AUDIO_FORMAT_PCM_16_BIT;

    config->inputCfg.channels = config->outputCfg.channels =

            session->revChannelCount == 1 ? AUDIO_CHANNEL_IN_MONO : AUDIO_CHANNEL_IN_STEREO;

            audio_channel_in_mask_from_count(session->revChannelCount);

    config->inputCfg.mask = config->outputCfg.mask =

            (EFFECT_CONFIG_SMP_RATE | EFFECT_CONFIG_CHANNELS | EFFECT_CONFIG_FORMAT);

}