Merge "media/hardware/HardwareAPI.h: Added metadata struct used by video decoder"

diff --git a/include/media/hardware/HardwareAPI.h b/include/media/hardware/HardwareAPI.h
index cc43bf6..fc0f070 100644 (file)
--- a/include/media/hardware/HardwareAPI.h
+++ b/include/media/hardware/HardwareAPI.h
@@ -19,6 +19,7 @@
 #define HARDWARE_API_H_
 
 #include <OMXPluginBase.h>
+#include <MetadataBufferType.h>
 #include <system/window.h>
 #include <utils/RefBase.h>
 
@@ -73,6 +74,13 @@ struct StoreMetaDataInBuffersParams {
     OMX_BOOL bStoreMetaData;
 };
 
+// Meta data buffer layout used to transport output frames to the decoder for
+// dynamic buffer handling.
+struct VideoDecoderOutputMetaData {
+  MetadataBufferType eType;
+  buffer_handle_t pHandle;
+};
+
 // A pointer to this struct is passed to OMX_SetParameter when the extension
 // index for the 'OMX.google.android.index.useAndroidNativeBuffer' extension is
 // given.  This call will only be performed if a prior call was made with the