summaryrefslogtreecommitdiffstats
path: root/remoting/base/encoder.h
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 01:08:19 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 01:08:19 +0000
commit04b36141e7b2b1540b1b84a039f6d078ca770442 (patch)
treeae3b109a5c603c3382a5ae5555d599599a59d03f /remoting/base/encoder.h
parent21a7127af3e46e81d1f2eccf9dccfb8b394d8688 (diff)
downloadchromium_src-04b36141e7b2b1540b1b84a039f6d078ca770442.zip
chromium_src-04b36141e7b2b1540b1b84a039f6d078ca770442.tar.gz
chromium_src-04b36141e7b2b1540b1b84a039f6d078ca770442.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base/encoder.h')
-rw-r--r--remoting/base/encoder.h13
1 files changed, 1 insertions, 12 deletions
diff --git a/remoting/base/encoder.h b/remoting/base/encoder.h
index f9d4043..05e40ff 100644
--- a/remoting/base/encoder.h
+++ b/remoting/base/encoder.h
@@ -25,23 +25,12 @@ class CaptureData;
class Encoder {
public:
- // EncodingState is a bitfield that tracks the state of the encoding.
- // An encoding that consists of a single block could concievably be starting
- // inprogress and ended at the same time.
- enum {
- EncodingStarting = 1 << 0,
- EncodingInProgress = 1 << 1,
- EncodingEnded = 1 << 2
- };
- typedef int EncodingState;
-
// DataAvailableCallback is called as blocks of data are made available
// from the encoder. Data made available by the encoder is in the form
// of HostMessage to reduce the amount of memory copies.
// The callback takes ownership of the HostMessage and is responsible for
// deleting it.
- typedef Callback2<ChromotingHostMessage*,
- EncodingState>::Type DataAvailableCallback;
+ typedef Callback1<VideoPacket*>::Type DataAvailableCallback;
virtual ~Encoder() {}