From e52c0a1cdf980f6a4da0a3e2553bf12e4bff92f0 Mon Sep 17 00:00:00 2001
From: Riza Sulistyo <riza@teluu.com>
Date: Mon, 14 Jul 2014 02:37:06 +0000
Subject: Re #1776: Initial implementation of Libyuv wrapper. Supports:  -
 library detection via autoconf  - scaling and conversion function (from/to
 I420 or BGRA)

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4875 74dad513-b988-da41-8d7b-12977e46ad98
---
 pjmedia/build/Makefile       |  2 +-
 pjmedia/build/os-auto.mak.in | 10 ++++++++--
 pjmedia/build/pjmedia.vcproj |  4 ++++
 3 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'pjmedia/build')

diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index 7ff929f6..54395c38 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -60,7 +60,7 @@ export PJMEDIA_SRCDIR = ../src/pjmedia
 export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
 			alaw_ulaw.o alaw_ulaw_table.o avi_player.o \
 			bidirectional.o clock_thread.o codec.o conference.o \
-			conf_switch.o converter.o  converter_libswscale.o \
+			conf_switch.o converter.o  converter_libswscale.o converter_libyuv.o \
 			delaybuf.o echo_common.o \
 			echo_port.o echo_suppress.o endpoint.o errno.o \
 			event.o format.o ffmpeg_util.o \
diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in
index ea057824..91b14aa4 100644
--- a/pjmedia/build/os-auto.mak.in
+++ b/pjmedia/build/os-auto.mak.in
@@ -25,11 +25,17 @@ QT_CFLAGS = @ac_qt_cflags@
 # iOS
 IOS_CFLAGS = @ac_ios_cflags@
 
+# libyuv
+LIBYUV_CFLAGS = @ac_libyuv_cflags@
+LIBYUV_LDFLAGS = @ac_libyuv_ldflags@
+
+
 # PJMEDIA features exclusion
 export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_speex_aec@ \
 		 $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(QT_CFLAGS) \
-		 $(IOS_CFLAGS)
-export LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS)
+		 $(IOS_CFLAGS) $(LIBYUV_CFLAGS)
+export LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) \
+		  $(LIBYUV_LDFLAGS)
 
 # Define the desired sound device backend
 # Valid values are:
diff --git a/pjmedia/build/pjmedia.vcproj b/pjmedia/build/pjmedia.vcproj
index 22fe2764..aae0101c 100644
--- a/pjmedia/build/pjmedia.vcproj
+++ b/pjmedia/build/pjmedia.vcproj
@@ -3802,6 +3802,10 @@
 				RelativePath="..\src\pjmedia\converter_libswscale.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\pjmedia\converter_libyuv.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\pjmedia\delaybuf.c"
 				>
-- 
cgit v1.2.3