diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 01:08:19 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 01:08:19 +0000 |
commit | 04b36141e7b2b1540b1b84a039f6d078ca770442 (patch) | |
tree | ae3b109a5c603c3382a5ae5555d599599a59d03f /remoting/base/decoder_row_based.h | |
parent | 21a7127af3e46e81d1f2eccf9dccfb8b394d8688 (diff) | |
download | chromium_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/decoder_row_based.h')
-rw-r--r-- | remoting/base/decoder_row_based.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/remoting/base/decoder_row_based.h b/remoting/base/decoder_row_based.h index c226db2..2deb897 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 UpdateStreamEncoding Encoding() { return encoding_; } + virtual VideoPacketFormat::Encoding 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,7 +32,8 @@ class DecoderRowBased : public Decoder { void set_reverse_rows(bool reverse) { reverse_rows_ = reverse; } private: - DecoderRowBased(Decompressor* decompressor, UpdateStreamEncoding encoding); + DecoderRowBased(Decompressor* decompressor, + VideoPacketFormat::Encoding encoding); enum State { kUninitialized, @@ -53,7 +54,7 @@ class DecoderRowBased : public Decoder { scoped_ptr<Decompressor> decompressor_; // The encoding of the incoming stream. - UpdateStreamEncoding encoding_; + VideoPacketFormat::Encoding encoding_; // Number of bytes per pixel from source stream. int bytes_per_src_pixel_; |