Revert 64672 - Cleanups in the video encoding decoding code. Reenable VP8....

remoting/base/decoder_row_based.cc

Index: remoting/base/decoder_row_based.cc
===================================================================
--- remoting/base/decoder_row_based.cc	(revision 64676)
+++ remoting/base/decoder_row_based.cc	(working copy)
@@ -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 @@
   // 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;