diff options
| -rwxr-xr-x | libstagefrighthw/Android.mk | 4 | ||||
| -rwxr-xr-x | libstagefrighthw/QComOMXMetadata.h | 9 | ||||
| -rwxr-xr-x | mm-video-v4l2/vidc/vdec/Android.mk | 5 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp | 4 |
4 files changed, 22 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 } diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index bb37c040..3acef60e 100755 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -111,6 +111,11 @@ libmm-vdec-inc += frameworks/av/include/media/stagefright libmm-vdec-inc += $(TARGET_OUT_HEADERS)/mm-video/SwVdec libmm-vdec-inc += $(TARGET_OUT_HEADERS)/qcom/display/ +ifdef TARGET_ENABLE_DEC_META_DATA_MODE +libOmxVdec-def += -DMETA_DATA_MODE_SUPPORTED +libmm-vdec-inc += hardware/qcom/media/libstagefrighthw +endif + LOCAL_MODULE := libOmxVdec LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := $(libOmxVdec-def) 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 3794ce94..add623ca 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp @@ -67,6 +67,10 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "DivXDrmDecrypt.h" #endif //_ANDROID_ +#ifdef META_DATA_MODE_SUPPORTED +#include "QComOMXMetadata.h" +#endif + #ifdef USE_EGL_IMAGE_GPU #include <EGL/egl.h> #include <EGL/eglQCOM.h> |