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

Commit d1aeff55 authored by Lajos Molnar's avatar Lajos Molnar Committed by Gerrit Code Review
Browse files

Merge "Fix build with clang in C++11 mode"

parents 66172f5c 2d0ac425

media/libmediaplayerservice/TestPlayerStub.cpp

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ bool isTestBuild() 
{

    char prop[PROPERTY_VALUE_MAX] = { '\0', };



    property_get(kBuildTypePropName, prop, '\0');

    property_get(kBuildTypePropName, prop, "\0");

    return strcmp(prop, kEngBuild) == 0 || strcmp(prop, kTestBuild) == 0;

}

media/libstagefright/MPEG4Extractor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
        return ERROR_IO;

    }

    uint64_t chunk_size = ntohl(hdr[0]);

    uint32_t chunk_type = ntohl(hdr[1]);

    int32_t chunk_type = ntohl(hdr[1]);

    off64_t data_offset = *offset + 8;



    if (chunk_size == 1) {
@@ -2227,7 +2227,7 @@ status_t MPEG4Extractor::parseITunesMetaData(off64_t offset, size_t size) { 
    char chunk[5];

    MakeFourCCString(mPath[4], chunk);

    ALOGV("meta: %s @ %lld", chunk, offset);

    switch (mPath[4]) {

    switch ((int32_t)mPath[4]) {

        case FOURCC(0xa9, 'a', 'l', 'b'):

        {

            metadataKey = kKeyAlbum;

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

+5 −5
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ extern "C" 
     Returns:

        L_sum = 32-bit sum of L_var1 and L_var2 (Word32)

    */

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

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

    {

        Word32 L_sum;
@@ -154,8 +154,8 @@ extern "C" 
     Returns:

        L_diff = 32-bit difference of L_var1 and L_var2 (Word32)

    */

    static inline Word32 L_sub(register Word32 L_var1, register Word32 L_var2,

                               register Flag *pOverflow)

    static inline Word32 L_sub(Word32 L_var1, Word32 L_var2,

                               Flag *pOverflow)

    {

        Word32 L_diff;
@@ -246,7 +246,7 @@ extern "C" 
    */

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

    {

        register Word32 L_product;

        Word32 L_product;



        L_product = (Word32) var1 * var2;
@@ -452,7 +452,7 @@ extern "C" 
    */

    static inline Word16 mult(Word16 var1, Word16 var2, Flag *pOverflow)

    {

        register Word32 product;

        Word32 product;



        product = ((Word32) var1 * var2) >> 15;

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

+4 −4
Original line number Diff line number Diff line
@@ -564,10 +564,10 @@ void Az_lsp( 
    Flag   *pOverflow   /* (i/o): overflow flag                              */

)

{

    register Word16 i;

    register Word16 j;

    register Word16 nf;

    register Word16 ip;

    Word16 i;

    Word16 j;

    Word16 nf;

    Word16 ip;

    Word16 xlow;

    Word16 ylow;

    Word16 xhigh;

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

+2 −2
Original line number Diff line number Diff line
@@ -207,13 +207,13 @@ Word16 div_s (Word16 var1, Word16 var2) 
/*----------------------------------------------------------------------------

; FUNCTION CODE

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

Word16 div_s(register Word16 var1, register Word16 var2)

Word16 div_s(Word16 var1, Word16 var2)

{

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

    ; Define all local variables

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

    Word16 var_out = 0;

    register Word16 iteration;

    Word16 iteration;

    Word32 L_num;

    Word32 L_denom;

    Word32 L_denom_by_2;