Simplify VideoEncoder interface.

This should also avoid assert in the linked bug.

BUG=284775
R=wez@chromium.org

Review URL: https://codereview.chromium.org/23477059

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223152 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 44 deletions

diff --git a/remoting/proto/video.proto b/remoting/proto/video.proto
index b412857..0ee5c97 100644
--- a/remoting/proto/video.proto
+++ b/remoting/proto/video.proto
@@ -19,17 +19,9 @@ message VideoPacketFormat {
     ENCODING_VP8 = 2;
   };
 
-  // X,Y coordinates (in screen pixels) for origin of this update.
-  optional int32 x = 1;
-  optional int32 y = 2;
-
-  // Width, height (in screen pixels) for this update.
-  optional int32 width = 3;
-  optional int32 height = 4;
-
   // The encoding used for this image update.
   optional Encoding encoding = 5 [default = ENCODING_INVALID];
-  
+
   // Width and height of the whole screen.
   optional int32 screen_width = 6;
   optional int32 screen_height = 7;
@@ -49,45 +41,14 @@ message Rect {
 }
 
 message VideoPacket {
-  // Bitmasks for use in the flags field below.
-  //
-  // The encoder may fragment one update into multiple partitions.
-  // Each partition may be divided into multiple packets depending on
-  // how the encoder outputs data. Thus, one update can logically
-  // consist of multiple packets. The FIRST_PACKET and LAST_PACKET
-  // flags are used to indicate the start and end of a partition. The
-  // LAST_PARTITION flag is set for the last packet in the last
-  // partition. Here are notable consequences:
-  //  * Both FIRST_PACKET and LAST_PACKET may be set if an update is only
-  //    one packet long.
-  //  * The VideoPacketFormat is only supplied in a FIRST_PACKET.
-  //  * LAST_PARTITION can be set only in packet that has LAST_PACKET set.
-  //  * An local update cannot change format between a FIRST_PACKET and
-  //    a LAST_PACKET.
-  //  * All packets in one logical update must be processed in order, and
-  //    packets may not be skipped.
-  enum Flags {
-    FIRST_PACKET = 1;
-    LAST_PACKET = 2;
-    LAST_PARTITION = 4;
-  }
-  optional int32 flags = 1 [default = 0];
-
-  // The sequence number of the partial data for updating a rectangle.
-  optional int32 sequence_number = 2 [default = 0];
-
-  optional int32 timestamp = 3 [default = 0];
-
-  // This is provided on the first packet of the rectangle data, when
-  // the flags has FIRST_PACKET set.
+  // Deprecated. Must be set to 7 for backward compatibility.
+  optional int32 deprecated_flags = 1 [default = 7];
+
   optional VideoPacketFormat format = 4;
 
   optional bytes data = 5;
 
-  // This field is only for VP8 to provide out-of-band information of dirty
-  // rects.
-  // TODO(hclam): Remove this field when we can obtain this information from
-  // libvpx.
+  // List of rectangles updated by this frame.
   repeated Rect dirty_rects = 6;
 
   // Time in milliseconds spent in capturing this video frame.