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

Commit bf13fc87 authored by Kris Alder's avatar Kris Alder Committed by Automerger Merge Worker
Browse files

Merge changes I3929bfb6,I4ad6fa07 am: 632056e5 

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

Change-Id: I6b370842a284f8a72f475a6ae761bee77c2f933f
parents c54030e2 632056e5

media/libstagefright/codecs/amrnb/enc/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -81,6 +81,13 @@ cc_library_static { 
    //},



    shared_libs: ["libstagefright_amrnb_common"],



    host_supported: true,

    target: {

        darwin: {

            enabled: false,

        },

    },

}



//###############################################################################

media/libstagefright/codecs/amrwbenc/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -138,6 +138,12 @@ cc_library_static { 
        cfi: true,

    },



    host_supported: true,

    target: {

        darwin: {

            enabled: false,

        },

    },

}



//###############################################################################

media/libstagefright/codecs/amrwbenc/src/preemph.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include "typedef.h"

#include "basic_op.h"

#include <stdint.h>



void Preemph(

        Word16 x[],                           /* (i/o)   : input signal overwritten by the output */

media/libstagefright/codecs/amrwbenc/src/q_pulse.c

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "q_pulse.h"



#define NB_POS 16                          /* pos in track, mask for sign bit */

#define UNUSED_VAR __attribute__((unused))



Word32 quant_1p_N1(                        /* (o) return N+1 bits             */

        Word16 pos,                        /* (i) position of the pulse       */
@@ -188,7 +189,7 @@ Word32 quant_4p_4N( /* (o) return 4*N bits */ 
        Word16 pos[],                         /* (i) position of the pulse 1..4  */

        Word16 N)                             /* (i) number of bits for position */

{

    Word16 nb_pos, mask __unused, n_1, tmp;

    Word16 nb_pos, mask UNUSED_VAR, n_1, tmp;

    Word16 posA[4], posB[4];

    Word32 i, j, k, index;

media/libstagefright/codecs/common/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -14,4 +14,11 @@ cc_library { 
    export_include_dirs: ["include"],



    cflags: ["-Werror"],



    host_supported: true,

    target: {

        darwin: {

            enabled: false,

        },

    },

}