Cull unnecessary media::VideoFrame::Formats from the enum.

remoting/base/encoder_row_based.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 "remoting/base/encoder_row_based.h"
 
 #include "base/logging.h"
 #include "remoting/base/capture_data.h"
 #include "remoting/base/compressor_verbatim.h"
 #include "remoting/base/compressor_zlib.h"
@@ skipping 62 matching lines @@
     iter.next();
     EncodeRect(rect, iter.done());
   }
 
   capture_data_ = NULL;
   callback_.Reset();
 }
 
 void EncoderRowBased::EncodeRect(const SkIRect& rect, bool last) {
   CHECK(capture_data_->data_planes().data[0]);
+  CHECK_EQ(capture_data_->pixel_format(), media::VideoFrame::RGB32);
   const int strides = capture_data_->data_planes().strides[0];
-  const int bytes_per_pixel = GetBytesPerPixel(capture_data_->pixel_format());
+  const int bytes_per_pixel = 4;

[scherkus (not reviewing), 2012/04/10 21:32:31]

doesn't VideoFrame offer this info?

[Ami GONE FROM CHROMIUM, 2012/04/10 22:01:07]

Only as row_bytes(0)/width(), and I didn't think that's better than this.

[scherkus (not reviewing), 2012/04/10 22:05:39]

that's what I thought :\

SGTM

   const int row_size = bytes_per_pixel * rect.width();
 
   compressor_->Reset();
 
   scoped_ptr<VideoPacket> packet(new VideoPacket());
   PrepareUpdateStart(rect, packet.get());
   const uint8* in = capture_data_->data_planes().data[0] +
       rect.fTop * strides + rect.fLeft * bytes_per_pixel;
   // TODO(hclam): Fill in the sequence number.
   uint8* out = GetOutputBuffer(packet.get(), packet_size_);
@@ skipping 67 matching lines @@
 }
 
 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()));
 }
 
 }  // namespace remoting