summaryrefslogtreecommitdiffstats
path: root/remoting/base/decoder_row_based.h
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-01 23:02:41 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-01 23:02:41 +0000
commitf2333df090cf3f00846d2ce3ffe41119718d3cc8 (patch)
treef0c381736c9e123e33a3289a06689028268be1bf /remoting/base/decoder_row_based.h
parentc64eb4096d30f3018ccd75d076fb90304f0143b7 (diff)
downloadchromium_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/base/decoder_row_based.h')
-rw-r--r--remoting/base/decoder_row_based.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/remoting/base/decoder_row_based.h b/remoting/base/decoder_row_based.h
index 2deb897..c226db2 100644
--- a/remoting/base/decoder_row_based.h
+++ b/remoting/base/decoder_row_based.h
@@ -24,7 +24,7 @@ class DecoderRowBased : public Decoder {
virtual void Initialize(scoped_refptr<media::VideoFrame> frame,
const gfx::Rect& clip, int bytes_per_src_pixel);
virtual void DecodeBytes(const std::string& encoded_bytes);
- virtual VideoPacketFormat::Encoding Encoding() { return encoding_; }
+ virtual UpdateStreamEncoding Encoding() { return encoding_; }
// TODO(hclam): Should make this into the Decoder interface.
// TODO(ajwong): Before putting into the interface, we should decide if the
@@ -32,8 +32,7 @@ class DecoderRowBased : public Decoder {
void set_reverse_rows(bool reverse) { reverse_rows_ = reverse; }
private:
- DecoderRowBased(Decompressor* decompressor,
- VideoPacketFormat::Encoding encoding);
+ DecoderRowBased(Decompressor* decompressor, UpdateStreamEncoding encoding);
enum State {
kUninitialized,
@@ -54,7 +53,7 @@ class DecoderRowBased : public Decoder {
scoped_ptr<Decompressor> decompressor_;
// The encoding of the incoming stream.
- VideoPacketFormat::Encoding encoding_;
+ UpdateStreamEncoding encoding_;
// Number of bytes per pixel from source stream.
int bytes_per_src_pixel_;