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

remoting/base/decoder_row_based.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/base/decoder_row_based.h"
 
 #include "remoting/base/decompressor.h"
 #include "remoting/base/decompressor_zlib.h"
 #include "remoting/base/decompressor_verbatim.h"
 #include "remoting/base/util.h"
 
 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),
       bytes_per_src_pixel_(0),
       row_pos_(0),
       row_y_(0),
       // TODO(hclam): We should use the information from the update stream
       // to determine whether we should reverse the rows or not.
       // But for simplicity we set to be always true.
       reverse_rows_(true) {
@@ skipping 11 matching lines @@
 bool DecoderRowBased::IsReadyForData() {
   return state_ == kReady;
 }
 
 void DecoderRowBased::Initialize(scoped_refptr<media::VideoFrame> frame,
                                  const gfx::Rect& clip,
                                  int bytes_per_src_pixel) {
   // 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;
   }
 
   frame_ = frame;
 
   // Reset the buffer location status variables.
   clip_ = clip;
   row_pos_ = 0;
@@ skipping 42 matching lines @@
     // If this row is completely filled then move onto the next row.
     if (row_pos_ == row_size) {
       ++row_y_;
       row_pos_ = 0;
       out += stride;
     }
   }
 }
 
 }  // namespace remoting