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.cc | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/FaceServer/PbFaceList.pb.cc b/FaceServer/PbFaceList.pb.cc
index 589c7f8..38d9ab6 100644
--- a/FaceServer/PbFaceList.pb.cc
+++ b/FaceServer/PbFaceList.pb.cc
@@ -123,19 +123,26 @@
void AddDescriptorsImpl() {
InitDefaults();
static const char descriptor[] = {
- "\n\nPbFaceList\"\377\002\n\nPbFaceList\022\027\n\005magic\030\001 \002"
+ "\n\nPbFaceList\"\227\005\n\nPbFaceList\022\027\n\005magic\030\001 \002"
"(\r:\01011706629\022\023\n\013image_count\030\002 \002(\r\022\021\n\tsrc"
"_width\030\003 \001(\r\022\022\n\nsrc_height\030\004 \001(\r\022)\n\006imag"
- "es\030\005 \003(\0132\031.PbFaceList.FaceListImage\032\360\001\n\r"
+ "es\030\005 \003(\0132\031.PbFaceList.FaceListImage\032\210\004\n\r"
"FaceListImage\022\013\n\003idx\030\001 \002(\r\022\014\n\004size\030\002 \002(\r"
"\022:\n\004type\030\003 \002(\0162#.PbFaceList.FaceListImag"
"e.ImageType:\007MBFT_Y8\022\r\n\005width\030\004 \002(\r\022\016\n\006h"
"eight\030\005 \002(\r\022\022\n\ntop_left_x\030\006 \001(\r\022\022\n\ntop_l"
- "eft_y\030\007 \001(\r\022\013\n\003img\030\010 \003(\014\"4\n\tImageType\022\014\n"
- "\010MBFT_YUV\020\010\022\013\n\007MBFT_Y8\020\t\022\014\n\010MBFT_RGB\020\013"
+ "eft_y\030\007 \001(\r\022\013\n\003img\030\010 \003(\014\"\313\002\n\tImageType\022\014"
+ "\n\010MBFT_SDP\020\001\022\r\n\tMBFT_FMTP\020\002\022\016\n\nMBFT_INDE"
+ "X\020\003\022\024\n\020MBFT_PTR_AVFRAME\020\004\022\022\n\016MBFT_H264_N"
+ "ALU\020\005\022\026\n\022MBFT_H264_NALU_AUX\020\006\022\r\n\tMBFT_JP"
+ "EG\020\007\022\014\n\010MBFT_YUV\020\010\022\013\n\007MBFT_Y8\020\t\022\017\n\013MBFT_"
+ "YUV420\020\n\022\r\n\tMBFT_NV12\020\013\022\014\n\010MBFT_RGB\020\014\022\017\n"
+ "\013MBFT_RGB888\020\r\022\017\n\013MBFT_RGB565\020\016\022\r\n\tMBFT_"
+ "RGBA\020\017\022\r\n\tMBFT_BGRA\020\020\022\021\n\rMBFT_BGRA8888\020\021"
+ "\022\021\n\rMBFT_ABGR8888\020\022\022\021\n\rMBFT_ARGB8888\020\023"
};
::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
- descriptor, 398);
+ descriptor, 678);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"PbFaceList", &protobuf_RegisterTypes);
::google::protobuf::internal::OnShutdown(&TableStruct::Shutdown);
@@ -160,9 +167,25 @@
}
bool PbFaceList_FaceListImage_ImageType_IsValid(int value) {
switch (value) {
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ case 5:
+ case 6:
+ case 7:
case 8:
case 9:
+ case 10:
case 11:
+ case 12:
+ case 13:
+ case 14:
+ case 15:
+ case 16:
+ case 17:
+ case 18:
+ case 19:
return true;
default:
return false;
@@ -170,9 +193,25 @@
}
#if !defined(_MSC_VER) || _MSC_VER >= 1900
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_SDP;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_FMTP;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_INDEX;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_PTR_AVFRAME;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_H264_NALU;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_H264_NALU_AUX;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_JPEG;
const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_YUV;
const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_Y8;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_YUV420;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_NV12;
const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_RGB;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_RGB888;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_RGB565;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_RGBA;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_BGRA;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_BGRA8888;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_ABGR8888;
+const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::MBFT_ARGB8888;
const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::ImageType_MIN;
const PbFaceList_FaceListImage_ImageType PbFaceList_FaceListImage::ImageType_MAX;
const int PbFaceList_FaceListImage::ImageType_ARRAYSIZE;
--
Gitblit v1.8.0