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

Commit db2344b6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AMRNB: Remove unused headers" into main am: ee1a88cb 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3214299



Change-Id: Ib762522be49d964b161924de14a6034c84d5fabd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 21877289 ee1a88cb

media/module/codecs/amrnb/common/include/abs_s.h

deleted100644 → 0
+0 −113
Original line number Diff line number Diff line 
/* ------------------------------------------------------------------

 * Copyright (C) 1998-2009 PacketVideo

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either

 * express or implied.

 * See the License for the specific language governing permissions

 * and limitations under the License.

 * -------------------------------------------------------------------

 */

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

Portions of this file are derived from the following 3GPP standard:



    3GPP TS 26.073

    ANSI-C code for the Adaptive Multi-Rate (AMR) speech codec

    Available from http://www.3gpp.org



(C) 2004, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TTA, TTC)

Permission to distribute, modify and use this file under the standard license

terms listed above has been obtained from the copyright holder.

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

/*



 Pathname: ./gsm-amr/c/include/abs_s.h



------------------------------------------------------------------------------

 REVISION HISTORY



 Description: Created separate header file for abs_s function.



 Description: Updated template to make it build for Symbian.



 Description: Moved _cplusplus #ifdef after Include section.



 Who:                       Date:

 Description:



------------------------------------------------------------------------------

 INCLUDE DESCRIPTION



 This file contains all the constant definitions and prototype definitions

 needed by the abs_s function.



------------------------------------------------------------------------------

*/



/*----------------------------------------------------------------------------

; CONTINUE ONLY IF NOT ALREADY DEFINED

----------------------------------------------------------------------------*/

#ifndef ABS_S_H

#define ABS_S_H



/*----------------------------------------------------------------------------

; INCLUDES

----------------------------------------------------------------------------*/

#include    "basicop_malloc.h"



/*--------------------------------------------------------------------------*/

#ifdef __cplusplus

extern "C"

{

#endif



    /*----------------------------------------------------------------------------

    ; MACROS

    ; Define module specific macros here

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; DEFINES

    ; Include all pre-processor statements here.

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; EXTERNAL VARIABLES REFERENCES

    ; Declare variables used in this module but defined elsewhere

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; SIMPLE TYPEDEF'S

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; ENUMERATED TYPEDEF'S

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; STRUCTURES TYPEDEF'S

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; GLOBAL FUNCTION DEFINITIONS

    ; Function Prototype declaration

    ----------------------------------------------------------------------------*/

    Word16 abs_s(Word16 var1);



    /*----------------------------------------------------------------------------

    ; END

    ----------------------------------------------------------------------------*/

#ifdef __cplusplus

}

#endif



#endif  /* ABS_S_H */

media/module/codecs/amrnb/common/include/l_add.h

deleted100644 → 0
+0 −171
Original line number Diff line number Diff line 
/* ------------------------------------------------------------------

 * Copyright (C) 1998-2009 PacketVideo

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either

 * express or implied.

 * See the License for the specific language governing permissions

 * and limitations under the License.

 * -------------------------------------------------------------------

 */

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

Portions of this file are derived from the following 3GPP standard:



    3GPP TS 26.073

    ANSI-C code for the Adaptive Multi-Rate (AMR) speech codec

    Available from http://www.3gpp.org



(C) 2004, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TTA, TTC)

Permission to distribute, modify and use this file under the standard license

terms listed above has been obtained from the copyright holder.

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

/*



 Filename: /audio/gsm_amr/c/include/l_add.h



------------------------------------------------------------------------------

 REVISION HISTORY



 Description: Created separate header file for L_add function.



 Description: Changed function prototype declaration. A pointer to the overflow

              flag is being passed in as a parameter instead of using global

              data.



 Description: Updated template. Changed paramter name from overflow to

              pOverflow



 Description: Moved _cplusplus #ifdef after Include section.



 Description: Providing support for ARM and Linux-ARM assembly instructions.



 Who:                       Date:

 Description:



------------------------------------------------------------------------------

 INCLUDE DESCRIPTION



 This file contains all the constant definitions and prototype definitions

 needed by the L_add function.



------------------------------------------------------------------------------

*/



/*----------------------------------------------------------------------------

; CONTINUE ONLY IF NOT ALREADY DEFINED

----------------------------------------------------------------------------*/

#ifndef L_ADD_H

#define L_ADD_H



/*----------------------------------------------------------------------------

; INCLUDES

----------------------------------------------------------------------------*/

#include    "basicop_malloc.h"



/*--------------------------------------------------------------------------*/

#ifdef __cplusplus

extern "C"

