Merge pull request #196 from BluEye-Robotics/4k

Add support for 4k, remove mjpg_bitrate

Author: johannesschrimpf

protobuf_definitions/message_formats.proto

@@ -717,6 +717,7 @@ enum Resolution {
   RESOLUTION_UNSPECIFIED = 0; // Resolution not specified.
   RESOLUTION_FULLHD_1080P = 1; // 1080p Full HD resolution.
   RESOLUTION_HD_720P = 2; // 720p HD resolution.
+  RESOLUTION_UHD_4K = 3; // 4K Ultra HD resolution.
 }
 
 // Available camera frame rates.
@@ -735,15 +736,20 @@ enum Camera {
 
 // Camera parameters.
 message CameraParameters {
+  reserved 2;
+  reserved "mjpg_bitrate";
+
   int32 h264_bitrate = 1; // Bitrate of the h264 stream (bit/sec).
-  int32 mjpg_bitrate = 2; // Bitrate of the MJPG stream used for still pictures (bit/sec).
+
   int32 exposure = 3; // Shutter speed  (1/10000 * s), -1 for automatic exposure.
   int32 white_balance = 4; // White balance temperature (2800..9300), -1 for automatic white balance.
   int32 hue = 5; // Hue (-40..40), 0 as default.
 
   float gain = 9; // Iso gain (0..1).
 
-  Resolution resolution = 6; // Stream, recording and image resolution.
+  Resolution resolution = 6; // Stream, recording and image resolution (deprecated).
+  Resolution stream_resolution = 10; // Stream resolution.
+  Resolution recording_resolution = 11; // Recording and image resolution.
   Framerate framerate = 7; // Stream and recording framerate.
   Camera camera = 8; // Which camera the parameters belong to.
 }