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

Commit c9e3c9c1 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7199033 from d3540d4d to sc-release 

Change-Id: I9618fb7375095641513fe09d2debb306213d41e1
parents 6f109ded d3540d4d

drm/libmediadrm/CryptoHal.cpp

+1 −0
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ ssize_t CryptoHal::decrypt(const uint8_t keyId[16], const uint8_t iv[16], 


    Return<void> hResult;



    mLock.unlock();

    if (mPluginV1_2 != NULL) {

        hResult = mPluginV1_2->decrypt_1_2(secure, toHidlArray16(keyId), toHidlArray16(iv),

                hMode, hPattern, hSubSamples, hSource, offset, hDestination,

media/libeffects/lvm/lib/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ cc_library_static { 
        "Eq/src/LVEQNB_Init.cpp",

        "Eq/src/LVEQNB_Process.cpp",

        "Eq/src/LVEQNB_Tables.cpp",

        "Common/src/InstAlloc.cpp",

        "Common/src/DC_2I_D16_TRC_WRA_01.cpp",

        "Common/src/DC_2I_D16_TRC_WRA_01_Init.cpp",

        "Common/src/Copy_16.cpp",
@@ -146,11 +145,9 @@ cc_library_static { 
        "Reverb/src/LVREV_ClearAudioBuffers.cpp",

        "Reverb/src/LVREV_GetControlParameters.cpp",

        "Reverb/src/LVREV_GetInstanceHandle.cpp",

        "Reverb/src/LVREV_GetMemoryTable.cpp",

        "Reverb/src/LVREV_Process.cpp",

        "Reverb/src/LVREV_SetControlParameters.cpp",

        "Reverb/src/LVREV_Tables.cpp",

        "Common/src/InstAlloc.cpp",

        "Common/src/LoadConst_32.cpp",

        "Common/src/From2iToMono_32.cpp",

        "Common/src/Mult3s_32x16.cpp",

media/libeffects/lvm/lib/Bass/src/LVDBE_Control.cpp

+5 −3
Original line number Diff line number Diff line
@@ -277,13 +277,15 @@ LVDBE_ReturnStatus_en LVDBE_Control(LVDBE_Handle_t hInstance, LVDBE_Params_t* pP 
    /*

     * Create biquad instance

     */

    if (pInstance->Params.NrChannels != pParams->NrChannels) {

        pInstance->pHPFBiquad.reset(

                new android::audio_utils::BiquadFilter<LVM_FLOAT>(pParams->NrChannels));



    }

    /*

     * Update the filters

     */

    if ((pInstance->Params.SampleRate != pParams->SampleRate) ||

        (pInstance->Params.NrChannels != pParams->NrChannels) ||

        (pInstance->Params.CentreFrequency != pParams->CentreFrequency)) {

        LVDBE_SetFilters(pInstance, /* Instance pointer */

                         pParams);  /* New parameters */

media/libeffects/lvm/lib/Bass/src/LVDBE_Init.cpp

+2 −1
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ LVDBE_ReturnStatus_en LVDBE_Init(LVDBE_Handle_t* phInstance, LVDBE_Capabilities_ 
    pInstance->Params.SampleRate = LVDBE_FS_8000;

    pInstance->Params.VolumeControl = LVDBE_VOLUME_OFF;

    pInstance->Params.VolumedB = 0;

    pInstance->Params.NrChannels = FCC_2;



    /*

     * Create pointer to data and coef memory
@@ -91,7 +92,7 @@ LVDBE_ReturnStatus_en LVDBE_Init(LVDBE_Handle_t* phInstance, LVDBE_Capabilities_ 
     * Create biquad instance

     */

    pInstance->pHPFBiquad.reset(

            new android::audio_utils::BiquadFilter<LVM_FLOAT>(LVM_MAX_CHANNELS));

            new android::audio_utils::BiquadFilter<LVM_FLOAT>(pInstance->Params.NrChannels));

    pInstance->pBPFBiquad.reset(new android::audio_utils::BiquadFilter<LVM_FLOAT>(FCC_1));



    /*

media/libeffects/lvm/lib/Bundle/src/LVM_Init.cpp

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include "LVM_Private.h"

#include "LVM_Tables.h"

#include "VectorArithmetic.h"

#include "InstAlloc.h"



/****************************************************************************************/

/*                                                                                      */