{

#endif



    /*----------------------------------------------------------------------------

    ; MACROS

    ; Define module specific macros here

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; DEFINES

    ; Include all pre-processor statements here.

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; EXTERNAL VARIABLES REFERENCES

    ; Declare variables used in this module but defined elsewhere

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; SIMPLE TYPEDEF'S

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; ENUMERATED TYPEDEF'S

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; STRUCTURES TYPEDEF'S

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; GLOBAL FUNCTION DEFINITIONS

    ; Function Prototype declaration

    ----------------------------------------------------------------------------*/

#if defined(PV_ARM_V5) /* Instructions for ARM Assembly on ADS*/



    __inline Word32 L_add(register Word32 L_var1, register Word32 L_var2, Flag *pOverflow)

    {

        Word32 result;



        OSCL_UNUSED_ARG(pOverflow);

        __asm

        {

            QADD result, L_var1, L_var2

        }

        return(result);

    }



#elif defined(PV_ARM_GCC_V5) /* Instructions for ARM-linux cross-compiler*/



    __inline Word32 L_add(register Word32 L_var1, register Word32 L_var2, Flag *pOverflow)

    {

        register Word32 ra = L_var1;

        register Word32 rb = L_var2;

        Word32 result;



        OSCL_UNUSED_ARG(pOverflow);



        asm volatile("qadd %0, %1, %2"

             : "=r"(result)

                             : "r"(ra), "r"(rb)

                            );

        return (result);



    }



#else /* C EQUIVALENT */





    static inline Word32 L_add(register Word32 L_var1, register Word32 L_var2, Flag *pOverflow)

    {

        Word32 L_sum;



        L_sum = L_var1 + L_var2;



        if ((L_var1 ^ L_var2) >= 0)

        {

            if ((L_sum ^ L_var1) < 0)

            {

                L_sum = (L_var1 < 0) ? MIN_32 : MAX_32;

                *pOverflow = 1;

            }

        }



        return (L_sum);

    }



#endif



    /*----------------------------------------------------------------------------

    ; END

    ----------------------------------------------------------------------------*/

#ifdef __cplusplus

}

#endif



#endif /* _L_ADD_H_ */

media/module/codecs/amrnb/common/include/l_add_c.h

deleted100644 → 0
+0 −115
Original line number Diff line number Diff line 
/* ------------------------------------------------------------------

 * Copyright (C) 1998-2009 PacketVideo

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either

 * express or implied.

 * See the License for the specific language governing permissions

 * and limitations under the License.

 * -------------------------------------------------------------------

 */

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

Portions of this file are derived from the following 3GPP standard:



    3GPP TS 26.073

    ANSI-C code for the Adaptive Multi-Rate (AMR) speech codec

    Available from http://www.3gpp.org



(C) 2004, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TTA, TTC)

Permission to distribute, modify and use this file under the standard license

terms listed above has been obtained from the copyright holder.

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

/*



 Filename: /audio/gsm_amr/c/include/l_add_c.h



------------------------------------------------------------------------------

 REVISION HISTORY



 Description: Created separate header file for L_add_c function.



 Description: Updated function prototype declaration to reflect new interface.

              A pointer to overflow flag and carry flag is passed into the

              function. Updated template.



 Description: Moved _cplusplus #ifdef after Include section.



 Who:                       Date:

 Description:



------------------------------------------------------------------------------

 INCLUDE DESCRIPTION



 This file contains all the constant definitions and prototype definitions

 needed by the L_add_c function.



------------------------------------------------------------------------------

*/



/*----------------------------------------------------------------------------

; CONTINUE ONLY IF NOT ALREADY DEFINED

----------------------------------------------------------------------------*/

#ifndef L_ADD_C_H

#define L_ADD_C_H



/*----------------------------------------------------------------------------

; INCLUDES

----------------------------------------------------------------------------*/

#include    "basicop_malloc.h"



/*--------------------------------------------------------------------------*/

#ifdef __cplusplus

extern "C"

{

#endif



    /*----------------------------------------------------------------------------

    ; MACROS

    ; Define module specific macros here

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; DEFINES

    ; Include all pre-processor statements here.

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; EXTERNAL VARIABLES REFERENCES

    ; Declare variables used in this module but defined elsewhere

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; SIMPLE TYPEDEF'S

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; ENUMERATED TYPEDEF'S

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; STRUCTURES TYPEDEF'S

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; GLOBAL FUNCTION DEFINITIONS

    ; Function Prototype declaration

    ----------------------------------------------------------------------------*/

    Word32 L_add_c(Word32 L_var1, Word32 L_var2, Flag *pOverflow, Flag *pCarry);



    /*----------------------------------------------------------------------------

    ; END

    ----------------------------------------------------------------------------*/

#ifdef __cplusplus

}

#endif



#endif /* _L_ADD_C_H_ */

media/module/codecs/amrnb/common/include/l_mac.h

