Refactor ZLib and Verbatim encoders.

remoting/base/encoder_row_based.cc

Index: remoting/base/encoder_row_based.cc
diff --git a/remoting/base/encoder_zlib.cc b/remoting/base/encoder_row_based.cc
similarity index 54%
rename from remoting/base/encoder_zlib.cc
rename to remoting/base/encoder_row_based.cc
index 5fc1afebcf3c7347afe8298d7de8c6ec920e27f2..a7919e157e02dd4bf966ecc2c2aee512b9f98202 100644
--- a/remoting/base/encoder_zlib.cc
+++ b/remoting/base/encoder_row_based.cc
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/base/encoder_zlib.h"
+#include "remoting/base/encoder_row_based.h"
 
 #include "base/logging.h"
 #include "gfx/rect.h"
 #include "remoting/base/capture_data.h"
+#include "remoting/base/compressor_verbatim.h"
 #include "remoting/base/compressor_zlib.h"
 #include "remoting/base/util.h"
 #include "remoting/proto/video.pb.h"
@@ -15,52 +16,70 @@ namespace remoting {
 
 static const int kPacketSize = 1024 * 1024;
 
-EncoderZlib::EncoderZlib() : packet_size_(kPacketSize) {
+EncoderRowBased* EncoderRowBased::CreateZlibEncoder() {
+  return new EncoderRowBased(new CompressorZlib(),
+                             VideoPacketFormat::ENCODING_ZLIB);
 }
 
-EncoderZlib::EncoderZlib(int packet_size) : packet_size_(packet_size) {
+EncoderRowBased* EncoderRowBased::CreateVerbatimEncoder() {
+  return new EncoderRowBased(new CompressorVerbatim(),
+                             VideoPacketFormat::ENCODING_VERBATIM);
 }
 
-EncoderZlib::~EncoderZlib() {}
+EncoderRowBased::EncoderRowBased(Compressor* compressor,
+                                 VideoPacketFormat::Encoding encoding)
+    : encoding_(encoding),
+      compressor_(compressor),
+      packet_size_(kPacketSize) {
+}
+
+EncoderRowBased::EncoderRowBased(Compressor* compressor,
+                                 VideoPacketFormat::Encoding encoding,
+                                 int packet_size)
+    : encoding_(encoding),
+      compressor_(compressor),
+      packet_size_(packet_size) {
+}
+
+EncoderRowBased::~EncoderRowBased() {}
 
-void EncoderZlib::Encode(scoped_refptr<CaptureData> capture_data,
-                         bool key_frame,
-                         DataAvailableCallback* data_available_callback) {
+void EncoderRowBased::Encode(scoped_refptr<CaptureData> capture_data,
+                             bool key_frame,
+                             DataAvailableCallback* data_available_callback) {
   CHECK(capture_data->pixel_format() == media::VideoFrame::RGB32)
-      << "Zlib Encoder only works with RGB32. Got "
+      << "RowBased Encoder only works with RGB32. Got "
       << capture_data->pixel_format();
   capture_data_ = capture_data;
   callback_.reset(data_available_callback);
 
-  CompressorZlib compressor;
   const InvalidRects& rects = capture_data->dirty_rects();
   int index = 0;
   for (InvalidRects::const_iterator r = rects.begin();
-      r != rects.end(); ++r, ++index) {
-    EncodeRect(&compressor, *r, index);
+       r != rects.end(); ++r, ++index) {
+    EncodeRect(*r, index);
   }
 
   capture_data_ = NULL;
   callback_.reset();
 }
 
-void EncoderZlib::EncodeRect(CompressorZlib* compressor,
-                             const gfx::Rect& rect, size_t rect_index) {
+void EncoderRowBased::EncodeRect(const gfx::Rect& rect, size_t rect_index) {
   CHECK(capture_data_->data_planes().data[0]);
   const int strides = capture_data_->data_planes().strides[0];
   const int bytes_per_pixel = GetBytesPerPixel(capture_data_->pixel_format());
   const int row_size = bytes_per_pixel * rect.width();
 
+  compressor_->Reset();
+
   VideoPacket* packet = new VideoPacket();
   PrepareUpdateStart(rect, packet);
   const uint8* in = capture_data_->data_planes().data[0] +
-                    rect.y() * strides +
-                    rect.x() * bytes_per_pixel;
+      rect.y() * strides + rect.x() * bytes_per_pixel;
   // TODO(hclam): Fill in the sequence number.
   uint8* out = GetOutputBuffer(packet, packet_size_);
   int filled = 0;
-  int row_x = 0;
-  int row_y = 0;
+  int row_pos = 0;  // Position in the current row in bytes.
+  int row_y = 0;  // Current row.
   bool compress_again = true;
   while (compress_again) {
     // Prepare a message for sending out.
@@ -72,63 +91,58 @@ void EncoderZlib::EncodeRect(CompressorZlib* compressor,
 
     Compressor::CompressorFlush flush = Compressor::CompressorNoFlush;
     if (row_y == rect.height() - 1) {
-      if (rect_index == capture_data_->dirty_rects().size() - 1) {
-        flush = Compressor::CompressorFinish;
-      } else {
-        flush = Compressor::CompressorSyncFlush;
-      }
+      flush = Compressor::CompressorFinish;
     }
 
     int consumed = 0;
     int written = 0;
-    compress_again = compressor->Process(in + row_x, row_size - row_x,
-                                         out + filled, packet_size_ - filled,
-                                         flush, &consumed, &written);
-    row_x += consumed;
+    compress_again = compressor_->Process(in + row_pos, row_size - row_pos,
+                                          out + filled, packet_size_ - filled,
+                                          flush, &consumed, &written);
+    row_pos += consumed;
     filled += written;
 
     // We have reached the end of stream.
     if (!compress_again) {
       packet->set_flags(packet->flags() | VideoPacket::LAST_PACKET);
+      DCHECK(row_pos == row_size);
+      DCHECK(row_y == rect.height() - 1);
     }
 
     // If we have filled the message or we have reached the end of stream.
     if (filled == packet_size_ || !compress_again) {
       packet->mutable_data()->resize(filled);
-      SubmitMessage(packet, rect_index);
+      callback_->Run(packet);
       packet = NULL;
     }
 
     // Reached the end of input row and we're not at the last row.
-    if (row_x == row_size && row_y < rect.height() - 1) {
-      row_x = 0;
+    if (row_pos == row_size && row_y < rect.height() - 1) {
+      row_pos = 0;
       in += strides;
       ++row_y;
     }
   }
 }
 
-void EncoderZlib::PrepareUpdateStart(const gfx::Rect& rect,
-                                     VideoPacket* packet) {
+void EncoderRowBased::PrepareUpdateStart(const gfx::Rect& rect,
+                                         VideoPacket* packet) {
   packet->set_flags(packet->flags() | VideoPacket::FIRST_PACKET);
-  VideoPacketFormat* format = packet->mutable_format();
 
+  VideoPacketFormat* format = packet->mutable_format();
   format->set_x(rect.x());
   format->set_y(rect.y());
   format->set_width(rect.width());
   format->set_height(rect.height());
-  format->set_encoding(VideoPacketFormat::ENCODING_ZLIB);
+  format->set_encoding(encoding_);
 }
 
-uint8* EncoderZlib::GetOutputBuffer(VideoPacket* packet, size_t size) {
+uint8* EncoderRowBased::GetOutputBuffer(VideoPacket* packet, size_t size) {
   packet->mutable_data()->resize(size);
   // TODO(ajwong): Is there a better way to do this at all???
   return const_cast<uint8*>(reinterpret_cast<const uint8*>(
       packet->mutable_data()->data()));
 }
 
-void EncoderZlib::SubmitMessage(VideoPacket* packet, size_t rect_index) {
-  callback_->Run(packet);
-}
 
 }  // namespace remoting