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

Commit fa4a379f authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [7995446, 7995447, 7996042, 7996138, 7995448, 7995449,... 

Merge cherrypicks of [7995446, 7995447, 7996042, 7996138, 7995448, 7995449, 7995789, 7995790, 7995450, 7996029, 7996030, 7996139, 7996140, 7996141, 7996142, 7996143, 7996144, 7995544, 7995545, 7995546, 7995547, 7995548, 7995549, 7995550, 7996145, 7996146, 7996032, 7996147, 7996148, 7996149, 7996150, 7994747, 7994748, 7995451, 7994749, 7994750, 7995966, 7995967, 7994751, 7996151, 7996152, 7996153] into pi-qpr3-b-release

Change-Id: I2f7f50315134ba3948643394346dfc4faf4332aa
parents f29ab2db 90292b7e

media/libstagefright/codecs/amrwbenc/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ cc_library_static { 


    shared_libs: [

        "libstagefright_enc_common",

        "liblog",

    ],



    cflags: ["-Werror"],

media/libstagefright/codecs/amrwbenc/SampleCode/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ cc_test { 


    shared_libs: [

        "libdl",

        "liblog",

    ],



    static_libs: [

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

+11 −2
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ 


#include "q_pulse.h"



#undef LOG_TAG

#define LOG_TAG "amrwbenc"

#include "log/log.h"



static Word16 tipos[36] = {

    0, 1, 2, 3,                            /* starting point &ipos[0], 1st iter */

    1, 2, 3, 0,                            /* starting point &ipos[4], 2nd iter */
@@ -745,11 +749,16 @@ void ACELP_4t64_fx( 


        i = (Word16)((vo_L_mult(track, NPMAXPT) >> 1));



        while (ind[i] >= 0)

        while (i < NPMAXPT * NB_TRACK && ind[i] >= 0)

        {

            i += 1;

        }

        if (i < NPMAXPT * NB_TRACK) {

            ind[i] = index;

        } else {

            ALOGE("b/132647222, OOB access in ind array track=%d i=%d", track, i);

            android_errorWriteLog(0x534e4554, "132647222");

        }

    }



    k = 0;

media/libstagefright/httplive/HTTPDownloader.cpp

+6 −0
Original line number Diff line number Diff line
@@ -157,6 +157,12 @@ ssize_t HTTPDownloader::fetchBlock( 
                 buffer->size() + bufferRemaining);



            sp<ABuffer> copy = new ABuffer(buffer->size() + bufferRemaining);

            if (copy->data() == NULL) {

                android_errorWriteLog(0x534e4554, "68399439");

                ALOGE("not enough memory to download: requesting %zu + %zu",

                        buffer->size(), bufferRemaining);

                return NO_MEMORY;

            }

            memcpy(copy->data(), buffer->data(), buffer->size());

            copy->setRange(0, buffer->size());

media/libstagefright/timedtext/TextDescriptions.cpp

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ status_t TextDescriptions::extract3GPPGlobalDescriptions( 
        tmpData += 8;

        size_t remaining = size - 8;



        if (size < chunkSize) {

        if (chunkSize <= 8 || size < chunkSize) {

            return OK;

        }

        switch(chunkType) {