Add VideoPacket struct for video packets. Refactor Decode interface to use it.

Various cleanups.
BUG=None
TEST=Unittests.

Review URL: http://codereview.chromium.org/4476003

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

2 files changed, 1 insertions, 28 deletions

diff --git a/remoting/proto/internal.proto b/remoting/proto/internal.proto
index fbe3181..7a8e908 100644
--- a/remoting/proto/internal.proto
+++ b/remoting/proto/internal.proto
@@ -6,6 +6,7 @@
 
 syntax = "proto2";
 
+import "control.proto";
 import "event.proto";
 import "video.proto";
 
@@ -13,14 +14,6 @@ option optimize_for = LITE_RUNTIME;
 
 package remoting;
 
-// Defines the message that is sent from the host to the client.
-// Only one of these messages should be present.
-// NEXT ID: 5
-message ChromotingHostMessage {
-  optional InitClientMessage init_client= 1;
-  optional VideoPacket video_packet = 2;
-}
-
 // Defines the message that is sent from the client to the host.
 // Only one of the optional messages should be present.
 // NEXT ID: 7
diff --git a/remoting/proto/video.proto b/remoting/proto/video.proto
index 963c118..b193461c 100644
--- a/remoting/proto/video.proto
+++ b/remoting/proto/video.proto
@@ -19,23 +19,6 @@ message InitClientMessage {
   required int32 height = 2;
 }
 
-// Identifies the pixel format.
-// Note that this list should match exactly the same as
-// media::VideoFrame::Format in media/base/video_frame.h.
-enum PixelFormat {
-  PIXEL_FORMAT_INVALID = 0;
-  PIXEL_FORMAT_RGB555 = 1;
-  PIXEL_FORMAT_RGB565 = 2;
-  PIXEL_FORMAT_RGB24 = 3;
-  PIXEL_FORMAT_RGB32 = 4;
-  PIXEL_FORMAT_RGBA = 5; 
-  PIXEL_FORMAT_YV12 = 6;
-  PIXEL_FORMAT_YV16 = 7;
-  PIXEL_FORMAT_NV12 = 8;
-  PIXEL_FORMAT_EMPTY = 9;
-  PIXEL_FORMAT_ASCII = 10;
-}
-
 // TODO(ajwong): Determine if these fields should be optional or required.
 message VideoPacketFormat {
   // Identifies how the image was encoded.
@@ -56,9 +39,6 @@ message VideoPacketFormat {
 
   // The encoding used for this image update.
   optional Encoding encoding = 5 [default = ENCODING_INVALID];
-
-  // The pixel format of this image.
-  optional PixelFormat pixel_format = 6 [default = PIXEL_FORMAT_RGB24];
 }
 
 message VideoPacket {