| author | Jian Wang <jian.wang@amlogic.com> | 2017-12-06 08:36:15 (GMT) |
|---|---|---|
| committer | Jian Wang <jian.wang@amlogic.com> | 2017-12-15 03:01:42 (GMT) |
| commit | b68fa856ebaa7f511b0527a543ce75246f080bd2 (patch) | |
| tree | 25c2ee3f7e352d127f6ef7212a3d100fc01d9b83 | |
| parent | bcf77bffff442a8fd3f7e3e1ac084ca9ad1eb9a2 (diff) | |
| download | media-b68fa856ebaa7f511b0527a543ce75246f080bd2.zip media-b68fa856ebaa7f511b0527a543ce75246f080bd2.tar.gz media-b68fa856ebaa7f511b0527a543ce75246f080bd2.tar.bz2 | |
add mediaext3 [4/12]
PD# 147955
1. add pmp format
2. add isflv tag
Change-Id: I7d165191c1666982ce65f5d58dad9c23b9ad9f13
| -rw-r--r-- | ammediaext/AmMediaDefsExt.cpp | 2 | ||||
| -rw-r--r-- | ammediaext/AmMediaDefsExt.h | 2 | ||||
| -rw-r--r-- | ammediaext/AmMetaDataExt.h | 1 | ||||
| -rw-r--r-- | ammediaext/OMX_VendorExt.h | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/ammediaext/AmMediaDefsExt.cpp b/ammediaext/AmMediaDefsExt.cpp index bca32ac..f4cba2d 100644 --- a/ammediaext/AmMediaDefsExt.cpp +++ b/ammediaext/AmMediaDefsExt.cpp @@ -43,6 +43,7 @@ const char *MEDIA_MIMETYPE_VIDEO_WMV1 = "video/wmv1"; const char *MEDIA_MIMETYPE_VIDEO_WMV2 = "video/wmv2"; const char *MEDIA_MIMETYPE_VIDEO_WMV3 = "video/wmv3"; const char *MEDIA_MIMETYPE_VIDEO_MSWMV3 = "video/x-ms-wmv"; +const char *MEDIA_MIMETYPE_VIDEO_AVS = "video/avs"; const char *MEDIA_MIMETYPE_AUDIO_DTS = "audio/dtshd"; @@ -66,6 +67,7 @@ const char *MEDIA_MIMETYPE_TEXT_TTML = "application/ttml+xml"; const char *MEDIA_MIMETYPE_CONTAINER_ASF = "video/x-ms-asf"; const char *MEDIA_MIMETYPE_CONTAINER_FLV = "video/x-flv"; +const char *MEDIA_MIMETYPE_CONTAINER_PMP = "video/pmp"; const char *MEDIA_MIMETYPE_CONTAINER_AIFF = "audio/x-aiff"; const char *MEDIA_MIMETYPE_CONTAINER_DDP = "audio/ddp"; } // namespace android diff --git a/ammediaext/AmMediaDefsExt.h b/ammediaext/AmMediaDefsExt.h index 1dee085..f54e588 100644 --- a/ammediaext/AmMediaDefsExt.h +++ b/ammediaext/AmMediaDefsExt.h @@ -44,6 +44,7 @@ extern const char *MEDIA_MIMETYPE_VIDEO_WMV1; extern const char *MEDIA_MIMETYPE_VIDEO_WMV2; extern const char *MEDIA_MIMETYPE_VIDEO_WMV3; extern const char *MEDIA_MIMETYPE_VIDEO_MSWMV3; +extern const char *MEDIA_MIMETYPE_VIDEO_AVS; extern const char *MEDIA_MIMETYPE_VIDEO_VC1; extern const char *MEDIA_MIMETYPE_VIDEO_WVC1; @@ -71,6 +72,7 @@ extern const char *MEDIA_MIMETYPE_TEXT_TTML; extern const char *MEDIA_MIMETYPE_CONTAINER_ASF; extern const char *MEDIA_MIMETYPE_CONTAINER_FLV; +extern const char *MEDIA_MIMETYPE_CONTAINER_PMP; extern const char *MEDIA_MIMETYPE_CONTAINER_DDP; extern const char *MEDIA_MIMETYPE_CONTAINER_AIFF; } // namespace android diff --git a/ammediaext/AmMetaDataExt.h b/ammediaext/AmMetaDataExt.h index 30421cf..40f166d 100644 --- a/ammediaext/AmMetaDataExt.h +++ b/ammediaext/AmMetaDataExt.h @@ -87,6 +87,7 @@ enum { kKeyIsMVC = 'mvc ', // bool (int32_t) kKey4kOSD = '4OSD', // bool (int32_t) KKeyIsDV = 'isDV', // bool (int32_t) + kKeyIsFLV = 'isFV', // bool (int32_t) kKeyBlockAlign = 'bagn', kKeyAudioFlag ='aufg', // audio info reported from decoder to indicate special info diff --git a/ammediaext/OMX_VendorExt.h b/ammediaext/OMX_VendorExt.h index 7b0a48e..ea7b119 100644 --- a/ammediaext/OMX_VendorExt.h +++ b/ammediaext/OMX_VendorExt.h @@ -40,6 +40,7 @@ typedef enum OMX_VIDEO_VENDOR_CODINGEXTTYPE { OMX_VIDEO_CodingRV20, OMX_VIDEO_CodingRV30, OMX_VIDEO_CodingRV40, + OMX_VIDEO_CodingAVS, } OMX_VIDEO_CODINGEXTTYPE; typedef enum OMX_VENDOR_INDEXEXTTYPE { |