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

Commit 782be1ec authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 1c1b5e51: am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong" 

* commit '1c1b5e51':
  m4v_h263_enc: Use uint32_t for ULong
parents 32f212ea 1c1b5e51

media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ void SoftMPEG4Encoder::onQueueFilled(OMX_U32 /* portIndex */) { 
            vin.uChan = vin.yChan + vin.height * vin.pitch;

            vin.vChan = vin.uChan + ((vin.height * vin.pitch) >> 2);



            unsigned long modTimeMs = 0;

            ULong modTimeMs = 0;

            int32_t nLayer = 0;

            MP4HintTrack hintTrack;

            if (!PVEncodeVideoFrame(mHandle, &vin, &vout,

media/libstagefright/codecs/m4v_h263/enc/include/mp4enc_api.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ typedef int Int; 
typedef unsigned short UShort;

typedef short Short;

typedef unsigned int Bool;

typedef unsigned long ULong;

typedef uint32_t ULong;



#define PV_CODEC_INIT  0

#define PV_CODEC_STOP  1

media/libstagefright/codecs/m4v_h263/enc/src/motion_comp.cpp

+4 −4
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ Int GetPredAdvBy0x0( 
    /* initialize offset to adjust pixel counter */

    /*    the next row; full-pel resolution      */



    tmp = (ULong)prev & 0x3;

    tmp = (uintptr_t)prev & 0x3;



    if (tmp == 0)  /* word-aligned */

    {
@@ -466,7 +466,7 @@ Int GetPredAdvBy0x1( 
    /* Branch based on pixel location (half-pel or full-pel) for x and y */

    rec -= 12; /* preset */



    tmp = (ULong)prev & 3;

    tmp = (uintptr_t)prev & 3;

    mask = 254;

    mask |= (mask << 8);

    mask |= (mask << 16); /* 0xFEFEFEFE */
@@ -791,7 +791,7 @@ Int GetPredAdvBy1x0( 
    /* Branch based on pixel location (half-pel or full-pel) for x and y */

    rec -= 12; /* preset */



    tmp = (ULong)prev & 3;

    tmp = (uintptr_t)prev & 3;

    mask = 254;

    mask |= (mask << 8);

    mask |= (mask << 16); /* 0xFEFEFEFE */
@@ -1140,7 +1140,7 @@ Int GetPredAdvBy1x1( 
    mask |= (mask << 8);

    mask |= (mask << 16); /* 0x3f3f3f3f */



    tmp = (ULong)prev & 3;

    tmp = (uintptr_t)prev & 3;



    rec -= 4; /* preset */

media/libstagefright/codecs/m4v_h263/enc/src/mp4def.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ typedef unsigned short UShort; 
typedef short Short;

typedef short int SInt;

typedef unsigned int Bool;

typedef unsigned long   ULong;

typedef uint32_t ULong;

typedef void Void;



#define PV_CODEC_INIT       0