diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 23:02:41 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 23:02:41 +0000 |
commit | f2333df090cf3f00846d2ce3ffe41119718d3cc8 (patch) | |
tree | f0c381736c9e123e33a3289a06689028268be1bf /remoting/proto/video.proto | |
parent | c64eb4096d30f3018ccd75d076fb90304f0143b7 (diff) | |
download | chromium_src-f2333df090cf3f00846d2ce3ffe41119718d3cc8.zip chromium_src-f2333df090cf3f00846d2ce3ffe41119718d3cc8.tar.gz chromium_src-f2333df090cf3f00846d2ce3ffe41119718d3cc8.tar.bz2 |
Revert 64672 - Cleanups in the video encoding decoding code. Reenable VP8.
1. Moved video-related protobuf messages from event.proto to video.proto. Removed those that we don't need anymore
2. Fixed naming for enums and some types.
3. Reenabled VP8.
4. Proper RGB-YUV converter for VP8 encoder.
5. Changed the capturer_fake to show more meaningful picture.
BUG=57374
TEST=unittests
Review URL: http://codereview.chromium.org/4136010
TBR=sergeyu@chromium.org
Review URL: http://codereview.chromium.org/4255001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/proto/video.proto')
-rw-r--r-- | remoting/proto/video.proto | 93 |
1 files changed, 0 insertions, 93 deletions
diff --git a/remoting/proto/video.proto b/remoting/proto/video.proto deleted file mode 100644 index c91a0a3..0000000 --- a/remoting/proto/video.proto +++ /dev/null @@ -1,93 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Protocol for video messages. - -syntax = "proto2"; - -option optimize_for = LITE_RUNTIME; - -package remoting; - -// A message that gets sent to the client after the client is connected to the -// host. It contains information that the client needs to know about the host. -// NEXT ID: 3 -// TODO(sergeyu): Move to the control channel. -message InitClientMessage { - required int32 width = 1; - 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. - enum Encoding { - ENCODING_INVALID = -1; - ENCODING_VERBATIM = 0; - ENCODING_ZLIB = 1; - 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]; - - // The pixel format of this image. - optional PixelFormat pixel_format = 6 [default = PIXEL_FORMAT_RGB24]; -} - -message VideoPacket { - // Bitmasks for use in the flags field below. - // - // The encoder may fragment one update 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 logical update. 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. - // * 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; - } - optional int32 flags = 1 [default = 0]; - - // The sequence number of the partial data for updating a rectangle. - optional int32 sequence_number = 2 [default = 0]; - - // This is provided on the first packet of the rectangle data, when - // the flags has FIRST_PACKET set. - optional VideoPacketFormat format = 3; - - optional bytes data = 4; -} |