Android 4.1.1 native camera fix. BufferQueue class is used instaed of Surface texture. Includes in cmake updated.

13 years ago · 6bb509b44a
parent ca6e85f526
commit 6bb509b44a
1 changed files with 1 additions and 5 deletions
--- 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
                          )
    {