Renamed Decoder -> VideoDecoder.

remoting/codec/codec_test.cc

 // Copyright (c) 2012 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 <deque>
 #include <stdlib.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 112 matching lines @@
   int end_rect_;
   int added_rects_;
   State state_;
   bool strict_;
 
   std::deque<SkIRect> rects_;
 
   DISALLOW_COPY_AND_ASSIGN(EncoderMessageTester);
 };
 
-class DecoderTester {
+class VideoDecoderTester {
  public:
-  DecoderTester(Decoder* decoder, const SkISize& screen_size,
-                const SkISize& view_size)
+  VideoDecoderTester(VideoDecoder* decoder, const SkISize& screen_size,
+                     const SkISize& view_size)
       : screen_size_(screen_size),
         view_size_(view_size),
         strict_(false),
         decoder_(decoder) {
     image_data_.reset(new uint8[
         view_size_.width() * view_size_.height() * kBytesPerPixel]);
     EXPECT_TRUE(image_data_.get());
     decoder_->Initialize(screen_size_);
   }
 
   void Reset() {
     expected_region_.setEmpty();
     update_region_.setEmpty();
   }
 
   void ResetRenderedData() {
     memset(image_data_.get(), 0,
            view_size_.width() * view_size_.height() * kBytesPerPixel);
   }
 
   void ReceivedPacket(VideoPacket* packet) {
-    Decoder::DecodeResult result = decoder_->DecodePacket(packet);
+    VideoDecoder::DecodeResult result = decoder_->DecodePacket(packet);
 
-    ASSERT_NE(Decoder::DECODE_ERROR, result);
+    ASSERT_NE(VideoDecoder::DECODE_ERROR, result);
 
-    if (result == Decoder::DECODE_DONE) {
+    if (result == VideoDecoder::DECODE_DONE) {
       RenderFrame();
     }
   }
 
   void RenderFrame() {
     decoder_->RenderFrame(view_size_,
                           SkIRect::MakeSize(view_size_),
                           image_data_.get(),
                           view_size_.width() * kBytesPerPixel,
                           &update_region_);
@@ skipping 90 matching lines @@
     decoded++;
     return sqrt(error_sum_squares / 3.0);
   }
 
  private:
   SkISize screen_size_;
   SkISize view_size_;
   bool strict_;
   SkRegion expected_region_;
   SkRegion update_region_;
-  Decoder* decoder_;
+  VideoDecoder* decoder_;
   scoped_array<uint8> image_data_;
   scoped_refptr<CaptureData> capture_data_;
 
-  DISALLOW_COPY_AND_ASSIGN(DecoderTester);
+  DISALLOW_COPY_AND_ASSIGN(VideoDecoderTester);
 };
 
 // The EncoderTester provides a hook for retrieving the data, and passing the
 // message to other subprograms for validaton.
 class EncoderTester {
  public:
   EncoderTester(EncoderMessageTester* message_tester)
       : message_tester_(message_tester),
         decoder_tester_(NULL),
         data_available_(0) {
   }
 
   ~EncoderTester() {
     EXPECT_GT(data_available_, 0);
   }
 
   void DataAvailable(scoped_ptr<VideoPacket> packet) {
     ++data_available_;
     message_tester_->ReceivedPacket(packet.get());
 
-    // Send the message to the DecoderTester.
+    // Send the message to the VideoDecoderTester.
     if (decoder_tester_) {
       decoder_tester_->ReceivedPacket(packet.get());
     }
   }
 
   void AddRects(const SkIRect* rects, int count) {
     message_tester_->AddRects(rects, count);
   }
 
-  void set_decoder_tester(DecoderTester* decoder_tester) {
+  void set_decoder_tester(VideoDecoderTester* decoder_tester) {
     decoder_tester_ = decoder_tester;
   }
 
  private:
   EncoderMessageTester* message_tester_;
-  DecoderTester* decoder_tester_;
+  VideoDecoderTester* decoder_tester_;
   int data_available_;
 
   DISALLOW_COPY_AND_ASSIGN(EncoderTester);
 };
 
 scoped_refptr<CaptureData> PrepareEncodeData(const SkISize& size,
                                              media::VideoFrame::Format format,
                                              uint8** memory) {
   // TODO(hclam): Support also YUV format.
   CHECK_EQ(format, media::VideoFrame::RGB32);
@@ skipping 46 matching lines @@
   std::vector<std::vector<SkIRect> > test_rect_lists = MakeTestRectLists(kSize);
   for (size_t i = 0; i < test_rect_lists.size(); ++i) {
     const std::vector<SkIRect>& test_rects = test_rect_lists[i];
     TestEncodingRects(encoder, &tester, data,
                       &test_rects[0], test_rects.size());
   }
 }
 
 static void TestEncodeDecodeRects(Encoder* encoder,
                                   EncoderTester* encoder_tester,
-                                  DecoderTester* decoder_tester,
+                                  VideoDecoderTester* decoder_tester,
                                   scoped_refptr<CaptureData> data,
                                   const SkIRect* rects, int count) {
   data->mutable_dirty_region().setRects(rects, count);
   encoder_tester->AddRects(rects, count);
   decoder_tester->AddRects(rects, count);
 
   // Generate random data for the updated region.
   srand(0);
   for (int i = 0; i < count; ++i) {
     CHECK_EQ(data->pixel_format(), media::VideoFrame::RGB32);
     const int bytes_per_pixel = 4;  // Because of RGB32 on previous line.
     const int row_size = bytes_per_pixel * rects[i].width();
     uint8* memory = data->data_planes().data[0] +
       data->data_planes().strides[0] * rects[i].top() +
       bytes_per_pixel * rects[i].left();
     for (int y = 0; y < rects[i].height(); ++y) {
       for (int x = 0; x < row_size; ++x)
         memory[x] = rand() % 256;
       memory += data->data_planes().strides[0];
     }
   }
 
   encoder->Encode(data, true, base::Bind(&EncoderTester::DataAvailable,
                                          base::Unretained(encoder_tester)));
   decoder_tester->VerifyResults();
   decoder_tester->Reset();
 }
 
-void TestEncoderDecoder(Encoder* encoder, Decoder* decoder, bool strict) {
+void TestEncoderDecoder(Encoder* encoder, VideoDecoder* decoder, bool strict) {
   SkISize kSize = SkISize::Make(320, 240);
 
   EncoderMessageTester message_tester;
   message_tester.set_strict(strict);
 
   EncoderTester encoder_tester(&message_tester);
 
   uint8* memory;
   scoped_refptr<CaptureData> data =
       PrepareEncodeData(kSize, media::VideoFrame::RGB32, &memory);
   scoped_array<uint8> memory_wrapper(memory);
 
-  DecoderTester decoder_tester(decoder, kSize, kSize);
+  VideoDecoderTester decoder_tester(decoder, kSize, kSize);
   decoder_tester.set_strict(strict);
   decoder_tester.set_capture_data(data);
   encoder_tester.set_decoder_tester(&decoder_tester);
 
   std::vector<std::vector<SkIRect> > test_rect_lists = MakeTestRectLists(kSize);
   for (size_t i = 0; i < test_rect_lists.size(); ++i) {
     const std::vector<SkIRect> test_rects = test_rect_lists[i];
     TestEncodeDecodeRects(encoder, &encoder_tester, &decoder_tester, data,
                           &test_rects[0], test_rects.size());
   }
 }
 
 static void FillWithGradient(uint8* memory, const SkISize& frame_size,
                              const SkIRect& rect) {
   for (int j = rect.top(); j < rect.bottom(); ++j) {
     uint8* p = memory + ((j * frame_size.width()) + rect.left()) * 4;
     for (int i = rect.left(); i < rect.right(); ++i) {
       *p++ = static_cast<uint8>((255.0 * i) / frame_size.width());
       *p++ = static_cast<uint8>((164.0 * j) / frame_size.height());
       *p++ = static_cast<uint8>((82.0 * (i + j)) /
                                    (frame_size.width() + frame_size.height()));
       *p++ = 0;
     }
   }
 }
 
 void TestEncoderDecoderGradient(Encoder* encoder,
-                                Decoder* decoder,
+                                VideoDecoder* decoder,
                                 const SkISize& screen_size,
                                 const SkISize& view_size,
                                 double max_error_limit,
                                 double mean_error_limit) {
   SkIRect screen_rect = SkIRect::MakeSize(screen_size);
   scoped_array<uint8> screen_data(new uint8[
       screen_size.width() * screen_size.height() * kBytesPerPixel]);
   FillWithGradient(screen_data.get(), screen_size, screen_rect);
 
   SkIRect view_rect = SkIRect::MakeSize(view_size);
   scoped_array<uint8> expected_view_data(new uint8[
       view_size.width() * view_size.height() * kBytesPerPixel]);
   FillWithGradient(expected_view_data.get(), view_size, view_rect);
 
   DataPlanes planes;
   memset(planes.data, 0, sizeof(planes.data));
   memset(planes.strides, 0, sizeof(planes.strides));
   planes.data[0] = screen_data.get();
   planes.strides[0] = screen_size.width() * kBytesPerPixel;
 
   scoped_refptr<CaptureData> capture_data =
       new CaptureData(planes, screen_size, media::VideoFrame::RGB32);
   capture_data->mutable_dirty_region().op(screen_rect, SkRegion::kUnion_Op);
 
-  DecoderTester decoder_tester(decoder, screen_size, view_size);
+  VideoDecoderTester decoder_tester(decoder, screen_size, view_size);
   decoder_tester.set_capture_data(capture_data);
   decoder_tester.AddRegion(capture_data->dirty_region());
 
   encoder->Encode(capture_data, true,
-                  base::Bind(&DecoderTester::ReceivedScopedPacket,
+                  base::Bind(&VideoDecoderTester::ReceivedScopedPacket,
                              base::Unretained(&decoder_tester)));
 
   decoder_tester.VerifyResultsApprox(expected_view_data.get(),
                                      max_error_limit, mean_error_limit);
 
   // Check that the decoder correctly re-renders the frame if its client
   // invalidates the frame.
   decoder_tester.ResetRenderedData();
   decoder->Invalidate(view_size, SkRegion(view_rect));
   decoder_tester.RenderFrame();
   decoder_tester.VerifyResultsApprox(expected_view_data.get(),
                                      max_error_limit, mean_error_limit);
 }
 
 }  // namespace remoting