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

Commit 47dabd38 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Gerrit Code Review
Browse files

Merge "Update to new WebRTC version"

parents a68b10a4 3f11ef01

media/libeffects/preprocessing/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ LOCAL_SRC_FILES:= \ 




LOCAL_C_INCLUDES += \

LOCAL_C_INCLUDES += \

    external/webrtc \

    external/webrtc \

    external/webrtc/webrtc/modules/interface \

    external/webrtc/webrtc/modules/include \

    external/webrtc/webrtc/modules/audio_processing/include \

    external/webrtc/webrtc/modules/audio_processing/include \

    $(call include-path-for, audio-effects)

    $(call include-path-for, audio-effects)

media/libeffects/preprocessing/PreProcessing.cpp

+10 −14
Original line number Original line Diff line number Diff line
@@ -884,8 +884,8 @@ int Session_ReleaseEffect(preproc_session_t *session, 
int Session_SetConfig(preproc_session_t *session, effect_config_t *config)

int Session_SetConfig(preproc_session_t *session, effect_config_t *config)

{

{

    uint32_t sr;

    uint32_t sr;

    uint32_t inCnl = audio_channel_count_from_out_mask(config->inputCfg.channels);

    uint32_t inCnl = audio_channel_count_from_in_mask(config->inputCfg.channels);

    uint32_t outCnl = audio_channel_count_from_out_mask(config->outputCfg.channels);

    uint32_t outCnl = audio_channel_count_from_in_mask(config->outputCfg.channels);





    if (config->inputCfg.samplingRate != config->outputCfg.samplingRate ||

    if (config->inputCfg.samplingRate != config->outputCfg.samplingRate ||

        config->inputCfg.format != config->outputCfg.format ||

        config->inputCfg.format != config->outputCfg.format ||
@@ -919,10 +919,10 @@ int Session_SetConfig(preproc_session_t *session, effect_config_t *config) 
    }

    }





    const webrtc::ProcessingConfig processing_config = {

    const webrtc::ProcessingConfig processing_config = {

      {{static_cast<int>(session->apmSamplingRate), static_cast<int>(inCnl)},

      {{static_cast<int>(session->apmSamplingRate), inCnl},

       {static_cast<int>(session->apmSamplingRate), static_cast<int>(outCnl)},

       {static_cast<int>(session->apmSamplingRate), outCnl},

       {static_cast<int>(session->apmSamplingRate), static_cast<int>(inCnl)},

       {static_cast<int>(session->apmSamplingRate), inCnl},

       {static_cast<int>(session->apmSamplingRate), static_cast<int>(inCnl)}}};

       {static_cast<int>(session->apmSamplingRate), inCnl}}};

    status = session->apm->Initialize(processing_config);

    status = session->apm->Initialize(processing_config);

    if (status < 0) {

    if (status < 0) {

        return -EINVAL;

        return -EINVAL;
@@ -1040,14 +1040,10 @@ int Session_SetReverseConfig(preproc_session_t *session, effect_config_t *config 
    }

    }

    uint32_t inCnl = audio_channel_count_from_out_mask(config->inputCfg.channels);

    uint32_t inCnl = audio_channel_count_from_out_mask(config->inputCfg.channels);

    const webrtc::ProcessingConfig processing_config = {

    const webrtc::ProcessingConfig processing_config = {

       {{static_cast<int>(session->apmSamplingRate),

       {{static_cast<int>(session->apmSamplingRate), session->inChannelCount},

         static_cast<int>(session->inChannelCount)},

        {static_cast<int>(session->apmSamplingRate), session->outChannelCount},

        {static_cast<int>(session->apmSamplingRate),

        {static_cast<int>(session->apmSamplingRate), inCnl},

         static_cast<int>(session->outChannelCount)},

        {static_cast<int>(session->apmSamplingRate), inCnl}}};

        {static_cast<int>(session->apmSamplingRate),

         static_cast<int>(inCnl)},

        {static_cast<int>(session->apmSamplingRate),

         static_cast<int>(inCnl)}}};

    int status = session->apm->Initialize(processing_config);

    int status = session->apm->Initialize(processing_config);

    if (status < 0) {

    if (status < 0) {

        return -EINVAL;

        return -EINVAL;