mm-video: resolve compilation issues with conflicting declarations

Include Metadat-BufferType declaration from right source rather than
defining locally.
Use PROPERTY_VALUE_MAX to specify size of array passed to property_get

Change-Id: I0929a5b8d4c69e0309b3c5b6c4aa172bd7a86574

1 files changed, 1 insertions, 5 deletions

diff --git a/libstagefrighthw/QComOMXMetadata.h b/libstagefrighthw/QComOMXMetadata.h
index e4cf73cf..3339bbe9 100755
--- a/libstagefrighthw/QComOMXMetadata.h
+++ b/libstagefrighthw/QComOMXMetadata.h
@@ -15,14 +15,10 @@
  * limitations under the License.
  */
 #include <system/window.h>
+#include <media/hardware/MetadataBufferType.h>
 
 namespace android {
 
-    typedef enum {
-        kMetadataBufferTypeCameraSource  = 0,
-        kMetadataBufferTypeGrallocSource = 1,
-    } MetadataBufferType;
-
     typedef struct encoder_media_buffer_type {
         MetadataBufferType buffer_type;
         buffer_handle_t meta_handle;