diff options
author | Martin Storsjo <martin@martin.st> | 2012-04-13 14:15:58 +0300 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2012-05-21 15:20:17 -0700 |
commit | 4b43b41eaf8c4c80f66185e13620cf94b8b2ef5b (patch) | |
tree | d01dd02ba361a066e55740808bf978ec9f8ffe94 /media/libstagefright/codecs/avc/enc/src/motion_comp.cpp | |
parent | 4e1d7b8d16abbe8a60fa3957646297b552e82fb0 (diff) | |
download | frameworks_av-4b43b41eaf8c4c80f66185e13620cf94b8b2ef5b.zip frameworks_av-4b43b41eaf8c4c80f66185e13620cf94b8b2ef5b.tar.gz frameworks_av-4b43b41eaf8c4c80f66185e13620cf94b8b2ef5b.tar.bz2 |
stagefright avcenc: Use intptr_t for casting pointers to integers
This is used for doing integer arithmetic on the pointers, for
checking pointer alignment.
Change-Id: I7a7ff834dc631ac9cce90e46216f64645e1ae6e5
Diffstat (limited to 'media/libstagefright/codecs/avc/enc/src/motion_comp.cpp')
-rw-r--r-- | media/libstagefright/codecs/avc/enc/src/motion_comp.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/media/libstagefright/codecs/avc/enc/src/motion_comp.cpp b/media/libstagefright/codecs/avc/enc/src/motion_comp.cpp index 824dac8..a390f88 100644 --- a/media/libstagefright/codecs/avc/enc/src/motion_comp.cpp +++ b/media/libstagefright/codecs/avc/enc/src/motion_comp.cpp @@ -198,7 +198,7 @@ void eCreateAlign(uint8 *ref, int picpitch, int y_pos, out_offset = 24 - blkwidth; //switch(x_pos&0x3){ - switch (((uint32)ref)&0x3) + switch (((intptr_t)ref)&0x3) { case 1: offset = picpitch - blkwidth - 3; @@ -788,7 +788,7 @@ void eVertInterp1MC(uint8 *in, int inpitch, uint8 *out, int outpitch, uint8 tmp_in[24][24]; /* not word-aligned */ - if (((uint32)in)&0x3) + if (((intptr_t)in)&0x3) { eCreateAlign(in, inpitch, -2, &tmp_in[0][0], blkwidth, blkheight + 5); in = &tmp_in[2][0]; @@ -1461,7 +1461,7 @@ void eDiagonalInterpMC(uint8 *in1, uint8 *in2, int inpitch, /* perform vertical interpolation */ /* not word-aligned */ - if (((uint32)in2)&0x3) + if (((intptr_t)in2)&0x3) { eCreateAlign(in2, inpitch, -2, &tmp_in[0][0], blkwidth, blkheight + 5); in2 = &tmp_in[2][0]; @@ -1655,7 +1655,7 @@ void eFullPelMC(uint8 *in, int inpitch, uint8 *out, int outpitch, uint32 temp; uint8 byte; - if (((uint32)in)&3) + if (((intptr_t)in)&3) { for (j = blkheight; j > 0; j--) { @@ -1716,7 +1716,7 @@ void ePadChroma(uint8 *ref, int picwidth, int picheight, int picpitch, int x_pos else start = ref + x_pos; /* word-align start */ - offset = (uint32)start & 0x3; + offset = (intptr_t)start & 0x3; if (offset) start -= offset; word1 = *((uint32*)start); @@ -1742,7 +1742,7 @@ void ePadChroma(uint8 *ref, int picwidth, int picheight, int picpitch, int x_pos else start = ref + picpitch * (picheight - 1) + x_pos; /* word-align start */ - offset = (uint32)start & 0x3; + offset = (intptr_t)start & 0x3; if (offset) start -= offset; word1 = *((uint32*)start); @@ -2117,7 +2117,7 @@ void eChromaFullMC_SIMD(uint8 *pRef, int srcPitch, int dx, int dy, uint16 temp; uint8 byte; - if (((uint32)pRef)&1) + if (((intptr_t)pRef)&1) { for (j = blkheight; j > 0; j--) { |