summaryrefslogtreecommitdiffstats
path: root/remoting/base/decoder_row_based.cc
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.cc
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.cc')
-rw-r--r--remoting/base/decoder_row_based.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/remoting/base/decoder_row_based.cc b/remoting/base/decoder_row_based.cc
index d378e96..65c74c5 100644
--- a/remoting/base/decoder_row_based.cc
+++ b/remoting/base/decoder_row_based.cc
@@ -12,17 +12,15 @@
namespace remoting {
DecoderRowBased* DecoderRowBased::CreateZlibDecoder() {
- return new DecoderRowBased(new DecompressorZlib(),
- VideoPacketFormat::ENCODING_ZLIB);
+ return new DecoderRowBased(new DecompressorZlib(), EncodingZlib);
}
DecoderRowBased* DecoderRowBased::CreateVerbatimDecoder() {
- return new DecoderRowBased(new DecompressorVerbatim(),
- VideoPacketFormat::ENCODING_VERBATIM);
+ return new DecoderRowBased(new DecompressorVerbatim(), EncodingNone);
}
DecoderRowBased::DecoderRowBased(Decompressor* decompressor,
- VideoPacketFormat::Encoding encoding)
+ UpdateStreamEncoding encoding)
: state_(kUninitialized),
decompressor_(decompressor),
encoding_(encoding),
@@ -54,7 +52,7 @@ void DecoderRowBased::Initialize(scoped_refptr<media::VideoFrame> frame,
// Make sure we are not currently initialized.
CHECK_EQ(kUninitialized, state_);
- if (static_cast<PixelFormat>(frame->format()) != PIXEL_FORMAT_RGB32) {
+ if (static_cast<PixelFormat>(frame->format()) != PixelFormatRgb32) {
LOG(WARNING) << "DecoderRowBased only supports RGB32.";
state_ = kError;
return;