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

Commit 95819503 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Fix build warnings"

parents 3f965475 befdd027

services/audioflinger/audio-resampler/AudioResamplerCoefficients.cpp

+2 −2
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ const int32_t* readResamplerCoefficients(bool upSample) { 


    ALOGV("readResamplerCoefficients");

    if (upSample) {

        return up_sampler_filter_coefficients;

        return (const int32_t *) up_sampler_filter_coefficients;

    } else {

        return dn_sampler_filter_coefficients;

        return (const int32_t *) dn_sampler_filter_coefficients;

    }



}

services/audioflinger/audio-resampler/filter_coefficients.h

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
namespace android {



// cmd-line: fir -l 7 -s 48000 -c 23400 -n 16 -b 9.62

const int32_t up_sampler_filter_coefficients[] __attribute__ ((aligned (32))) = {

const uint32_t up_sampler_filter_coefficients[] __attribute__ ((aligned (32))) = {

        0x7ccccccd, 0x0323eb7f, 0xfd086246, 0x02b2aa5c, 0xfda45e2c, 0x01fa5183, 0xfe694e12, 0x0137e672, 0xff1c87d3, 0x009ce6d8, 0xff9a68b0, 0x003d150d, 0xffde727a, 0x00106595, 0xfff93679, 0x00021fc5,

        0x7cc9b757, 0x022ac835, 0xfd7e3a71, 0x026b7da1, 0xfdd2b905, 0x01db7c90, 0xfe7db77c, 0x012aa7bf, 0xff24dc32, 0x0097dfc9, 0xff9d4ae9, 0x003b8742, 0xffdf38e5, 0x00100be5, 0xfff959f5, 0x0002144b,

        0x7cc0773c, 0x01354bc1, 0xfdf365e8, 0x0224726d, 0xfe011d2e, 0x01bc908b, 0xfe923a2b, 0x011d528d, 0xff2d426f, 0x0092cbc0, 0xffa035cc, 0x0039f42e, 0xffe00236, 0x000fb0d2, 0xfff97dfa, 0x000208b0,
@@ -151,7 +151,7 @@ const int32_t up_sampler_filter_coefficients[] __attribute__ ((aligned (32))) = 
};



// cmd-line: fir -l 7 -s 44100 -c 19876 -n 16 -b 9.62

const int32_t dn_sampler_filter_coefficients[] __attribute__ ((aligned (32))) = {

const uint32_t dn_sampler_filter_coefficients[] __attribute__ ((aligned (32))) = {

        0x736144b5, 0x0c333a22, 0xf4fca390, 0x09424904, 0xf8c92a41, 0x052ac04c, 0xfca4fc64, 0x01ed8cc7, 0xff119cc0, 0x0053ba6e, 0xfff9a80d, 0xffeaeaab, 0x001690d9, 0xfff11dcd, 0x000715d9, 0xfffdb4b9,

        0x735ed3aa, 0x0b433de8, 0xf560f0f3, 0x091282c4, 0xf8dd5ccf, 0x0525cb66, 0xfca23e3d, 0x01f33960, 0xff0bc9c2, 0x00586127, 0xfff68603, 0xffecbad5, 0x0015ab8b, 0xfff17c10, 0x0006f71a, 0xfffdbc2f,

        0x735780bb, 0x0a55a98f, 0xf5c5b2a1, 0x08e1ea27, 0xf8f25767, 0x0520366d, 0xfc9ff262, 0x01f89c98, 0xff0620a4, 0x005cf349, 0xfff36c0d, 0xffee8913, 0x0014c5dc, 0xfff1db1a, 0x0006d7d7, 0xfffdc3db,