From c7caa54d8d58af6159f2c758ad5d6687d461a333 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 10:53:23 +0800
Subject: [PATCH] 

---
 FaceServer/PbFaceList.pb.h |  166 +++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 124 insertions(+), 42 deletions(-)

diff --git a/FaceServer/PbFaceList.pb.h b/FaceServer/PbFaceList.pb.h
index b1d5c42..9a00cfc 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);
   }
@@ -173,10 +221,10 @@
 
   // accessors -------------------------------------------------------
 
-  // repeated bytes img = 8;
+  // repeated bytes img = 9;
   int img_size() const;
   void clear_img();
-  static const int kImgFieldNumber = 8;
+  static const int kImgFieldNumber = 9;
   const ::std::string& img(int index) const;
   ::std::string* mutable_img(int index);
   void set_img(int index, const ::std::string& value);
@@ -202,45 +250,52 @@
   ::google::protobuf::uint32 idx() const;
   void set_idx(::google::protobuf::uint32 value);
 
-  // required uint32 size = 2;
+  // required uint32 st_track_id = 2;
+  bool has_st_track_id() const;
+  void clear_st_track_id();
+  static const int kStTrackIdFieldNumber = 2;
+  ::google::protobuf::uint32 st_track_id() const;
+  void set_st_track_id(::google::protobuf::uint32 value);
+
+  // required uint32 size = 3;
   bool has_size() const;
   void clear_size();
-  static const int kSizeFieldNumber = 2;
+  static const int kSizeFieldNumber = 3;
   ::google::protobuf::uint32 size() const;
   void set_size(::google::protobuf::uint32 value);
 
-  // required uint32 width = 4;
+  // required uint32 width = 5;
   bool has_width() const;
   void clear_width();
-  static const int kWidthFieldNumber = 4;
+  static const int kWidthFieldNumber = 5;
   ::google::protobuf::uint32 width() const;
   void set_width(::google::protobuf::uint32 value);
 
-  // required uint32 height = 5;
+  // required uint32 height = 6;
   bool has_height() const;
   void clear_height();
-  static const int kHeightFieldNumber = 5;
+  static const int kHeightFieldNumber = 6;
   ::google::protobuf::uint32 height() const;
   void set_height(::google::protobuf::uint32 value);
 
-  // optional uint32 top_left_x = 6;
+  // optional uint32 top_left_x = 7;
   bool has_top_left_x() const;
   void clear_top_left_x();
-  static const int kTopLeftXFieldNumber = 6;
+  static const int kTopLeftXFieldNumber = 7;
   ::google::protobuf::uint32 top_left_x() const;
   void set_top_left_x(::google::protobuf::uint32 value);
 
-  // optional uint32 top_left_y = 7;
+  // optional uint32 top_left_y = 8;
   bool has_top_left_y() const;
   void clear_top_left_y();
-  static const int kTopLeftYFieldNumber = 7;
+  static const int kTopLeftYFieldNumber = 8;
   ::google::protobuf::uint32 top_left_y() const;
   void set_top_left_y(::google::protobuf::uint32 value);
 
-  // required .PbFaceList.FaceListImage.ImageType type = 3 [default = MBFT_Y8];
+  // required .PbFaceList.FaceListImage.ImageType type = 4 [default = MBFT_Y8];
   bool has_type() const;
   void clear_type();
-  static const int kTypeFieldNumber = 3;
+  static const int kTypeFieldNumber = 4;
   ::PbFaceList_FaceListImage_ImageType type() const;
   void set_type(::PbFaceList_FaceListImage_ImageType value);
 
@@ -248,6 +303,8 @@
  private:
   void set_has_idx();
   void clear_has_idx();
+  void set_has_st_track_id();
+  void clear_has_st_track_id();
   void set_has_size();
   void clear_has_size();
   void set_has_type();
@@ -269,6 +326,7 @@
   mutable int _cached_size_;
   ::google::protobuf::RepeatedPtrField< ::std::string> img_;
   ::google::protobuf::uint32 idx_;
+  ::google::protobuf::uint32 st_track_id_;
   ::google::protobuf::uint32 size_;
   ::google::protobuf::uint32 width_;
   ::google::protobuf::uint32 height_;
@@ -452,15 +510,39 @@
   // @@protoc_insertion_point(field_set:PbFaceList.FaceListImage.idx)
 }
 
