generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Smorkalov 2012-07-31 11:09:34 +04:00 committed by Andrey Kamaev
parent ca6e85f526
commit 6bb509b44a
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/androidcamera/camera_wrapper/camera_wrapper.cpp
View File

@ -58,9 +58,6 @@
using namespace android; using namespace android;
void debugShowFPS();
#if defined(ANDROID_r4_1_1)
class ConsumerListenerStub: public BufferQueue::ConsumerListener class ConsumerListenerStub: public BufferQueue::ConsumerListener
{ {
public: public:
@ -71,7 +68,6 @@ public:
{ {
} }
}; };
#endif
void debugShowFPS() void debugShowFPS()
{ {
@ -281,7 +277,7 @@ public:
virtual void postData(int32_t msgType, const sp<IMemory>& dataPtr 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) #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 #endif
) )
{ {