Improving the decoder pipeline.

remoting/base/util.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

[Wez, 2012/02/07 01:56:31]

This changes in this and util.cc look to be ones I've reviewd elsewhere, so I'm
skipping them.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_BASE_UTIL_H_
 #define REMOTING_BASE_UTIL_H_
 
 #include <string>
 
 #include "media/base/video_frame.h"
 #include "third_party/skia/include/core/SkRect.h"
 
 namespace remoting {
 
 // Return a string that contains the current date formatted as 'MMDD/HHMMSS:'.
 std::string GetTimestampString();
 
 // TODO(sergeyu): Move these methods to media.
 int GetBytesPerPixel(media::VideoFrame::Format format);
 
-// Convert YUV to RGB32 on a specific rectangle.
-void ConvertYUVToRGB32WithRect(const uint8* y_plane,
-                               const uint8* u_plane,
-                               const uint8* v_plane,
-                               uint8* rgb_plane,
-                               const SkIRect& rect,
-                               int y_stride,
-                               int uv_stride,
-                               int rgb_stride);
+// Convert and scale YUV to RGB32 on a specific rectangle. The source and
+// destination buffers are assumed to contain only |source_clip| and |dest_clip|
+// areas correspondingly. The scaling factor is determined as ratio between
+// |dest_size| and |source_size|. The target rectangle |dect_rect| is specified
+// in the destination coordinates.
+//
+// The routine DCHECKs that clipping boundaries are completely contained within
+// the corresponding images. It also DCHECKs that the source and target
+// rectangle fits the corresponding clipping areas.
+//
+// N.B. The function requires the top left corner of |dect_rect| to have even
+// X and Y coordinates.
+void ConvertAndScaleYUVToRGB32Rect(const uint8* source_yplane,
+                                   const uint8* source_uplane,
+                                   const uint8* source_vplane,
+                                   int source_ystride,
+                                   int source_uvstride,
+                                   const SkISize& source_size,
+                                   const SkIRect& source_clip,
+                                   uint8* dest_buffer,
+                                   int dest_stride,
+                                   const SkISize& dest_size,
+                                   const SkIRect& dest_clip,
+                                   const SkIRect& dest_rect);
 
+// Convert RGB32 to YUV on a specific rectangle.
 void ConvertRGB32ToYUVWithRect(const uint8* rgb_plane,
                                uint8* y_plane,
                                uint8* u_plane,
                                uint8* v_plane,
                                int x,
                                int y,
                                int width,
                                int height,
                                int rgb_stride,
                                int y_stride,
@@ skipping 12 matching lines @@
                   const SkISize& out_size);
 
 // Copy pixels in the rectangle from source to destination.
 void CopyRect(const uint8* src_plane,
               int src_plane_stride,
               uint8* dest_plane,
               int dest_plane_stride,
               int bytes_per_pixel,
               const SkIRect& rect);
 
+void CopyRGB32Rect(const uint8* source_buffer,
+                   int source_stride,
+                   const SkIRect& source_clip,
+                   uint8* dest_buffer,
+                   int dest_stride,
+                   const SkIRect& dest_clip,
+                   const SkIRect& dest_rect);
+
 }  // namespace remoting
 
 #endif  // REMOTING_BASE_UTIL_H_