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
diff --git a/libstagefrighthw/QComOMXMetadata.h b/libstagefrighthw/QComOMXMetadata.h
index e4cf73c..3339bbe 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;
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
index a681548..0906985 100644
--- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
@@ -1384,7 +1384,7 @@
OMX_STRING device_name = (OMX_STRING)"/dev/video/venus_dec";
#ifdef _ANDROID_
- char platform_name[64];
+ char platform_name[PROPERTY_VALUE_MAX];
property_get("ro.board.platform", platform_name, "0");
if (!strncmp(platform_name, "msm8610", 7)) {
device_name = (OMX_STRING)"/dev/video/q6_dec";
diff --git a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
index 791815d..a4142d1 100644
--- a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
+++ b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
@@ -527,7 +527,7 @@
struct v4l2_control control;
OMX_STRING device_name = (OMX_STRING)"/dev/video/venus_enc";
- char platform_name[64];
+ char platform_name[PROPERTY_VALUE_MAX];
property_get("ro.board.platform", platform_name, "0");
if (!strncmp(platform_name, "msm8610", 7)) {
