diff options
| author | Arun Menon <avmenon@codeaurora.org> | 2013-09-25 10:41:32 -0700 |
|---|---|---|
| committer | Arun Menon <avmenon@codeaurora.org> | 2013-10-10 13:05:46 -0700 |
| commit | 579732339848d14b2649a2aa36126552b3afba51 (patch) | |
| tree | 5e7a91e2bb63874c362915745c3407920441fdb6 /libstagefrighthw | |
| parent | 631eb2124c10c5582387eb1170f0b4c07c5fcf86 (diff) | |
| download | media-579732339848d14b2649a2aa36126552b3afba51.tar.gz | |
mm-video: vdec: Fix compilation error for Dynamic Buffer mode
struct VideoDecoderOutputMetaData definition is available
only on KitKat release. This patch includes the struct definition
locally for JB_MR2, to prevent compilation failures on JB_MR2.
Change-Id: If56acfe080e731aec2d860703aea1726bb6343cf
Diffstat (limited to 'libstagefrighthw')
| -rwxr-xr-x | libstagefrighthw/Android.mk | 4 | ||||
| -rwxr-xr-x | libstagefrighthw/QComOMXMetadata.h | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk index 2a307ef7..007e8049 100755 --- a/libstagefrighthw/Android.mk +++ b/libstagefrighthw/Android.mk @@ -22,6 +22,10 @@ LOCAL_SRC_FILES := \ LOCAL_CFLAGS := $(PV_CFLAGS_MINUS_VISIBILITY) +ifeq ($(PLATFORM_SDK_VERSION), 18) #JB_MR2 +LOCAL_CFLAGS += -DANDROID_JELLYBEAN_MR2=1 +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 e4cf73cf..6bb001e8 100755 --- a/libstagefrighthw/QComOMXMetadata.h +++ b/libstagefrighthw/QComOMXMetadata.h @@ -27,4 +27,13 @@ namespace android { MetadataBufferType buffer_type; buffer_handle_t meta_handle; } encoder_media_buffer_type; + +#ifdef ANDROID_JELLYBEAN_MR2 + // 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 } |