| author | Lawrence Mok <lawrence.mok@amlogic.com> | 2011-12-01 23:38:25 (GMT) |
|---|---|---|
| committer | Lawrence Mok <lawrence.mok@amlogic.com> | 2011-12-01 23:38:25 (GMT) |
| commit | c57fadcc27be813dc206473ddff2e16084b9037a (patch) | |
| tree | 8d15168a8537bb6097e32a75bedadd2b2b4f7a9d | |
| parent | 8163be7d2e04778c9c02e557ecb3fa3276fe29f2 (diff) | |
| download | camera-c57fadcc27be813dc206473ddff2e16084b9037a.zip camera-c57fadcc27be813dc206473ddff2e16084b9037a.tar.gz camera-c57fadcc27be813dc206473ddff2e16084b9037a.tar.bz2 | |
add back metadata buffer type
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | AppCallbackNotifier.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -43,6 +43,7 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/inc/V4LCameraAdapter \ frameworks/base/include/ui \ frameworks/base/include/utils \ + frameworks/base/include/media/stagefright \ external/jhead/ \ external/jpeg/ \ hardware/libhardware/modules/gralloc/ diff --git a/AppCallbackNotifier.cpp b/AppCallbackNotifier.cpp index 207bce7..e4c500b 100644 --- a/AppCallbackNotifier.cpp +++ b/AppCallbackNotifier.cpp @@ -23,7 +23,7 @@ #include "CameraHal.h" #include "VideoMetadata.h" #include "Encoder_libjpeg.h" -//#include <MetadataBufferType.h> +#include <MetadataBufferType.h> #include <ui/GraphicBuffer.h> #include <ui/GraphicBufferMapper.h> #include "NV12_resize.h" @@ -994,13 +994,13 @@ void AppCallbackNotifier::notifyFrame() VT_resizeFrame_Video_opt2_lp(&input, &output, NULL, 0); mapper.unlock((buffer_handle_t)vBuf); - videoMetadataBuffer->metadataBufferType = 0;//(int) kMetadataBufferTypeCameraSource; + videoMetadataBuffer->metadataBufferType = (int) kMetadataBufferTypeCameraSource; videoMetadataBuffer->handle = (void *)vBuf; videoMetadataBuffer->offset = 0; } else { - videoMetadataBuffer->metadataBufferType = 0;//(int) kMetadataBufferTypeCameraSource; + videoMetadataBuffer->metadataBufferType = (int) kMetadataBufferTypeCameraSource; videoMetadataBuffer->handle = frame->mBuffer; videoMetadataBuffer->offset = frame->mOffset; } |