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

Commit f4d9a21a authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am df5c3b50: am 739bf285: Merge "LVM release 1.04." into gingerbread 

Merge commit 'df5c3b50'

* commit 'df5c3b50':
  LVM release 1.04.
parents 9fb0bb82 df5c3b50

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

+12 −10
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
/****************************************************************************************



     $Author: nxp007753 $

     $Revision: 1223 $

     $Date: 2010-07-15 14:27:01 +0200 (Thu, 15 Jul 2010) $

     $Revision: 1315 $

     $Date: 2010-07-23 11:52:08 +0200 (Fri, 23 Jul 2010) $



*****************************************************************************************/
@@ -125,7 +125,8 @@ void LVDBE_SetFilters(LVDBE_Instance_t *pInstance, 
     * Setup the high pass filter

     */

    LoadConst_16(0,                                                 /* Clear the history, value 0 */

                 (LVM_INT16 *)&pInstance->pData->HPFTaps,                   /* Destination */

                 (void *)&pInstance->pData->HPFTaps,                /* Destination Cast to void: \

                                                                     no dereferencing in function*/

                 sizeof(pInstance->pData->HPFTaps)/sizeof(LVM_INT16));   /* Number of words */

    BQ_2I_D32F32Cll_TRC_WRA_01_Init(&pInstance->pCoef->HPFInstance,      /* Initialise the filter */

                                    &pInstance->pData->HPFTaps,
@@ -136,7 +137,8 @@ void LVDBE_SetFilters(LVDBE_Instance_t *pInstance, 
     * Setup the band pass filter

     */

    LoadConst_16(0,                                                 /* Clear the history, value 0 */

                 (LVM_INT16 *)&pInstance->pData->BPFTaps,                   /* Destination */

                 (void *)&pInstance->pData->BPFTaps,                /* Destination Cast to void:\

                                                                     no dereferencing in function*/

                 sizeof(pInstance->pData->BPFTaps)/sizeof(LVM_INT16));   /* Number of words */

    BP_1I_D32F32Cll_TRC_WRA_02_Init(&pInstance->pCoef->BPFInstance,      /* Initialise the filter */

                                    &pInstance->pData->BPFTaps,

media/libeffects/lvm/lib/Bundle/src/LVM_Buffers.c

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
/****************************************************************************************



     $Author: nxp007753 $

     $Revision: 1082 $

     $Date: 2010-07-05 12:44:39 +0200 (Mon, 05 Jul 2010) $

     $Revision: 1316 $

     $Date: 2010-07-23 11:53:24 +0200 (Fri, 23 Jul 2010) $



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

media/libeffects/lvm/lib/Bundle/src/LVM_Control.c

+5 −4
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
/****************************************************************************************



     $Author: nxp007753 $

     $Revision: 1255 $

     $Date: 2010-07-16 17:07:29 +0200 (Fri, 16 Jul 2010) $

     $Revision: 1316 $

     $Date: 2010-07-23 11:53:24 +0200 (Fri, 23 Jul 2010) $



*****************************************************************************************/
@@ -315,7 +315,8 @@ void LVM_SetTrebleBoost(LVM_Instance_t *pInstance, 
             * Clear the taps

             */

            LoadConst_16((LVM_INT16)0,                                     /* Value */

                         (LVM_INT16 *)&pInstance->pTE_Taps->TrebleBoost_Taps,                            /* Destination */

                         (void *)&pInstance->pTE_Taps->TrebleBoost_Taps,  /* Destination.\

                                                     Cast to void: no dereferencing in function */

                         (LVM_UINT16)(sizeof(pInstance->pTE_Taps->TrebleBoost_Taps)/sizeof(LVM_INT16))); /* Number of words */

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
/************************************************************************************



     $Author: nxp007753 $

     $Revision: 1255 $

     $Date: 2010-07-16 17:07:29 +0200 (Fri, 16 Jul 2010) $

     $Revision: 1316 $

     $Date: 2010-07-23 11:53:24 +0200 (Fri, 23 Jul 2010) $



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

media/libeffects/lvm/lib/Common/src/MixSoft_2St_D32C31_SAT.c

+7 −5
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ 
/************************************************************************/

/*                                                                      */

/*     Project::                                                        */

/*     $Author: beq07716 $*/

/*     $Revision: 1000 $*/

/*     $Date: 2010-06-28 13:08:20 +0200 (Mon, 28 Jun 2010) $*/

/*     $Author: nxp007753 $*/

/*     $Revision: 1316 $*/

/*     $Date: 2010-07-23 11:53:24 +0200 (Fri, 23 Jul 2010) $*/

/*                                                                      */

/************************************************************************/
@@ -51,7 +51,8 @@ void MixSoft_2St_D32C31_SAT( Mix_2St_Cll_t *pInstance, 
    if ((pInstance->Current1 != pInstance->Target1) || (pInstance->Current2 != pInstance->Target2))

    {

        MixSoft_1St_D32C31_WRA( (Mix_1St_Cll_t*) pInstance, src1, dst, n);

        MixInSoft_D32C31_SAT( (Mix_1St_Cll_t*) &pInstance->Alpha2, src2, dst, n);

        MixInSoft_D32C31_SAT( (void *) &pInstance->Alpha2,     /* Cast to void: no dereferencing in function*/

            src2, dst, n);

    }



    /******************************************************************************
@@ -61,7 +62,8 @@ void MixSoft_2St_D32C31_SAT( Mix_2St_Cll_t *pInstance, 
    else

    {

        if (pInstance->Current1 == 0)

            MixSoft_1St_D32C31_WRA( (Mix_1St_Cll_t*) &pInstance->Alpha2, src2, dst, n);

            MixSoft_1St_D32C31_WRA( (void *) &pInstance->Alpha2, /* Cast to void: no dereferencing in function*/

            src2, dst, n);

        else if (pInstance->Current2 == 0)

            MixSoft_1St_D32C31_WRA( (Mix_1St_Cll_t*) pInstance, src1, dst, n);

        else