PD#110605:modify for compatibility 64bit

Change-Id: I041eaf2ecc187c964aaaa7dd7acf137bc4b1d598

3 files changed, 7 insertions, 7 deletions

diff --git a/aml_screen.cpp b/aml_screen.cpp
index 640389e..b35be42 100644
--- a/aml_screen.cpp
+++ b/aml_screen.cpp
@@ -166,7 +166,7 @@ int screen_source_aquire_buffer(struct aml_screen_device* dev, aml_screen_buffer
     return source->aquire_buffer(buff_info);
 }
 
-int screen_source_release_buffer(struct aml_screen_device* dev, void* ptr)
+int screen_source_release_buffer(struct aml_screen_device* dev, long* ptr)
 {
     android::vdin_screen_source* source = (android::vdin_screen_source*)dev->priv;
     return source->release_buffer(ptr);
diff --git a/v4l2_vdin.cpp b/v4l2_vdin.cpp
index fbbe6e2..f42e2cc 100644
--- a/v4l2_vdin.cpp
+++ b/v4l2_vdin.cpp
@@ -196,7 +196,7 @@ int vdin_screen_source::start_v4l2_device()
             return ret;
         }
         mVideoInfo->canvas[i] = mVideoInfo->buf.reserved;
-        mVideoInfo->mem[i] = mmap (0, mVideoInfo->buf.length, PROT_READ | PROT_WRITE,
+        mVideoInfo->mem[i] = (long *)mmap (0, mVideoInfo->buf.length, PROT_READ | PROT_WRITE,
                MAP_SHARED, mCameraHandle, mVideoInfo->buf.m.offset);
 
         if (mVideoInfo->mem[i] == MAP_FAILED) {
@@ -521,7 +521,7 @@ int vdin_screen_source::aquire_buffer(aml_screen_buffer_info_t *buff_info)
 	return true;
 } */
 
-int vdin_screen_source::release_buffer(void* ptr)
+int vdin_screen_source::release_buffer(long* ptr)
 {
     ALOGV("%s %d", __FUNCTION__, __LINE__);
     int ret = -1;
@@ -612,7 +612,7 @@ int vdin_screen_source::workThread()
     int index;
     aml_screen_buffer_info_t buff_info;
     int ret;
-    void *src = NULL;
+    long *src = NULL;
     unsigned char *dest = NULL;
     uint8_t *handle = NULL;
     ANativeWindowBuffer* buf;
diff --git a/v4l2_vdin.h b/v4l2_vdin.h
index e299d8e..1a01955 100644
--- a/v4l2_vdin.h
+++ b/v4l2_vdin.h
@@ -45,7 +45,7 @@ struct VideoInfo {
     struct v4l2_format format;
     struct v4l2_buffer buf;
     struct v4l2_requestbuffers rb;
-    void *mem[NB_BUFFER];
+    long *mem[NB_BUFFER];
     unsigned canvas[NB_BUFFER];
     unsigned refcount[NB_BUFFER];
     bool isStreaming;
@@ -90,7 +90,7 @@ class vdin_screen_source {
         int set_amlvideo2_crop(int x, int y, int width, int height);
         int aquire_buffer(aml_screen_buffer_info_t *buff_info);
         // int inc_buffer_refcount(int* ptr);
-        int release_buffer(void* ptr);
+        int release_buffer(long* ptr);
         int set_state_callback(olStateCB callback);
         int set_data_callback(app_data_callback callback, void* user);
         int set_preview_window(ANativeWindow* window);
@@ -118,7 +118,7 @@ class vdin_screen_source {
         };
     private:
         int mCurrentIndex;
-        KeyedVector<void *, int> mBufs;
+        KeyedVector<long *, long> mBufs;
         int mBufferCount;
         int mFrameWidth;
         int mFrameHeight;