summaryrefslogtreecommitdiffstats
path: root/libstagefrighthw
diff options
context:
space:
mode:
authorArun Menon <avmenon@codeaurora.org>2013-10-22 12:57:14 -0700
committerArun Menon <avmenon@codeaurora.org>2013-10-22 15:06:24 -0700
commit9af783f8f8ee204ed8cabcc412d739382f89f29a (patch)
tree3606b4651ebdbb98656d608289489428226d34de /libstagefrighthw
parente56524834690c2514488d2ccb7272468117c29d4 (diff)
downloadandroid_hardware_qcom_media-9af783f8f8ee204ed8cabcc412d739382f89f29a.tar.gz
android_hardware_qcom_media-9af783f8f8ee204ed8cabcc412d739382f89f29a.tar.bz2
android_hardware_qcom_media-9af783f8f8ee204ed8cabcc412d739382f89f29a.zip
mm-video: vdec: Fix compilation error for dynamic buffer mode
struct VideoDecoderOutputMetaData definition is available only on K release. This patch will include the struct definition locally for jb_mr2 if TARGET_ENABLE_DEC_META_DATA_MODE is enabled. Change-Id: If56acfe080e731aec2d860703aea1726bb6343cf
Diffstat (limited to 'libstagefrighthw')
-rwxr-xr-xlibstagefrighthw/Android.mk4
-rwxr-xr-xlibstagefrighthw/QComOMXMetadata.h9
2 files changed, 13 insertions, 0 deletions
diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk
index 2a307ef7..927b32b6 100755
--- a/libstagefrighthw/Android.mk
+++ b/libstagefrighthw/Android.mk
@@ -22,6 +22,10 @@ LOCAL_SRC_FILES := \
LOCAL_CFLAGS := $(PV_CFLAGS_MINUS_VISIBILITY)
+ifdef TARGET_ENABLE_DEC_META_DATA_MODE
+LOCAL_CFLAGS += -DMETA_DATA_MODE_SUPPORTED
+endif
+
LOCAL_C_INCLUDES:= \
frameworks/native/include/media/openmax \
frameworks/native/include/media/hardware
diff --git a/libstagefrighthw/QComOMXMetadata.h b/libstagefrighthw/QComOMXMetadata.h
index 3339bbe9..cc2a6991 100755
--- a/libstagefrighthw/QComOMXMetadata.h
+++ b/libstagefrighthw/QComOMXMetadata.h
@@ -23,4 +23,13 @@ namespace android {
MetadataBufferType buffer_type;
buffer_handle_t meta_handle;
} encoder_media_buffer_type;
+
+#ifdef META_DATA_MODE_SUPPORTED
+ // Meta data buffer layout used to transport output frames to the decoder for
+ // dynamic buffer handling.
+ struct VideoDecoderOutputMetaData {
+ MetadataBufferType eType;
+ buffer_handle_t pHandle;
+ };
+#endif
}