From 4d9146bbb18efbcbc44a5df8bd77f8b9456b41b8 Mon Sep 17 00:00:00 2001
From: Frank Barchard <fbarchard@google.com>
Date: Mon, 11 Jul 2016 11:37:51 -0700
Subject: [PATCH] include planar functions and convert_argb for webrtc

webrtc doesnt include the headers that the functions are prototyped in.
This CL makes the convert.h include those headers to allow webrtc to
update to the head libyuv.

TBR=harryjin@google.com
BUG=libyuv:620,webrtc:6091,webrtc:6094
TESTED=local build and try bots

Review URL: https://codereview.chromium.org/2141683002 .
---
 README.chromium          |  2 +-
 include/libyuv/convert.h | 15 +++++----------
 include/libyuv/version.h |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/README.chromium b/README.chromium
index 19c47cf2a..858692b3c 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1604
+Version: 1605
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/convert.h b/include/libyuv/convert.h
index 7750cbe3f..a026385f6 100644
--- a/include/libyuv/convert.h
+++ b/include/libyuv/convert.h
@@ -15,6 +15,11 @@
 
 #include "libyuv/rotate.h"  // For enum RotationMode.
 
+// TODO(fbarchard): fix WebRTC source to include following libyuv headers:
+#include "libyuv/convert_argb.h"  // For WebRTC I420ToARGB. b/620
+#include "libyuv/convert_from.h"  // For WebRTC ConvertFromI420. b/620
+#include "libyuv/planar_functions.h"  // For WebRTC I420Rect, CopyPlane. b/618
+
 #ifdef __cplusplus
 namespace libyuv {
 extern "C" {
@@ -185,16 +190,6 @@ int ARGB4444ToI420(const uint8* src_frame, int src_stride_frame,
                    uint8* dst_v, int dst_stride_v,
                    int width, int height);
 
-// Draw a rectangle into I420.
-// TODO(fbarchard): add planar_functions.h to webrtc includes
-// https://bugs.chromium.org/p/libyuv/issues/detail?id=618
-LIBYUV_API
-int I420Rect(uint8* dst_y, int dst_stride_y,
-             uint8* dst_u, int dst_stride_u,
-             uint8* dst_v, int dst_stride_v,
-             int x, int y, int width, int height,
-             int value_y, int value_u, int value_v);
-
 #ifdef HAVE_JPEG
 // src_width/height provided by capture.
 // dst_width/height for clipping determine final size.
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 1864bc4ba..0b3945569 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1604
+#define LIBYUV_VERSION 1605
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT