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

Commit 3c23af85 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Stagefright: Remove unused variables and files 

For build-system CFLAGS clean-up.

Bug: 18632512

(cherry picked from commit 765b4172)

Change-Id: I765dc394f39f60801843851760fdf9838958d7a4
parent a8d8bce2

media/libstagefright/codecs/amrnb/common/Android.mk

+0 −2
Original line number Original line Diff line number Diff line
@@ -7,7 +7,6 @@ LOCAL_SRC_FILES := \ 
 	src/bitno_tab.cpp \

 	src/bitno_tab.cpp \

 	src/bitreorder_tab.cpp \

 	src/bitreorder_tab.cpp \

 	src/bits2prm.cpp \

 	src/bits2prm.cpp \

 	src/bytesused.cpp \

 	src/c2_9pf_tab.cpp \

 	src/c2_9pf_tab.cpp \

 	src/copy.cpp \

 	src/copy.cpp \

 	src/div_32.cpp \

 	src/div_32.cpp \
@@ -38,7 +37,6 @@ LOCAL_SRC_FILES := \ 
 	src/mult_r.cpp \

 	src/mult_r.cpp \

 	src/norm_l.cpp \

 	src/norm_l.cpp \

 	src/norm_s.cpp \

 	src/norm_s.cpp \

 	src/overflow_tbl.cpp \

 	src/ph_disp_tab.cpp \

 	src/ph_disp_tab.cpp \

 	src/pow2.cpp \

 	src/pow2.cpp \

 	src/pow2_tbl.cpp \

 	src/pow2_tbl.cpp \

media/libstagefright/codecs/amrnb/common/include/bytesused.h

deleted100644 → 0
+0 −109
Original line number Original line 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: .audio/gsm-amr/c/include/BytesUsed.h



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

 REVISION HISTORY



 Description: Added #ifdef __cplusplus after Include section.



 Who:                       Date:

 Description:



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

 INCLUDE DESCRIPTION



 This file declares a table BytesUsed.



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

*/



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

; CONTINUE ONLY IF NOT ALREADY DEFINED

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

#ifndef BYTESUSED_H

#define BYTESUSED_H



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

; INCLUDES

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



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

#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

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

    extern const short BytesUsed[];



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

    ; SIMPLE TYPEDEF'S

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



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

    ; ENUMERATED TYPEDEF'S

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



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

    ; STRUCTURES TYPEDEF'S

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





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

    ; GLOBAL FUNCTION DEFINITIONS

    ; Function Prototype declaration

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





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

    ; END

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

#ifdef __cplusplus

}

#endif



#endif

media/libstagefright/codecs/amrnb/common/src/bytesused.cpp

deleted100644 → 0
+0 −208
Original line number Original line 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: ./audio/gsm-amr/c/src/BytesUsed.c



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

 REVISION HISTORY



 Description: Corrected entries for all SID frames and updated function

              description. Updated copyright year.



 Description: Added #ifdef __cplusplus and removed "extern" from table

              definition. Removed corresponding header file from Include

              section.



 Description: Put "extern" back.



 Who:                       Date:

 Description:



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

 INPUT AND OUTPUT DEFINITIONS



 Inputs:

    None



 Local Stores/Buffers/Pointers Needed:

    None



 Global Stores/Buffers/Pointers Needed:

    None



 Outputs:

    None



 Pointers and Buffers Modified:

    None



 Local Stores Modified:

    None



 Global Stores Modified:

    None



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

 FUNCTION DESCRIPTION



 This function creates a table called BytesUsed that holds the value that

 describes the number of bytes required to hold one frame worth of data in

 the WMF (non-IF2) frame format. Each table entry is the sum of the frame

 type byte and the number of bytes used up by the core speech data for each

 3GPP frame type.



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

 REQUIREMENTS



 None



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

 REFERENCES



 [1] "AMR Speech Codec Frame Structure", 3GPP TS 26.101 version 4.1.0

     Release 4, June 2001, page 13.



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

 PSEUDO-CODE





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

 RESOURCES USED

   When the code is written for a specific target processor the

     the resources used should be documented below.



 STACK USAGE: [stack count for this module] + [variable to represent

          stack usage for each subroutine called]



     where: [stack usage variable] = stack usage for [subroutine

         name] (see [filename].ext)



 DATA MEMORY USED: x words



 PROGRAM MEMORY USED: x words



 CLOCK CYCLES: [cycle count equation for this module] + [variable

           used to represent cycle count for each subroutine

           called]



     where: [cycle count variable] = cycle count for [subroutine

        name] (see [filename].ext)



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

*/





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

; INCLUDES

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

#include "typedef.h"



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

#ifdef __cplusplus

extern "C"

{

#endif



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

    ; MACROS

    ; Define module specific macros here

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





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

    ; DEFINES

    ; Include all pre-processor statements here. Include conditional

    ; compile variables also.

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



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

    ; LOCAL FUNCTION DEFINITIONS

    ; Function Prototype declaration

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





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

    ; LOCAL STORE/BUFFER/POINTER DEFINITIONS

    ; Variable declaration - defined here and used outside this module

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

    const short BytesUsed[16] =

    {

        13, /* 4.75 */

        14, /* 5.15 */

        16, /* 5.90 */

        18, /* 6.70 */

        20, /* 7.40 */

        21, /* 7.95 */

        27, /* 10.2 */

        32, /* 12.2 */

        6, /* GsmAmr comfort noise */

        7, /* Gsm-Efr comfort noise */

        6, /* IS-641 comfort noise */

        6, /* Pdc-Efr comfort noise */

        0, /* future use */

        0, /* future use */

        0, /* future use */

        1 /* No transmission */

    };

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

    ; EXTERNAL FUNCTION REFERENCES

    ; Declare functions defined elsewhere and referenced in this module

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





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

    ; EXTERNAL GLOBAL STORE/BUFFER/POINTER REFERENCES

    ; Declare variables used in this module but defined elsewhere

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





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

#ifdef __cplusplus

}

#endif



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

; FUNCTION CODE

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



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

; Define all local variables

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





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

; Function body here

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





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

; Return nothing or data or data pointer

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

media/libstagefright/codecs/amrnb/common/src/overflow_tbl.cpp

deleted100644 → 0
+0 −174
Original line number Original line 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/src/overflow_tbl.c



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

 REVISION HISTORY



 Description: Added #ifdef __cplusplus and removed "extern" from table

              definition.



 Description: Put "extern" back.



 Who:                       Date:

 Description:



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

 MODULE DESCRIPTION



 This file contains the declaration for overflow_tbl[] used by the l_shl()

 and l_shr() functions.



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

*/



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

; INCLUDES

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

#include "typedef.h"



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

#ifdef __cplusplus

extern "C"

{

#endif



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

    ; MACROS

    ; [Define module specific macros here]

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



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

    ; DEFINES

    ; [Include all pre-processor statements here. Include conditional

    ; compile variables also.]

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



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

    ; LOCAL FUNCTION DEFINITIONS

    ; [List function prototypes here]

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



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

    ; LOCAL VARIABLE DEFINITIONS

    ; [Variable declaration - defined here and used outside this module]

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

    const Word32 overflow_tbl [32]   = {0x7fffffffL, 0x3fffffffL,

        0x1fffffffL, 0x0fffffffL,

        0x07ffffffL, 0x03ffffffL,

        0x01ffffffL, 0x00ffffffL,

        0x007fffffL, 0x003fffffL,

        0x001fffffL, 0x000fffffL,

        0x0007ffffL, 0x0003ffffL,

        0x0001ffffL, 0x0000ffffL,

        0x00007fffL, 0x00003fffL,

        0x00001fffL, 0x00000fffL,

        0x000007ffL, 0x000003ffL,

        0x000001ffL, 0x000000ffL,

        0x0000007fL, 0x0000003fL,

        0x0000001fL, 0x0000000fL,

        0x00000007L, 0x00000003L,

        0x00000001L, 0x00000000L

    };



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

#ifdef __cplusplus

}

#endif



/*

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

 FUNCTION NAME:

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

 INPUT AND OUTPUT DEFINITIONS



 Inputs:

    None



 Outputs:

    None



 Returns:

    None



 Global Variables Used:

    None



 Local Variables Needed:

    None



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

 FUNCTION DESCRIPTION



 None



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

 REQUIREMENTS



 None



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

 REFERENCES



 [1] l_shl() function in basic_op2.c,  UMTS GSM AMR speech codec, R99 -

 Version 3.2.0, March 2, 2001



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

 PSEUDO-CODE





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

 RESOURCES USED [optional]



 When the code is written for a specific target processor the

 the resources used should be documented below.



 HEAP MEMORY USED: x bytes



 STACK MEMORY USED: x bytes



 CLOCK CYCLES: (cycle count equation for this function) + (variable

                used to represent cycle count for each subroutine

                called)

     where: (cycle count variable) = cycle count for [subroutine

                                     name]



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

 CAUTION [optional]

 [State any special notes, constraints or cautions for users of this function]



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

*/



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

; FUNCTION CODE

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

media/libstagefright/codecs/avc/enc/src/findhalfpel.cpp

+0 −13
Original line number Original line Diff line number Diff line
@@ -23,19 +23,6 @@ 




#define PREF_16_VEC 129     /* 1MV bias versus 4MVs*/

#define PREF_16_VEC 129     /* 1MV bias versus 4MVs*/





const static int distance_tab[9][9] =   /* [hp_guess][k] */

{

    {0, 1, 1, 1, 1, 1, 1, 1, 1},

    {1, 0, 1, 2, 3, 4, 3, 2, 1},

    {1, 0, 0, 0, 1, 2, 3, 2, 1},

    {1, 2, 1, 0, 1, 2, 3, 4, 3},

    {1, 2, 1, 0, 0, 0, 1, 2, 3},

    {1, 4, 3, 2, 1, 0, 1, 2, 3},

    {1, 2, 3, 2, 1, 0, 0, 0, 1},

    {1, 2, 3, 4, 3, 2, 1, 0, 1},

    {1, 0, 1, 2, 3, 2, 1, 0, 0}

};



#define CLIP_RESULT(x)      if((uint)x > 0xFF){ \

#define CLIP_RESULT(x)      if((uint)x > 0xFF){ \

                 x = 0xFF & (~(x>>31));}

                 x = 0xFF & (~(x>>31));}