-// required uint32 size = 2;
-inline bool PbFaceList_FaceListImage::has_size() const {
+// required uint32 st_track_id = 2;
+inline bool PbFaceList_FaceListImage::has_st_track_id() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void PbFaceList_FaceListImage::set_has_size() {
+inline void PbFaceList_FaceListImage::set_has_st_track_id() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void PbFaceList_FaceListImage::clear_has_size() {
+inline void PbFaceList_FaceListImage::clear_has_st_track_id() {
   _has_bits_[0] &= ~0x00000002u;
+}
+inline void PbFaceList_FaceListImage::clear_st_track_id() {
+  st_track_id_ = 0u;
+  clear_has_st_track_id();
+}
+inline ::google::protobuf::uint32 PbFaceList_FaceListImage::st_track_id() const {
+  // @@protoc_insertion_point(field_get:PbFaceList.FaceListImage.st_track_id)
+  return st_track_id_;
+}
+inline void PbFaceList_FaceListImage::set_st_track_id(::google::protobuf::uint32 value) {
+  set_has_st_track_id();
+  st_track_id_ = value;
+  // @@protoc_insertion_point(field_set:PbFaceList.FaceListImage.st_track_id)
+}
+
+// required uint32 size = 3;
+inline bool PbFaceList_FaceListImage::has_size() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void PbFaceList_FaceListImage::set_has_size() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void PbFaceList_FaceListImage::clear_has_size() {
+  _has_bits_[0] &= ~0x00000004u;
 }
 inline void PbFaceList_FaceListImage::clear_size() {
   size_ = 0u;
@@ -476,15 +558,15 @@
   // @@protoc_insertion_point(field_set:PbFaceList.FaceListImage.size)
 }
 
-// required .PbFaceList.FaceListImage.ImageType type = 3 [default = MBFT_Y8];
+// required .PbFaceList.FaceListImage.ImageType type = 4 [default = MBFT_Y8];
 inline bool PbFaceList_FaceListImage::has_type() const {
-  return (_has_bits_[0] & 0x00000040u) != 0;
+  return (_has_bits_[0] & 0x00000080u) != 0;
 }
 inline void PbFaceList_FaceListImage::set_has_type() {
-  _has_bits_[0] |= 0x00000040u;
+  _has_bits_[0] |= 0x00000080u;
 }
 inline void PbFaceList_FaceListImage::clear_has_type() {
-  _has_bits_[0] &= ~0x00000040u;
+  _has_bits_[0] &= ~0x00000080u;
 }
 inline void PbFaceList_FaceListImage::clear_type() {
   type_ = 9;
@@ -501,15 +583,15 @@
   // @@protoc_insertion_point(field_set:PbFaceList.FaceListImage.type)
 }
 
-// required uint32 width = 4;
+// required uint32 width = 5;
 inline bool PbFaceList_FaceListImage::has_width() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
+  return (_has_bits_[0] & 0x00000008u) != 0;
 }
 inline void PbFaceList_FaceListImage::set_has_width() {
-  _has_bits_[0] |= 0x00000004u;
+  _has_bits_[0] |= 0x00000008u;
 }
 inline void PbFaceList_FaceListImage::clear_has_width() {
-  _has_bits_[0] &= ~0x00000004u;
+  _has_bits_[0] &= ~0x00000008u;
 }
 inline void PbFaceList_FaceListImage::clear_width() {
   width_ = 0u;
@@ -525,15 +607,15 @@
   // @@protoc_insertion_point(field_set:PbFaceList.FaceListImage.width)
 }
 
-// required uint32 height = 5;
+// required uint32 height = 6;
 inline bool PbFaceList_FaceListImage::has_height() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+  return (_has_bits_[0] & 0x00000010u) != 0;
 }
 inline void PbFaceList_FaceListImage::set_has_height() {
-  _has_bits_[0] |= 0x00000008u;
+  _has_bits_[0] |= 0x00000010u;
 }
 inline void PbFaceList_FaceListImage::clear_has_height() {
-  _has_bits_[0] &= ~0x00000008u;
+  _has_bits_[0] &= ~0x00000010u;
 }
 inline void PbFaceList_FaceListImage::clear_height() {
   height_ = 0u;
@@ -549,15 +631,15 @@
   // @@protoc_insertion_point(field_set:PbFaceList.FaceListImage.height)
 }
 
-// optional uint32 top_left_x = 6;
+// optional uint32 top_left_x = 7;
 inline bool PbFaceList_FaceListImage::has_top_left_x() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
+  return (_has_bits_[0] & 0x00000020u) != 0;
 }
 inline void PbFaceList_FaceListImage::set_has_top_left_x() {
-  _has_bits_[0] |= 0x00000010u;
+  _has_bits_[0] |= 0x00000020u;
 }
 inline void PbFaceList_FaceListImage::clear_has_top_left_x() {
-  _has_bits_[0] &= ~0x00000010u;
+  _has_bits_[0] &= ~0x00000020u;
 }
 inline void PbFaceList_FaceListImage::clear_top_left_x() {
   top_left_x_ = 0u;
@@ -573,15 +655,15 @@
   // @@protoc_insertion_point(field_set:PbFaceList.FaceListImage.top_left_x)
 }
 
-// optional uint32 top_left_y = 7;
+// optional uint32 top_left_y = 8;
 inline bool PbFaceList_FaceListImage::has_top_left_y() const {
-  return (_has_bits_[0] & 0x00000020u) != 0;
+  return (_has_bits_[0] & 0x00000040u) != 0;
 }
 inline void PbFaceList_FaceListImage::set_has_top_left_y() {
-  _has_bits_[0] |= 0x00000020u;
+  _has_bits_[0] |= 0x00000040u;
 }
 inline void PbFaceList_FaceListImage::clear_has_top_left_y() {
-  _has_bits_[0] &= ~0x00000020u;
+  _has_bits_[0] &= ~0x00000040u;
 }
 inline void PbFaceList_FaceListImage::clear_top_left_y() {
   top_left_y_ = 0u;
@@ -597,7 +679,7 @@
   // @@protoc_insertion_point(field_set:PbFaceList.FaceListImage.top_left_y)
 }
 
-// repeated bytes img = 8;
+// repeated bytes img = 9;
 inline int PbFaceList_FaceListImage::img_size() const {
   return img_.size();
 }

--
Gitblit v1.8.0