diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 23:22:20 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 23:22:20 +0000 |
| commit | 3adf1b2a65a85ff7d4b55cd57a4e400f104d27dd (patch) | |
| tree | 235aee1f595583297e057b058a29d2ed24d9da92 /remoting/base/encoder_zlib.cc | |
| parent | 9db9173baebf27623ce30770696f84a3fec74259 (diff) | |
| download | chromium_src-3adf1b2a65a85ff7d4b55cd57a4e400f104d27dd.zip chromium_src-3adf1b2a65a85ff7d4b55cd57a4e400f104d27dd.tar.gz chromium_src-3adf1b2a65a85ff7d4b55cd57a4e400f104d27dd.tar.bz2 | |
Add VideoPacket struct for video packets. Refactor Decode interface to use it.
Various cleanups.
BUG=None
TEST=Unittests.
Review URL: http://codereview.chromium.org/4476003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base/encoder_zlib.cc')
| -rw-r--r-- | remoting/base/encoder_zlib.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/remoting/base/encoder_zlib.cc b/remoting/base/encoder_zlib.cc index e184fd3..5fc1afe 100644 --- a/remoting/base/encoder_zlib.cc +++ b/remoting/base/encoder_zlib.cc @@ -6,10 +6,10 @@ #include "base/logging.h" #include "gfx/rect.h" -#include "media/base/data_buffer.h" #include "remoting/base/capture_data.h" #include "remoting/base/compressor_zlib.h" #include "remoting/base/util.h" +#include "remoting/proto/video.pb.h" namespace remoting { @@ -26,7 +26,7 @@ EncoderZlib::~EncoderZlib() {} void EncoderZlib::Encode(scoped_refptr<CaptureData> capture_data, bool key_frame, DataAvailableCallback* data_available_callback) { - CHECK(capture_data->pixel_format() == PIXEL_FORMAT_RGB32) + CHECK(capture_data->pixel_format() == media::VideoFrame::RGB32) << "Zlib Encoder only works with RGB32. Got " << capture_data->pixel_format(); capture_data_ = capture_data; @@ -118,7 +118,6 @@ void EncoderZlib::PrepareUpdateStart(const gfx::Rect& rect, format->set_width(rect.width()); format->set_height(rect.height()); format->set_encoding(VideoPacketFormat::ENCODING_ZLIB); - format->set_pixel_format(capture_data_->pixel_format()); } uint8* EncoderZlib::GetOutputBuffer(VideoPacket* packet, size_t size) { |