浏览代码

feat[mpp_meta]: Add osd_data3 fmt for 1103b/1126b

Change-Id: I8ca02440c2239a4952900f22e5617d4b9ea8048c
Signed-off-by: Yanjun Liao <yanjun.liao@rock-chips.com>
Yanjun Liao 2 月之前
父节点
当前提交
2e74006879
共有 3 个文件被更改,包括 6 次插入0 次删除
  1. 4 0
      inc/mpp_frame.h
  2. 1 0
      inc/mpp_meta.h
  3. 1 0
      mpp/base/mpp_meta.cpp

+ 4 - 0
inc/mpp_frame.h

@@ -260,6 +260,8 @@ typedef enum {
     MPP_FMT_YUV444SP        = (MPP_FRAME_FMT_YUV + 15), /* YYYY... UVUVUVUV...      */
     MPP_FMT_YUV444P         = (MPP_FRAME_FMT_YUV + 16), /* YYYY... UUUU... VVVV...  */
     MPP_FMT_YUV444SP_10BIT  = (MPP_FRAME_FMT_YUV + 17),
+    MPP_FMT_AYUV2BPP        = (MPP_FRAME_FMT_YUV + 18), /* YYYY... UVUVUVUV...      */
+    MPP_FMT_AYUV1BPP        = (MPP_FRAME_FMT_YUV + 19),
     MPP_FMT_YUV_BUTT,
 
     MPP_FMT_RGB565          = (MPP_FRAME_FMT_RGB + 0),  /* 16-bit RGB               */
@@ -276,6 +278,8 @@ typedef enum {
     MPP_FMT_ABGR8888        = (MPP_FRAME_FMT_RGB + 11), /* 32-bit RGB               */
     MPP_FMT_BGRA8888        = (MPP_FRAME_FMT_RGB + 12), /* 32-bit RGB               */
     MPP_FMT_RGBA8888        = (MPP_FRAME_FMT_RGB + 13), /* 32-bit RGB               */
+    MPP_FMT_ARGB4444        = (MPP_FRAME_FMT_RGB + 14), /* 16-bit RGB               */
+    MPP_FMT_ARGB1555        = (MPP_FRAME_FMT_RGB + 15), /* 2-bit RGB                */
     MPP_FMT_RGB_BUTT,
 
     MPP_FMT_BUTT,

+ 1 - 0
inc/mpp_meta.h

@@ -69,6 +69,7 @@ typedef enum MppMetaKey_e {
     KEY_ROI_DATA                = FOURCC_META('r', 'o', 'i', ' '),
     KEY_OSD_DATA                = FOURCC_META('o', 's', 'd', ' '),
     KEY_OSD_DATA2               = FOURCC_META('o', 's', 'd', '2'),
+    KEY_OSD_DATA3               = FOURCC_META('o', 's', 'd', '3'),
     KEY_USER_DATA               = FOURCC_META('u', 's', 'r', 'd'),
     KEY_USER_DATAS              = FOURCC_META('u', 'r', 'd', 's'),
 

+ 1 - 0
mpp/base/mpp_meta.cpp

@@ -78,6 +78,7 @@ static RK_U64 meta_defs[] = {
     META_KEY_TO_U64(KEY_ROI_DATA2,          TYPE_UPTR),
     META_KEY_TO_U64(KEY_OSD_DATA,           TYPE_UPTR),
     META_KEY_TO_U64(KEY_OSD_DATA2,          TYPE_UPTR),
+    META_KEY_TO_U64(KEY_OSD_DATA3,          TYPE_UPTR),
     META_KEY_TO_U64(KEY_USER_DATA,          TYPE_UPTR),
     META_KEY_TO_U64(KEY_USER_DATAS,         TYPE_UPTR),
     META_KEY_TO_U64(KEY_QPMAP0,             TYPE_SPTR),