From d289fd8eb7a6581da0dd9c9963c15b6e7c08d744 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 27 六月 2017 09:48:34 +0800
Subject: [PATCH]
---
FaceServer/PbFaceList.pb.h | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/FaceServer/PbFaceList.pb.h b/FaceServer/PbFaceList.pb.h
index b1d5c42..8085a09 100644
--- a/FaceServer/PbFaceList.pb.h
+++ b/FaceServer/PbFaceList.pb.h
@@ -49,13 +49,29 @@
} // namespace protobuf_PbFaceList
enum PbFaceList_FaceListImage_ImageType {
+ PbFaceList_FaceListImage_ImageType_MBFT_SDP = 1,
+ PbFaceList_FaceListImage_ImageType_MBFT_FMTP = 2,
+ PbFaceList_FaceListImage_ImageType_MBFT_INDEX = 3,
+ PbFaceList_FaceListImage_ImageType_MBFT_PTR_AVFRAME = 4,
+ PbFaceList_FaceListImage_ImageType_MBFT_H264_NALU = 5,
+ PbFaceList_FaceListImage_ImageType_MBFT_H264_NALU_AUX = 6,
+ PbFaceList_FaceListImage_ImageType_MBFT_JPEG = 7,
PbFaceList_FaceListImage_ImageType_MBFT_YUV = 8,
PbFaceList_FaceListImage_ImageType_MBFT_Y8 = 9,
- PbFaceList_FaceListImage_ImageType_MBFT_RGB = 11
+ PbFaceList_FaceListImage_ImageType_MBFT_YUV420 = 10,
+ PbFaceList_FaceListImage_ImageType_MBFT_NV12 = 11,
+ PbFaceList_FaceListImage_ImageType_MBFT_RGB = 12,
+ PbFaceList_FaceListImage_ImageType_MBFT_RGB888 = 13,
+ PbFaceList_FaceListImage_ImageType_MBFT_RGB565 = 14,
+ PbFaceList_FaceListImage_ImageType_MBFT_RGBA = 15,
+ PbFaceList_FaceListImage_ImageType_MBFT_BGRA = 16,
+ PbFaceList_FaceListImage_ImageType_MBFT_BGRA8888 = 17,
+ PbFaceList_FaceListImage_ImageType_MBFT_ABGR8888 = 18,
+ PbFaceList_FaceListImage_ImageType_MBFT_ARGB8888 = 19
};
bool PbFaceList_FaceListImage_ImageType_IsValid(int value);
-const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage_ImageType_ImageType_MIN = PbFaceList_FaceListImage_ImageType_MBFT_YUV;
-const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage_ImageType_ImageType_MAX = PbFaceList_FaceListImage_ImageType_MBFT_RGB;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage_ImageType_ImageType_MIN = PbFaceList_FaceListImage_ImageType_MBFT_SDP;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage_ImageType_ImageType_MAX = PbFaceList_FaceListImage_ImageType_MBFT_ARGB8888;
const int PbFaceList_FaceListImage_ImageType_ImageType_ARRAYSIZE = PbFaceList_FaceListImage_ImageType_ImageType_MAX + 1;
const ::google::protobuf::EnumDescriptor* PbFaceList_FaceListImage_ImageType_descriptor();
@@ -144,12 +160,44 @@
// nested types ----------------------------------------------------
typedef PbFaceList_FaceListImage_ImageType ImageType;
+ static const ImageType MBFT_SDP =
+ PbFaceList_FaceListImage_ImageType_MBFT_SDP;
+ static const ImageType MBFT_FMTP =
+ PbFaceList_FaceListImage_ImageType_MBFT_FMTP;
+ static const ImageType MBFT_INDEX =
+ PbFaceList_FaceListImage_ImageType_MBFT_INDEX;
+ static const ImageType MBFT_PTR_AVFRAME =
+ PbFaceList_FaceListImage_ImageType_MBFT_PTR_AVFRAME;
+ static const ImageType MBFT_H264_NALU =
+ PbFaceList_FaceListImage_ImageType_MBFT_H264_NALU;
+ static const ImageType MBFT_H264_NALU_AUX =
+ PbFaceList_FaceListImage_ImageType_MBFT_H264_NALU_AUX;
+ static const ImageType MBFT_JPEG =
+ PbFaceList_FaceListImage_ImageType_MBFT_JPEG;
static const ImageType MBFT_YUV =
PbFaceList_FaceListImage_ImageType_MBFT_YUV;
static const ImageType MBFT_Y8 =
PbFaceList_FaceListImage_ImageType_MBFT_Y8;
+ static const ImageType MBFT_YUV420 =
+ PbFaceList_FaceListImage_ImageType_MBFT_YUV420;
+ static const ImageType MBFT_NV12 =
+ PbFaceList_FaceListImage_ImageType_MBFT_NV12;
static const ImageType MBFT_RGB =
PbFaceList_FaceListImage_ImageType_MBFT_RGB;
+ static const ImageType MBFT_RGB888 =
+ PbFaceList_FaceListImage_ImageType_MBFT_RGB888;
+ static const ImageType MBFT_RGB565 =
+ PbFaceList_FaceListImage_ImageType_MBFT_RGB565;
+ static const ImageType MBFT_RGBA =
+ PbFaceList_FaceListImage_ImageType_MBFT_RGBA;
+ static const ImageType MBFT_BGRA =
+ PbFaceList_FaceListImage_ImageType_MBFT_BGRA;
+ static const ImageType MBFT_BGRA8888 =
+ PbFaceList_FaceListImage_ImageType_MBFT_BGRA8888;
+ static const ImageType MBFT_ABGR8888 =
+ PbFaceList_FaceListImage_ImageType_MBFT_ABGR8888;
+ static const ImageType MBFT_ARGB8888 =
+ PbFaceList_FaceListImage_ImageType_MBFT_ARGB8888;
static inline bool ImageType_IsValid(int value) {
return PbFaceList_FaceListImage_ImageType_IsValid(value);
}
--
Gitblit v1.8.0