diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-06 21:55:37 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-06 21:55:37 +0000 |
| commit | 136279fd5c87eeac5d5566219ff01551deff9aac (patch) | |
| tree | 77822ef14e0a29a1fd8df6f0a3bba91f369205cb | |
| parent | d07688cdf024119677c27c62c665ecd050e5c96d (diff) | |
| download | chromium_src-136279fd5c87eeac5d5566219ff01551deff9aac.zip chromium_src-136279fd5c87eeac5d5566219ff01551deff9aac.tar.gz chromium_src-136279fd5c87eeac5d5566219ff01551deff9aac.tar.bz2 | |
Revert 68384: Landed with incorrect commit message.
Refactor ZLib and Verbatim encoders.
Added EncoderRowBased that implements encoding for both ZLib and Verbatim.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/5382008
TBR=sergeyu@chromium.org
Review URL: http://codereview.chromium.org/5586006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68385 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | remoting/base/encoder_vp8.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/remoting/base/encoder_vp8.cc b/remoting/base/encoder_vp8.cc index 61883e2..dd85fb2 100644 --- a/remoting/base/encoder_vp8.cc +++ b/remoting/base/encoder_vp8.cc @@ -126,13 +126,13 @@ bool EncoderVp8::PrepareImage(scoped_refptr<CaptureData> capture_data) { for (int j = 0; j < capture_data->width(); ++j) { // Since the input pixel format is RGB32, there are 4 bytes per pixel. uint8* pixel = in + 4 * j; - y_out[j] = clip_byte(((pixel[2] * 66 + pixel[1] * 129 + - pixel[0] * 25 + 128) >> 8) + 16); + y_out[j] = clip_byte(((pixel[0] * 66 + pixel[1] * 129 + + pixel[2] * 25 + 128) >> 8) + 16); if (i % 2 == 0 && j % 2 == 0) { - u_out[j / 2] = clip_byte(((pixel[2] * -38 + pixel[1] * -74 + - pixel[0] * 112 + 128) >> 8) + 128); - v_out[j / 2] = clip_byte(((pixel[2] * 112 + pixel[1] * -94 + - pixel[1] * -18 + 128) >> 8) + 128); + u_out[j / 2] = clip_byte(((pixel[0] * -38 + pixel[1] * -74 + + pixel[2] * 112 + 128) >> 8) + 128); + v_out[j / 2] = clip_byte(((pixel[0] * 112 + pixel[1] * -94 + + pixel[2] * -18 + 128) >> 8) + 128); } } in += in_stride; |