From 6bb509b44a4d001804480df81ac303804d295dfe Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue, 31 Jul 2012 11:09:34 +0400
Subject: [PATCH] Android 4.1.1 native camera fix. BufferQueue class is used
instaed of Surface texture. Includes in cmake updated.
---
modules/androidcamera/camera_wrapper/camera_wrapper.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/modules/androidcamera/camera_wrapper/camera_wrapper.cpp b/modules/androidcamera/camera_wrapper/camera_wrapper.cpp
index c7a55fb39b..a2209c875d 100644
--- a/modules/androidcamera/camera_wrapper/camera_wrapper.cpp
+++ b/modules/androidcamera/camera_wrapper/camera_wrapper.cpp
@@ -58,9 +58,6 @@
using namespace android;
-void debugShowFPS();
-
-#if defined(ANDROID_r4_1_1)
class ConsumerListenerStub: public BufferQueue::ConsumerListener
{
public:
@@ -71,7 +68,6 @@ public:
{
}
};
-#endif
void debugShowFPS()
{
@@ -281,7 +277,7 @@ public:
virtual void postData(int32_t msgType, const sp<IMemory>& dataPtr
#if defined(ANDROID_r4_0_0) || defined(ANDROID_r4_0_3) || defined(ANDROID_r4_1_1)
- ,camera_frame_metadata_t*
+ ,camera_frame_metadata_t* metadata
#endif
)
{