deleted100644 → 0
+0 −183
Original line number Diff line number Diff line 
/* ------------------------------------------------------------------

 * Copyright (C) 1998-2009 PacketVideo

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either

 * express or implied.

 * See the License for the specific language governing permissions

 * and limitations under the License.

 * -------------------------------------------------------------------

 */

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

Portions of this file are derived from the following 3GPP standard:



    3GPP TS 26.073

    ANSI-C code for the Adaptive Multi-Rate (AMR) speech codec

    Available from http://www.3gpp.org



(C) 2004, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TTA, TTC)

Permission to distribute, modify and use this file under the standard license

terms listed above has been obtained from the copyright holder.

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

/*

 Filename: /audio/gsm_amr/c/include/l_mac.h



------------------------------------------------------------------------------

 REVISION HISTORY



 Description: Created separate header file for L_mac function.



 Description: Updated function prototype declaration to reflect new interface.

              A pointer to overflow flag is passed into the function. Updated

              template.



 Description: Moved _cplusplus #ifdef after Include section.



 Description: 1. Updated the function to include ARM and Linux-ARM assembly

                 instructions.

              2. Added OSCL_UNUSED_ARG(pOverflow) to remove compiler warnings.



 Description:



------------------------------------------------------------------------------

 INCLUDE DESCRIPTION



 This file contains all the constant definitions and prototype definitions

 needed by the L_mac function.



------------------------------------------------------------------------------

*/



/*----------------------------------------------------------------------------

; CONTINUE ONLY IF NOT ALREADY DEFINED

----------------------------------------------------------------------------*/

#ifndef L_MAC_H

#define L_MAC_H



/*----------------------------------------------------------------------------

; INCLUDES

----------------------------------------------------------------------------*/

#include    "basicop_malloc.h"



/*--------------------------------------------------------------------------*/

#ifdef __cplusplus

extern "C"

{

#endif



    /*----------------------------------------------------------------------------

    ; MACROS

    ; Define module specific macros here

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; DEFINES

    ; Include all pre-processor statements here.

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; EXTERNAL VARIABLES REFERENCES

    ; Declare variables used in this module but defined elsewhere

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; SIMPLE TYPEDEF'S

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; ENUMERATED TYPEDEF'S

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; STRUCTURES TYPEDEF'S

    ----------------------------------------------------------------------------*/



    /*----------------------------------------------------------------------------

    ; GLOBAL FUNCTION DEFINITIONS

    ; Function Prototype declaration

    ----------------------------------------------------------------------------*/

#if defined(PV_ARM_V5) /* Instructions for ARM Assembly on ADS*/



    __inline Word32 L_mac(Word32 L_var3, Word16 var1, Word16 var2, Flag *pOverflow)

    {

        Word32 result;

        Word32 L_sum;



        OSCL_UNUSED_ARG(pOverflow);



        __asm {SMULBB result, var1, var2}

        __asm {QDADD L_sum, L_var3, result}

        return (L_sum);

    }



#elif defined(PV_ARM_GCC_V5) /* Instructions for ARM-linux cross-compiler*/



    static inline Word32 L_mac(Word32 L_var3, Word16 var1, Word16 var2, Flag *pOverflow)

    {

        register Word32 ra = L_var3;

        register Word32 rb = var1;

        register Word32 rc = var2;

        Word32 result;



        OSCL_UNUSED_ARG(pOverflow);



        asm volatile("smulbb %0, %1, %2"

             : "=r"(result)

                             : "r"(rb), "r"(rc)

                            );



        asm volatile("qdadd %0, %1, %2"

             : "=r"(rc)

                             : "r"(ra), "r"(result)

                            );



        return (rc);

    }



#else /* C_EQUIVALENT */



    __inline Word32 L_mac(Word32 L_var3, Word16 var1, Word16 var2, Flag *pOverflow)

    {

        Word32 result;

        Word32 L_sum;

        result = (Word32) var1 * var2;

        if (result != (Word32) 0x40000000L)

        {

            L_sum = (result << 1) + L_var3;



            /* Check if L_sum and L_var_3 share the same sign */

            if ((L_var3 ^ result) > 0)

            {

                if ((L_sum ^ L_var3) < 0)

                {

                    L_sum = (L_var3 < 0) ? MIN_32 : MAX_32;

                    *pOverflow = 1;

                }

            }

        }

        else

        {

            *pOverflow = 1;

            L_sum = MAX_32;

        }

        return (L_sum);

    }



#endif

    /*----------------------------------------------------------------------------

    ; END

    ----------------------------------------------------------------------------*/

#ifdef __cplusplus

}

#endif



#endif /* _L_MAC_H_ */

media/module/codecs/amrnb/common/include/l_msu.h

deleted100644 → 0
+0 −171

File deleted.

Preview size limit exceeded, changes collapsed.