[packages/webrtc] up to svn2718
glen
glen at pld-linux.org
Mon Dec 31 00:45:19 CET 2012
commit 73e446383aee4f07fe511334d75d2e4db000cc58
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Dec 31 01:45:03 2012 +0200
up to svn2718
build-sanity.patch | 875 ++++++++++++++++++++++++++++++----------------------
system-libyuv.patch | 24 --
webrtc.spec | 25 +-
3 files changed, 517 insertions(+), 407 deletions(-)
---
diff --git a/webrtc.spec b/webrtc.spec
index ecb831b..d7a2cf2 100644
--- a/webrtc.spec
+++ b/webrtc.spec
@@ -1,9 +1,10 @@
-%define svndate 20120613
-%define svnrev 2401
+%global svndate 20121218
+# Chromium 23 needs this revision.
+%global svnrev 2718
Summary: Libraries to provide Real Time Communications via the web
Name: webrtc
Version: 0.1
-Release: 0.6.%{svndate}svn%{svnrev}
+Release: 0.9.%{svndate}svn%{svnrev}
License: BSD
Group: Libraries
URL: http://www.webrtc.org/
@@ -12,13 +13,10 @@ URL: http://www.webrtc.org/
# mv webrtc/ webrtc-20120613svn2401
# tar cfj webrtc-20120613svn2401.tar.bz2 webrtc-20120613svn2401
Source0: %{name}-%{svndate}svn%{svnrev}.tar.bz2
-# Source0-md5: e768b9133df09fe3ce7fe260145d4f27
+# Source0-md5: 68977feca42feea6f358aeaf4c463880
# Google provides no real way to build this code, except as part of Chromium
# That's just stupid.
Patch0: build-sanity.patch
-# Naming your internal header the same thing as the upstream core header
-# is also stupid.
-Patch1: system-libyuv.patch
BuildRequires: alsa-lib-devel
BuildRequires: autoconf
BuildRequires: automake
@@ -34,7 +32,7 @@ BuildRequires: xorg-lib-libXext-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# various missing libs: -lpthread, -lm, -lX11 ...
-%define skip_post_check_so libsystem_wrappers.so.*.*.* libiSAC.so.*.*.* libwebrtc_utility.so.*.*.* libapm_util.so.*.*.* libaec.so.*.*.* libns.so.*.*.* libbitrate_controller.so.*.*.* libvideo_render_module.so.*.*.*
+%define skip_post_check_so libsystem_wrappers.so.*.*.* libiSAC.so.*.*.* libwebrtc_utility.so.*.*.* libapm_util.so.*.*.* libaec.so.*.*.* libns.so.*.*.* libbitrate_controller.so.*.*.* libvideo_render_module.so.*.*.* libwebrtc_jpeg.so.*.*.* libwebrtc_i420.so.*.*.*
%description
WebRTC is a free, open project that enables web browsers with
@@ -57,7 +55,6 @@ Development files for WebRTC.
touch NEWS README ChangeLog
ln -s LICENSE COPYING
%patch0 -p1
-%patch1 -p1
%build
%{__libtoolize}
@@ -87,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc LICENSE PATENTS AUTHORS
+%attr(755,root,root) %{_bindir}/frame_analyzer
+%attr(755,root,root) %{_bindir}/psnr_ssim_analyzer
+%attr(755,root,root) %{_bindir}/rgba_to_i420_converter
+
%attr(755,root,root) %{_libdir}/libCNG.so.*.*.*
%ghost %{_libdir}/libCNG.so.0
%attr(755,root,root) %{_libdir}/libG711.so.*.*.*
@@ -133,6 +134,8 @@ rm -rf $RPM_BUILD_ROOT
%ghost %{_libdir}/librtp_rtcp.so.0
%attr(755,root,root) %{_libdir}/libsignal_processing.so.*.*.*
%ghost %{_libdir}/libsignal_processing.so.0
+%attr(755,root,root) %{_libdir}/libsimple_command_line_parser.so.*.*.*
+%ghost %{_libdir}/libsimple_command_line_parser.so.0
%attr(755,root,root) %{_libdir}/libsystem_wrappers.so.*.*.*
%ghost %{_libdir}/libsystem_wrappers.so.0
%attr(755,root,root) %{_libdir}/libudp_transport.so.*.*.*
@@ -145,6 +148,8 @@ rm -rf $RPM_BUILD_ROOT
%ghost %{_libdir}/libvideo_engine_core.so.0
%attr(755,root,root) %{_libdir}/libvideo_processing.so.*.*.*
%ghost %{_libdir}/libvideo_processing.so.0
+%attr(755,root,root) %{_libdir}/libvideo_quality_analysis.so.*.*.*
+%ghost %{_libdir}/libvideo_quality_analysis.so.0
%attr(755,root,root) %{_libdir}/libvideo_render_module.so.*.*.*
%ghost %{_libdir}/libvideo_render_module.so.0
%attr(755,root,root) %{_libdir}/libvoice_engine_core.so.*.*.*
@@ -188,12 +193,14 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libresampler.so
%{_libdir}/librtp_rtcp.so
%{_libdir}/libsignal_processing.so
+%{_libdir}/libsimple_command_line_parser.so
%{_libdir}/libsystem_wrappers.so
%{_libdir}/libudp_transport.so
%{_libdir}/libvad.so
%{_libdir}/libvideo_capture_module.so
%{_libdir}/libvideo_engine_core.so
%{_libdir}/libvideo_processing.so
+%{_libdir}/libvideo_quality_analysis.so
%{_libdir}/libvideo_render_module.so
%{_libdir}/libvoice_engine_core.so
%{_libdir}/libwebrtc_i420.so
diff --git a/build-sanity.patch b/build-sanity.patch
index 2d896aa..b7bf1ea 100644
--- a/build-sanity.patch
+++ b/build-sanity.patch
@@ -1,13 +1,14 @@
-diff -up webrtc-20120613svn2401/configure.ac.SANITY webrtc-20120613svn2401/configure.ac
---- webrtc-20120613svn2401/configure.ac.SANITY 2012-07-11 13:05:05.631004811 -0400
-+++ webrtc-20120613svn2401/configure.ac 2012-07-11 13:05:05.630004811 -0400
-@@ -0,0 +1,118 @@
+diff -up webrtc-20121218svn2718/configure.ac.SANITY webrtc-20121218svn2718/configure.ac
+--- webrtc-20121218svn2718/configure.ac.SANITY 2012-12-18 21:36:22.477635839 -0500
++++ webrtc-20121218svn2718/configure.ac 2012-12-18 21:36:22.477635839 -0500
+@@ -0,0 +1,140 @@
+AC_INIT([webrtc], [0.1], [google-talk-open at googlegroups.com])
+AC_CANONICAL_SYSTEM
+AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE([dist-zip])
+AC_PROG_CC
+AC_PROG_CXX
++AM_PROG_AS
+AM_PROG_LIBTOOL
+LIBTOOL="$LIBTOOL --silent"
+AC_PROG_INSTALL
@@ -21,6 +22,27 @@ diff -up webrtc-20120613svn2401/configure.ac.SANITY webrtc-20120613svn2401/confi
+WEBRTC_LIBRARY_VERSION=0:0:0
+AC_SUBST(WEBRTC_LIBRARY_VERSION)
+
++# This is super hackish. Sorry.
++unamem=`uname -m | sed -e 's/i.86/i686/' -e 's/^armv.*/arm/'`
++AM_CONDITIONAL(ARM,test x"$unamem" == x"arm")
++
++enableval=no
++AC_MSG_CHECKING([whether to compile with armv7 optimized files])
++AC_ARG_ENABLE(armv7,
++ AS_HELP_STRING([--enable-armv7], [compile with arm7 optimized files]))
++case "${enableval}" in
++yes)
++ AC_MSG_RESULT(yes)
++ ;;
++no)
++ AC_MSG_RESULT(no)
++ ;;
++*)
++ AC_MSG_ERROR([bad value ${enableval} for --enable-armv7, needs yes or no])
++ ;;
++esac
++AM_CONDITIONAL(ARM7_ENABLED, test x"$enableval" = xyes)
++
+HAVE_JPEG=no
+AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, HAVE_JPEG="yes")
+if test "x$HAVE_JPEG" = xyes ; then
@@ -66,11 +88,11 @@ diff -up webrtc-20120613svn2401/configure.ac.SANITY webrtc-20120613svn2401/confi
+ src/modules/audio_coding/codecs/g711/Makefile
+ src/modules/audio_coding/codecs/g722/Makefile
+ src/modules/audio_coding/codecs/ilbc/Makefile
-+ src/modules/audio_coding/codecs/iSAC/Makefile
-+ src/modules/audio_coding/codecs/iSAC/fix/Makefile
-+ src/modules/audio_coding/codecs/iSAC/fix/source/Makefile
-+ src/modules/audio_coding/codecs/iSAC/main/Makefile
-+ src/modules/audio_coding/codecs/iSAC/main/source/Makefile
++ src/modules/audio_coding/codecs/isac/Makefile
++ src/modules/audio_coding/codecs/isac/fix/Makefile
++ src/modules/audio_coding/codecs/isac/fix/source/Makefile
++ src/modules/audio_coding/codecs/isac/main/Makefile
++ src/modules/audio_coding/codecs/isac/main/source/Makefile
+ src/modules/audio_coding/codecs/pcm16b/Makefile
+ src/modules/audio_coding/main/Makefile
+ src/modules/audio_coding/main/source/Makefile
@@ -105,8 +127,6 @@ diff -up webrtc-20120613svn2401/configure.ac.SANITY webrtc-20120613svn2401/confi
+ src/modules/video_coding/codecs/i420/main/Makefile
+ src/modules/video_coding/codecs/i420/main/source/Makefile
+ src/modules/video_coding/codecs/vp8/Makefile
-+ src/modules/video_coding/codecs/vp8/main/Makefile
-+ src/modules/video_coding/codecs/vp8/main/source/Makefile
+ src/modules/video_coding/main/Makefile
+ src/modules/video_coding/main/source/Makefile
+ src/modules/video_processing/Makefile
@@ -115,27 +135,29 @@ diff -up webrtc-20120613svn2401/configure.ac.SANITY webrtc-20120613svn2401/confi
+ src/modules/video_render/Makefile
+ src/modules/video_render/main/Makefile
+ src/modules/video_render/main/source/Makefile
++ src/tools/Makefile
++ src/tools/converter/Makefile
++ src/tools/frame_analyzer/Makefile
++ src/tools/psnr_ssim_analyzer/Makefile
+ src/video_engine/Makefile
+ src/voice_engine/Makefile
-+ src/voice_engine/main/Makefile
-+ src/voice_engine/main/source/Makefile
+ ])
-diff -up webrtc-20120613svn2401/Makefile.am.SANITY webrtc-20120613svn2401/Makefile.am
---- webrtc-20120613svn2401/Makefile.am.SANITY 2012-07-11 13:05:05.631004811 -0400
-+++ webrtc-20120613svn2401/Makefile.am 2012-07-11 13:05:05.631004811 -0400
+diff -up webrtc-20121218svn2718/Makefile.am.SANITY webrtc-20121218svn2718/Makefile.am
+--- webrtc-20121218svn2718/Makefile.am.SANITY 2012-12-18 21:36:22.478635840 -0500
++++ webrtc-20121218svn2718/Makefile.am 2012-12-18 21:36:22.478635840 -0500
@@ -0,0 +1,4 @@
+SUBDIRS=src
+
+configdir = $(includedir)/webrtc
+config_HEADERS = config.h
-diff -up webrtc-20120613svn2401/src/common_audio/Makefile.am.SANITY webrtc-20120613svn2401/src/common_audio/Makefile.am
---- webrtc-20120613svn2401/src/common_audio/Makefile.am.SANITY 2012-07-11 13:05:05.632004811 -0400
-+++ webrtc-20120613svn2401/src/common_audio/Makefile.am 2012-07-11 13:05:05.631004811 -0400
+diff -up webrtc-20121218svn2718/src/common_audio/Makefile.am.SANITY webrtc-20121218svn2718/src/common_audio/Makefile.am
+--- webrtc-20121218svn2718/src/common_audio/Makefile.am.SANITY 2012-12-18 21:36:22.478635840 -0500
++++ webrtc-20121218svn2718/src/common_audio/Makefile.am 2012-12-18 21:36:22.478635840 -0500
@@ -0,0 +1 @@
+SUBDIRS=signal_processing resampler vad
-diff -up webrtc-20120613svn2401/src/common_audio/resampler/Makefile.am.SANITY webrtc-20120613svn2401/src/common_audio/resampler/Makefile.am
---- webrtc-20120613svn2401/src/common_audio/resampler/Makefile.am.SANITY 2012-07-11 13:05:05.632004811 -0400
-+++ webrtc-20120613svn2401/src/common_audio/resampler/Makefile.am 2012-07-11 13:05:05.632004811 -0400
+diff -up webrtc-20121218svn2718/src/common_audio/resampler/Makefile.am.SANITY webrtc-20121218svn2718/src/common_audio/resampler/Makefile.am
+--- webrtc-20121218svn2718/src/common_audio/resampler/Makefile.am.SANITY 2012-12-18 21:36:22.479635841 -0500
++++ webrtc-20121218svn2718/src/common_audio/resampler/Makefile.am 2012-12-18 21:36:22.479635841 -0500
@@ -0,0 +1,13 @@
+lib_LTLIBRARIES = libresampler.la
+
@@ -150,21 +172,18 @@ diff -up webrtc-20120613svn2401/src/common_audio/resampler/Makefile.am.SANITY we
+nobase_libresampler_include_HEADERS = include/resampler.h
+
+AM_CXXFLAGS = -I../signal_processing/include -I../../ -Iinclude -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/common_audio/signal_processing/Makefile.am.SANITY webrtc-20120613svn2401/src/common_audio/signal_processing/Makefile.am
---- webrtc-20120613svn2401/src/common_audio/signal_processing/Makefile.am.SANITY 2012-07-11 13:05:05.633004811 -0400
-+++ webrtc-20120613svn2401/src/common_audio/signal_processing/Makefile.am 2012-07-11 13:05:05.633004811 -0400
-@@ -0,0 +1,46 @@
+diff -up webrtc-20121218svn2718/src/common_audio/signal_processing/Makefile.am.SANITY webrtc-20121218svn2718/src/common_audio/signal_processing/Makefile.am
+--- webrtc-20121218svn2718/src/common_audio/signal_processing/Makefile.am.SANITY 2012-12-18 21:36:22.480635842 -0500
++++ webrtc-20121218svn2718/src/common_audio/signal_processing/Makefile.am 2012-12-18 21:36:22.480635842 -0500
+@@ -0,0 +1,65 @@
+lib_LTLIBRARIES = libsignal_processing.la
+
+libsignal_processing_la_SOURCES = auto_corr_to_refl_coef.c \
+ auto_correlation.c \
+ complex_fft.c \
-+ complex_bit_reverse.c \
+ copy_set_operations.c \
-+ cross_correlation.c \
+ division_operations.c \
+ dot_product_with_scale.c \
-+ downsample_fast.c \
+ energy.c \
+ filter_ar.c \
+ filter_ar_fast_q12.c \
@@ -176,6 +195,7 @@ diff -up webrtc-20120613svn2401/src/common_audio/signal_processing/Makefile.am.S
+ lpc_to_refl_coef.c \
+ min_max_operations.c \
+ randomization_functions.c \
++ real_fft.c \
+ refl_coef_to_lpc.c \
+ resample.c \
+ resample_48khz.c \
@@ -183,11 +203,31 @@ diff -up webrtc-20120613svn2401/src/common_audio/signal_processing/Makefile.am.S
+ resample_by_2_internal.c \
+ resample_fractional.c \
+ spl_sqrt.c \
-+ spl_sqrt_floor.c \
+ spl_version.c \
+ splitting_filter.c \
+ sqrt_of_one_minus_x_squared.c \
-+ vector_scaling_operations.c
++ vector_scaling_operations.c
++
++if ARM7_ENABLED
++ libsignal_processing_la_SOURCES += complex_bit_reverse_arm.s \
++ cross_correlation_neon.s \
++ downsample_fast_neon.s \
++ filter_ar_fast_q12_armv7.s \
++ min_max_operations_neon.s \
++ spl_sqrt_floor_arm.s \
++ vector_scaling_operations_neon.s
++else
++ libsignal_processing_la_SOURCES += cross_correlation.c \
++ downsample_fast.c
++endif
++
++if ARM
++ libsignal_processing_la_SOURCES += complex_bit_reverse_arm.s \
++ spl_sqrt_floor_arm.s
++else
++ libsignal_processing_la_SOURCES += complex_bit_reverse.c \
++ spl_sqrt_floor.c
++endif
+
+libsignal_processing_la_LIBADD =
+
@@ -195,14 +235,15 @@ diff -up webrtc-20120613svn2401/src/common_audio/signal_processing/Makefile.am.S
+
+libsignal_processing_includedir = $(includedir)/webrtc/common_audio/signal_processing
+
-+nobase_libsignal_processing_include_HEADERS = include/signal_processing_library.h \
++nobase_libsignal_processing_include_HEADERS = include/real_fft.h \
++ include/signal_processing_library.h \
+ include/spl_inl.h \
+ resample_by_2_internal.h
+
+AM_CFLAGS = -Iinclude/ -I../.. -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/common_audio/vad/Makefile.am.SANITY webrtc-20120613svn2401/src/common_audio/vad/Makefile.am
---- webrtc-20120613svn2401/src/common_audio/vad/Makefile.am.SANITY 2012-07-11 13:05:05.633004811 -0400
-+++ webrtc-20120613svn2401/src/common_audio/vad/Makefile.am 2012-07-11 13:05:05.633004811 -0400
+diff -up webrtc-20121218svn2718/src/common_audio/vad/Makefile.am.SANITY webrtc-20121218svn2718/src/common_audio/vad/Makefile.am
+--- webrtc-20121218svn2718/src/common_audio/vad/Makefile.am.SANITY 2012-12-18 21:36:22.480635842 -0500
++++ webrtc-20121218svn2718/src/common_audio/vad/Makefile.am 2012-12-18 21:36:22.481635843 -0500
@@ -0,0 +1,21 @@
+lib_LTLIBRARIES = libvad.la
+
@@ -225,9 +266,9 @@ diff -up webrtc-20120613svn2401/src/common_audio/vad/Makefile.am.SANITY webrtc-2
+ vad_sp.h
+
+AM_CFLAGS = -Iinclude/ -I../.. -I../signal_processing/include -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/common_video/jpeg/Makefile.am.SANITY webrtc-20120613svn2401/src/common_video/jpeg/Makefile.am
---- webrtc-20120613svn2401/src/common_video/jpeg/Makefile.am.SANITY 2012-07-11 13:05:05.634004811 -0400
-+++ webrtc-20120613svn2401/src/common_video/jpeg/Makefile.am 2012-07-11 13:05:05.633004811 -0400
+diff -up webrtc-20121218svn2718/src/common_video/jpeg/Makefile.am.SANITY webrtc-20121218svn2718/src/common_video/jpeg/Makefile.am
+--- webrtc-20121218svn2718/src/common_video/jpeg/Makefile.am.SANITY 2012-12-18 21:36:22.481635843 -0500
++++ webrtc-20121218svn2718/src/common_video/jpeg/Makefile.am 2012-12-18 21:36:22.481635843 -0500
@@ -0,0 +1,15 @@
+lib_LTLIBRARIES = libwebrtc_jpeg.la
+
@@ -244,13 +285,13 @@ diff -up webrtc-20120613svn2401/src/common_video/jpeg/Makefile.am.SANITY webrtc-
+ data_manager.h
+
+AM_CXXFLAGS = -Iinclude/ -I../.. -I../interface $(JPEG_CFLAGS) -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/common_video/libyuv/Makefile.am.SANITY webrtc-20120613svn2401/src/common_video/libyuv/Makefile.am
---- webrtc-20120613svn2401/src/common_video/libyuv/Makefile.am.SANITY 2012-07-11 13:05:05.634004811 -0400
-+++ webrtc-20120613svn2401/src/common_video/libyuv/Makefile.am 2012-07-11 13:05:05.634004811 -0400
+diff -up webrtc-20121218svn2718/src/common_video/libyuv/Makefile.am.SANITY webrtc-20121218svn2718/src/common_video/libyuv/Makefile.am
+--- webrtc-20121218svn2718/src/common_video/libyuv/Makefile.am.SANITY 2012-12-18 21:36:22.481635843 -0500
++++ webrtc-20121218svn2718/src/common_video/libyuv/Makefile.am 2012-12-18 21:36:22.481635843 -0500
@@ -0,0 +1,15 @@
+lib_LTLIBRARIES = libwebrtc_libyuv.la
+
-+libwebrtc_libyuv_la_SOURCES = libyuv.cc \
++libwebrtc_libyuv_la_SOURCES = webrtc_libyuv.cc \
+ scaler.cc
+
+libwebrtc_libyuv_la_LIBADD = $(LIBYUV_LIBS)
@@ -259,23 +300,23 @@ diff -up webrtc-20120613svn2401/src/common_video/libyuv/Makefile.am.SANITY webrt
+
+libwebrtc_libyuv_includedir = $(includedir)/webrtc/common_video/libyuv
+
-+nobase_libwebrtc_libyuv_include_HEADERS = include/libyuv.h \
++nobase_libwebrtc_libyuv_include_HEADERS = include/webrtc_libyuv.h \
+ include/scaler.h
+
+AM_CXXFLAGS = -Iinclude/ -I../.. -I../interface $(LIBYUV_CFLAGS) -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/common_video/Makefile.am.SANITY webrtc-20120613svn2401/src/common_video/Makefile.am
---- webrtc-20120613svn2401/src/common_video/Makefile.am.SANITY 2012-07-11 13:05:05.635004811 -0400
-+++ webrtc-20120613svn2401/src/common_video/Makefile.am 2012-07-11 13:05:05.634004811 -0400
+diff -up webrtc-20121218svn2718/src/common_video/Makefile.am.SANITY webrtc-20121218svn2718/src/common_video/Makefile.am
+--- webrtc-20121218svn2718/src/common_video/Makefile.am.SANITY 2012-12-18 21:36:22.481635843 -0500
++++ webrtc-20121218svn2718/src/common_video/Makefile.am 2012-12-18 21:36:22.481635843 -0500
@@ -0,0 +1,4 @@
+SUBDIRS = jpeg libyuv .
+
-+common_video_includedir = $(includedir)/webrtc/common_video/
-+nobase_common_video_include_HEADERS = interface/video_image.h
-diff -up webrtc-20120613svn2401/src/Makefile.am.SANITY webrtc-20120613svn2401/src/Makefile.am
---- webrtc-20120613svn2401/src/Makefile.am.SANITY 2012-07-11 13:05:05.635004811 -0400
-+++ webrtc-20120613svn2401/src/Makefile.am 2012-07-11 13:05:05.635004811 -0400
++libcommon_video_includedir = $(includedir)/webrtc/common_video/
++nobase_libcommon_video_include_HEADERS = interface/video_image.h
+diff -up webrtc-20121218svn2718/src/Makefile.am.SANITY webrtc-20121218svn2718/src/Makefile.am
+--- webrtc-20121218svn2718/src/Makefile.am.SANITY 2012-12-18 21:36:22.482635844 -0500
++++ webrtc-20121218svn2718/src/Makefile.am 2012-12-18 21:36:22.482635844 -0500
@@ -0,0 +1,9 @@
-+SUBDIRS=common_audio common_video system_wrappers modules voice_engine video_engine .
++SUBDIRS=common_audio system_wrappers common_video modules voice_engine video_engine tools .
+
+src_includedir = $(includedir)/webrtc/
+
@@ -284,9 +325,9 @@ diff -up webrtc-20120613svn2401/src/Makefile.am.SANITY webrtc-20120613svn2401/sr
+ typedefs.h
+
+
-diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/cng/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_coding/codecs/cng/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_coding/codecs/cng/Makefile.am.SANITY 2012-07-11 13:05:05.635004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_coding/codecs/cng/Makefile.am 2012-07-11 13:05:05.635004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_coding/codecs/cng/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_coding/codecs/cng/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_coding/codecs/cng/Makefile.am.SANITY 2012-12-18 21:36:22.482635844 -0500
++++ webrtc-20121218svn2718/src/modules/audio_coding/codecs/cng/Makefile.am 2012-12-18 21:36:22.482635844 -0500
@@ -0,0 +1,15 @@
+lib_LTLIBRARIES = libCNG.la
+
@@ -303,9 +344,9 @@ diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/cng/Makefile.am.
+ cng_helpfuns.h
+
+AM_CFLAGS = -Iinclude -I../../../.. -I../../../../common_audio/signal_processing/include -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/g711/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_coding/codecs/g711/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_coding/codecs/g711/Makefile.am.SANITY 2012-07-11 13:05:05.636004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_coding/codecs/g711/Makefile.am 2012-07-11 13:05:05.636004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_coding/codecs/g711/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_coding/codecs/g711/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_coding/codecs/g711/Makefile.am.SANITY 2012-12-18 21:36:22.482635844 -0500
++++ webrtc-20121218svn2718/src/modules/audio_coding/codecs/g711/Makefile.am 2012-12-18 21:36:22.482635844 -0500
@@ -0,0 +1,15 @@
+lib_LTLIBRARIES = libG711.la
+
@@ -322,9 +363,9 @@ diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/g711/Makefile.am
+ g711.h
+
+AM_CFLAGS = -Iinclude -I../../../.. -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/g722/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_coding/codecs/g722/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_coding/codecs/g722/Makefile.am.SANITY 2012-07-11 13:05:05.636004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_coding/codecs/g722/Makefile.am 2012-07-11 13:05:05.636004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_coding/codecs/g722/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_coding/codecs/g722/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_coding/codecs/g722/Makefile.am.SANITY 2012-12-18 21:36:22.483635845 -0500
++++ webrtc-20121218svn2718/src/modules/audio_coding/codecs/g722/Makefile.am 2012-12-18 21:36:22.483635845 -0500
@@ -0,0 +1,16 @@
+lib_LTLIBRARIES = libG722.la
+
@@ -342,9 +383,9 @@ diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/g722/Makefile.am
+ g722_enc_dec.h
+
+AM_CFLAGS = -Iinclude -I../../../.. -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/ilbc/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_coding/codecs/ilbc/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_coding/codecs/ilbc/Makefile.am.SANITY 2012-07-11 13:05:05.637004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_coding/codecs/ilbc/Makefile.am 2012-07-11 13:05:05.636004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_coding/codecs/ilbc/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_coding/codecs/ilbc/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_coding/codecs/ilbc/Makefile.am.SANITY 2012-12-18 21:36:22.483635845 -0500
++++ webrtc-20121218svn2718/src/modules/audio_coding/codecs/ilbc/Makefile.am 2012-12-18 21:36:22.483635845 -0500
@@ -0,0 +1,149 @@
+lib_LTLIBRARIES = libiLBC.la
+
@@ -495,19 +536,19 @@ diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/ilbc/Makefile.am
+ xcorr_coef.h
+
+AM_CFLAGS = -Iinterface -I../../../.. -I../../../../common_audio/signal_processing/include -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/fix/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/fix/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/fix/Makefile.am.SANITY 2012-07-11 13:05:05.637004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/fix/Makefile.am 2012-07-11 13:05:05.637004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/fix/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/fix/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/fix/Makefile.am.SANITY 2012-12-18 21:36:22.483635845 -0500
++++ webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/fix/Makefile.am 2012-12-18 21:36:22.483635845 -0500
@@ -0,0 +1,5 @@
+SUBDIRS = source .
+
-+iSAC_fix_includedir = $(includedir)/webrtc/modules/audio_coding/codecs/iSAC/fix/
-+nobase_iSAC_fix_include_HEADERS = interface/isacfix.h
++isac_fix_includedir = $(includedir)/webrtc/modules/audio_coding/codecs/isac/fix/
++nobase_isac_fix_include_HEADERS = interface/isacfix.h
+
-diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/fix/source/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/fix/source/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/fix/source/Makefile.am.SANITY 2012-07-11 13:05:05.637004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/fix/source/Makefile.am 2012-07-11 13:12:20.039014233 -0400
-@@ -0,0 +1,51 @@
+diff -up webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/fix/source/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/fix/source/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/fix/source/Makefile.am.SANITY 2012-12-18 21:36:22.483635845 -0500
++++ webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/fix/source/Makefile.am 2012-12-18 21:36:22.483635845 -0500
+@@ -0,0 +1,63 @@
+lib_LTLIBRARIES = libiSACFix.la
+
+libiSACFix_la_SOURCES = arith_routines.c \
@@ -526,7 +567,6 @@ diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/fix/source/
+ initialize.c \
+ isacfix.c \
+ lattice.c \
-+ lattice_c.c \
+ lpc_masking_model.c \
+ lpc_tables.c \
+ pitch_estimator.c \
@@ -536,11 +576,24 @@ diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/fix/source/
+ spectrum_ar_model_tables.c \
+ transform.c
+
++if ARM7_ENABLED
++libiSACFix_la_SOURCES += filterbanks_neon.S \
++ filters_neon.S \
++ lattice_neon.S \
++ lattice_armv7.S \
++ lpc_masking_model_neon.S \
++ pitch_filter_armv6.S \
++ transform_neon.S
++else
++libiSACFix_la_SOURCES += lattice_c.c \
++ pitch_filter_c.c
++endif
++
+libiSACFix_la_LIBADD = ../../../../../../common_audio/signal_processing/libsignal_processing.la
+
+libiSACFix_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
+
-+libiSACFix_includedir = $(includedir)/webrtc/modules/audio_coding/codecs/iSAC/fix/
++libiSACFix_includedir = $(includedir)/webrtc/modules/audio_coding/codecs/isac/fix/
+
+libiSACFix_include_HEADERS = ../interface/isacfix.h \
+ arith_routins.h \
@@ -559,18 +612,18 @@ diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/fix/source/
+ structs.h
+
+AM_CFLAGS = -I../interface -I../../../../../.. -I../../../../../../common_audio/signal_processing/include -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/main/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/main/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/main/Makefile.am.SANITY 2012-07-11 13:05:05.637004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/main/Makefile.am 2012-07-11 13:05:05.637004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/main/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/main/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/main/Makefile.am.SANITY 2012-12-18 21:36:22.484635846 -0500
++++ webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/main/Makefile.am 2012-12-18 21:36:22.484635846 -0500
@@ -0,0 +1,5 @@
+SUBDIRS = source .
+
-+iSAC_main_includedir = $(includedir)/webrtc/modules/audio_coding/codecs/iSAC/main
-+nobase_iSAC_main_include_HEADERS = interface/isac.h
++isac_main_includedir = $(includedir)/webrtc/modules/audio_coding/codecs/isac/main
++nobase_isac_main_include_HEADERS = interface/isac.h
+
-diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/main/source/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/main/source/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/main/source/Makefile.am.SANITY 2012-07-11 13:05:05.638004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/main/source/Makefile.am 2012-07-11 13:05:05.638004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/main/source/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/main/source/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/main/source/Makefile.am.SANITY 2012-12-18 21:36:22.485635847 -0500
++++ webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/main/source/Makefile.am 2012-12-18 21:36:22.485635847 -0500
@@ -0,0 +1,60 @@
+lib_LTLIBRARIES = libiSAC.la
+
@@ -607,7 +660,7 @@ diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/main/source
+
+libiSAC_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
+
-+libiSAC_includedir = $(includedir)/webrtc/modules/audio_coding/codecs/iSAC/
++libiSAC_includedir = $(includedir)/webrtc/modules/audio_coding/codecs/isac/
+
+libiSAC_include_HEADERS = ../interface/isac.h \
+ arith_routines.h \
@@ -632,19 +685,19 @@ diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/main/source
+ os_specific_inline.h
+
+AM_CFLAGS = -I../interface -I../../../../../.. -I../../../../../../common_audio/signal_processing/include -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/Makefile.am.SANITY 2012-07-11 13:05:05.638004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_coding/codecs/iSAC/Makefile.am 2012-07-11 13:05:05.638004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/Makefile.am.SANITY 2012-12-18 21:36:22.485635847 -0500
++++ webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/Makefile.am 2012-12-18 21:36:22.485635847 -0500
@@ -0,0 +1 @@
+SUBDIRS = main fix
-diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_coding/codecs/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_coding/codecs/Makefile.am.SANITY 2012-07-11 13:05:05.638004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_coding/codecs/Makefile.am 2012-07-11 13:05:05.638004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_coding/codecs/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_coding/codecs/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_coding/codecs/Makefile.am.SANITY 2012-12-18 21:36:22.485635847 -0500
++++ webrtc-20121218svn2718/src/modules/audio_coding/codecs/Makefile.am 2012-12-18 21:36:22.485635847 -0500
@@ -0,0 +1 @@
-+SUBDIRS = cng g711 g722 ilbc iSAC pcm16b
-diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/pcm16b/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_coding/codecs/pcm16b/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_coding/codecs/pcm16b/Makefile.am.SANITY 2012-07-11 13:05:05.638004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_coding/codecs/pcm16b/Makefile.am 2012-07-11 13:05:05.638004811 -0400
++SUBDIRS = cng g711 g722 ilbc isac pcm16b
+diff -up webrtc-20121218svn2718/src/modules/audio_coding/codecs/pcm16b/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_coding/codecs/pcm16b/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_coding/codecs/pcm16b/Makefile.am.SANITY 2012-12-18 21:36:22.486635848 -0500
++++ webrtc-20121218svn2718/src/modules/audio_coding/codecs/pcm16b/Makefile.am 2012-12-18 21:36:22.486635848 -0500
@@ -0,0 +1,13 @@
+lib_LTLIBRARIES = libPCM16B.la
+
@@ -659,9 +712,9 @@ diff -up webrtc-20120613svn2401/src/modules/audio_coding/codecs/pcm16b/Makefile.
+nobase_libPCM16B_include_HEADERS = include/pcm16b.h
+
+AM_CFLAGS = -Iinclude -I../../../.. -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/modules/audio_coding/main/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_coding/main/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_coding/main/Makefile.am.SANITY 2012-07-11 13:05:05.639004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_coding/main/Makefile.am 2012-07-11 13:05:05.639004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_coding/main/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_coding/main/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_coding/main/Makefile.am.SANITY 2012-12-18 21:36:22.486635848 -0500
++++ webrtc-20121218svn2718/src/modules/audio_coding/main/Makefile.am 2012-12-18 21:36:22.486635848 -0500
@@ -0,0 +1,6 @@
+SUBDIRS = source .
+
@@ -669,9 +722,9 @@ diff -up webrtc-20120613svn2401/src/modules/audio_coding/main/Makefile.am.SANITY
+nobase_audio_coding_main_include_HEADERS = interface/audio_coding_module.h \
+ interface/audio_coding_module_typedefs.h
+
-diff -up webrtc-20120613svn2401/src/modules/audio_coding/main/source/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_coding/main/source/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_coding/main/source/Makefile.am.SANITY 2012-07-11 13:05:05.639004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_coding/main/source/Makefile.am 2012-07-11 13:05:05.639004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_coding/main/source/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_coding/main/source/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_coding/main/source/Makefile.am.SANITY 2012-12-18 21:36:22.486635848 -0500
++++ webrtc-20121218svn2718/src/modules/audio_coding/main/source/Makefile.am 2012-12-18 21:36:22.486635848 -0500
@@ -0,0 +1,79 @@
+lib_LTLIBRARIES = libaudio_coding_module.la
+
@@ -706,8 +759,8 @@ diff -up webrtc-20120613svn2401/src/modules/audio_coding/main/source/Makefile.am
+ ../../codecs/g711/libG711.la \
+ ../../codecs/g722/libG722.la \
+ ../../codecs/ilbc/libiLBC.la \
-+ ../../codecs/iSAC/main/source/libiSAC.la \
-+ ../../codecs/iSAC/fix/source/libiSACFix.la \
++ ../../codecs/isac/main/source/libiSAC.la \
++ ../../codecs/isac/fix/source/libiSACFix.la \
+ ../../codecs/pcm16b/libPCM16B.la \
+ ../../neteq/libNetEq.la \
+ ../../../../common_audio/resampler/libresampler.la \
@@ -750,16 +803,16 @@ diff -up webrtc-20120613svn2401/src/modules/audio_coding/main/source/Makefile.am
+
+AM_CXXFLAGS = -I../interface -I../../../interface -I../../../.. -I../../../../common_audio/signal_processing/include -I../../neteq/interface \
+ -I../../../../system_wrappers/interface -I../../../../common_audio/vad/include -I../../codecs/cng/include -I../../codecs/g711/include \
-+ -I../../../../common_audio/resampler/include -I../../codecs/iSAC/main/interface -I../../codecs/g722/include -I../../codecs/iSAC/fix/interface \
-+ -I../../codecs/ilbc/interface -I../../codecs/pcm16b/include -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/modules/audio_coding/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_coding/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_coding/Makefile.am.SANITY 2012-07-11 13:05:05.639004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_coding/Makefile.am 2012-07-11 13:05:05.639004811 -0400
++ -I../../../../common_audio/resampler/include -I../../codecs/isac/main/interface -I../../codecs/g722/include -I../../codecs/isac/fix/interface \
++ -I../../codecs/ilbc/interface -I../../codecs/opus/interface -I../../codecs/pcm16b/include -DWEBRTC_LINUX
+diff -up webrtc-20121218svn2718/src/modules/audio_coding/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_coding/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_coding/Makefile.am.SANITY 2012-12-18 21:36:22.486635848 -0500
++++ webrtc-20121218svn2718/src/modules/audio_coding/Makefile.am 2012-12-18 21:36:22.487635849 -0500
@@ -0,0 +1 @@
+SUBDIRS = codecs neteq main
-diff -up webrtc-20120613svn2401/src/modules/audio_coding/neteq/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_coding/neteq/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_coding/neteq/Makefile.am.SANITY 2012-07-11 13:05:05.639004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_coding/neteq/Makefile.am 2012-07-11 13:05:05.639004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_coding/neteq/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_coding/neteq/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_coding/neteq/Makefile.am.SANITY 2012-12-18 21:36:22.487635849 -0500
++++ webrtc-20121218svn2718/src/modules/audio_coding/neteq/Makefile.am 2012-12-18 21:36:22.487635849 -0500
@@ -0,0 +1,65 @@
+lib_LTLIBRARIES = libNetEq.la
+
@@ -826,18 +879,18 @@ diff -up webrtc-20120613svn2401/src/modules/audio_coding/neteq/Makefile.am.SANIT
+ rtp.h
+
+AM_CFLAGS = -Iinterface -I../../.. -I../../../common_audio/signal_processing/include -I../codecs/cng/include -DWEBRTC_LINUX -DNETEQ_VOICEENGINE_CODECS -DSCRATCH
-diff -up webrtc-20120613svn2401/src/modules/audio_conference_mixer/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_conference_mixer/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_conference_mixer/Makefile.am.SANITY 2012-07-11 13:05:05.640004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_conference_mixer/Makefile.am 2012-07-11 13:05:05.640004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_conference_mixer/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_conference_mixer/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_conference_mixer/Makefile.am.SANITY 2012-12-18 21:36:22.487635849 -0500
++++ webrtc-20121218svn2718/src/modules/audio_conference_mixer/Makefile.am 2012-12-18 21:36:22.487635849 -0500
@@ -0,0 +1,5 @@
+SUBDIRS = source .
+
+audio_conference_mixer_includedir = $(includedir)/webrtc/modules/audio_conference_mixer/
+nobase_audio_conference_mixer_include_HEADERS = interface/audio_conference_mixer.h \
+ interface/audio_conference_mixer_defines.h
-diff -up webrtc-20120613svn2401/src/modules/audio_conference_mixer/source/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_conference_mixer/source/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_conference_mixer/source/Makefile.am.SANITY 2012-07-11 13:05:05.640004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_conference_mixer/source/Makefile.am 2012-07-11 13:05:05.640004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_conference_mixer/source/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_conference_mixer/source/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_conference_mixer/source/Makefile.am.SANITY 2012-12-18 21:36:22.487635849 -0500
++++ webrtc-20121218svn2718/src/modules/audio_conference_mixer/source/Makefile.am 2012-12-18 21:36:22.488635850 -0500
@@ -0,0 +1,24 @@
+lib_LTLIBRARIES = libaudio_conference_mixer.la
+
@@ -863,35 +916,32 @@ diff -up webrtc-20120613svn2401/src/modules/audio_conference_mixer/source/Makefi
+
+AM_CXXFLAGS = -I../interface -I../../interface -I../../.. -I../../utility/interface -DWEBRTC_LINUX \
+ -I../../../system_wrappers/interface -I../../audio_processing/include
-diff -up webrtc-20120613svn2401/src/modules/audio_device/main/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_device/main/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_device/main/Makefile.am.SANITY 2012-07-11 13:05:05.641004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_device/main/Makefile.am 2012-07-11 13:05:05.640004811 -0400
-@@ -0,0 +1,6 @@
+diff -up webrtc-20121218svn2718/src/modules/audio_device/main/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_device/main/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_device/main/Makefile.am.SANITY 2012-12-18 21:36:22.488635850 -0500
++++ webrtc-20121218svn2718/src/modules/audio_device/main/Makefile.am 2012-12-18 21:36:22.488635850 -0500
+@@ -0,0 +1,5 @@
+SUBDIRS = source .
+
+audio_device_main_includedir = $(includedir)/webrtc/modules/audio_device/main/
+nobase_audio_device_main_include_HEADERS = interface/audio_device.h \
+ interface/audio_device_defines.h
-+
-diff -up webrtc-20120613svn2401/src/modules/audio_device/main/source/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_device/main/source/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_device/main/source/Makefile.am.SANITY 2012-07-11 13:05:05.641004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_device/main/source/Makefile.am 2012-07-11 13:05:05.641004811 -0400
-@@ -0,0 +1,44 @@
+diff -up webrtc-20121218svn2718/src/modules/audio_device/main/source/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_device/main/source/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_device/main/source/Makefile.am.SANITY 2012-12-18 21:36:22.488635850 -0500
++++ webrtc-20121218svn2718/src/modules/audio_device/main/source/Makefile.am 2012-12-18 21:36:22.488635850 -0500
+@@ -0,0 +1,42 @@
+lib_LTLIBRARIES = libaudio_device.la
+
+libaudio_device_la_SOURCES = audio_device_buffer.cc \
+ audio_device_generic.cc \
+ audio_device_utility.cc \
+ audio_device_impl.cc \
-+ dummy/audio_device_dummy.cc \
-+ dummy/audio_device_utility_dummy.cc \
+ linux/alsasymboltable_linux.cc \
+ linux/audio_device_alsa_linux.cc \
++ linux/audio_device_pulse_linux.cc \
+ linux/audio_device_utility_linux.cc \
+ linux/audio_mixer_manager_alsa_linux.cc \
-+ linux/latebindingsymboltable_linux.cc \
-+ linux/audio_device_pulse_linux.cc \
+ linux/audio_mixer_manager_pulse_linux.cc \
++ linux/latebindingsymboltable_linux.cc \
+ linux/pulseaudiosymboltable_linux.cc
+
+libaudio_device_la_LIBADD = -ldl ../../../../common_audio/resampler/libresampler.la \
@@ -921,23 +971,28 @@ diff -up webrtc-20120613svn2401/src/modules/audio_device/main/source/Makefile.am
+AM_CXXFLAGS = -I../interface -I../../../interface -I../../../.. -Ilinux -DWEBRTC_LINUX -DLINUX_ALSA -DLINUX_PULSE \
+ -I../../../../common_audio/resampler/include -I../../../../common_audio/signal_processing/include \
+ -I../../../../system_wrappers/interface -Idummy
-diff -up webrtc-20120613svn2401/src/modules/audio_device/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_device/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_device/Makefile.am.SANITY 2012-07-11 13:05:05.641004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_device/Makefile.am 2012-07-11 13:05:05.641004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_device/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_device/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_device/Makefile.am.SANITY 2012-12-18 21:36:22.488635850 -0500
++++ webrtc-20121218svn2718/src/modules/audio_device/Makefile.am 2012-12-18 21:36:22.488635850 -0500
@@ -0,0 +1 @@
+SUBDIRS = main
-diff -up webrtc-20120613svn2401/src/modules/audio_processing/aec/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_processing/aec/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_processing/aec/Makefile.am.SANITY 2012-07-11 13:05:05.641004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_processing/aec/Makefile.am 2012-07-11 13:05:05.641004811 -0400
-@@ -0,0 +1,23 @@
+diff -up webrtc-20121218svn2718/src/modules/audio_processing/aec/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_processing/aec/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_processing/aec/Makefile.am.SANITY 2012-12-18 21:36:22.489635851 -0500
++++ webrtc-20121218svn2718/src/modules/audio_processing/aec/Makefile.am 2012-12-18 21:36:22.489635851 -0500
+@@ -0,0 +1,34 @@
+lib_LTLIBRARIES = libaec.la
+
+libaec_la_SOURCES = echo_cancellation.c \
+ aec_core.c \
+ aec_rdft.c \
-+ aec_resampler.c \
-+ aec_core_sse2.c \
-+ aec_rdft_sse2.c
++ aec_resampler.c
++
++if ARM
++# Do nothing for now.
++else
++libaec_la_SOURCES += aec_core_sse2.c \
++ aec_rdft_sse2.c
++endif
+
+libaec_la_LIBADD = ../utility/libapm_util.la \
+ ../../../common_audio/signal_processing/libsignal_processing.la
@@ -952,16 +1007,26 @@ diff -up webrtc-20120613svn2401/src/modules/audio_processing/aec/Makefile.am.SAN
+ aec_rdft.h \
+ aec_resampler.h
+
-+AM_CFLAGS = -Iinclude -I../../.. -I../utility -I../../../common_audio/signal_processing/include -DWEBRTC_LINUX -msse2
-diff -up webrtc-20120613svn2401/src/modules/audio_processing/aecm/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_processing/aecm/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_processing/aecm/Makefile.am.SANITY 2012-07-11 13:05:05.642004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_processing/aecm/Makefile.am 2012-07-11 13:05:05.642004811 -0400
-@@ -0,0 +1,17 @@
++AM_CFLAGS = -Iinclude -I../../.. -I../utility -I../../../common_audio/signal_processing/include -DWEBRTC_LINUX
++
++if ARM
++# Do nothing for now.
++else
++AM_CFLAGS += -msse2
++endif
+diff -up webrtc-20121218svn2718/src/modules/audio_processing/aecm/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_processing/aecm/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_processing/aecm/Makefile.am.SANITY 2012-12-18 21:36:22.489635851 -0500
++++ webrtc-20121218svn2718/src/modules/audio_processing/aecm/Makefile.am 2012-12-18 21:36:22.489635851 -0500
+@@ -0,0 +1,21 @@
+lib_LTLIBRARIES = libaecm.la
+
+libaecm_la_SOURCES = echo_control_mobile.c \
+ aecm_core.c
+
++if ARM7_ENABLED
++libaecm_la_SOURCES += aecm_core_neon.c
++endif
++
+libaecm_la_LIBADD = ../utility/libapm_util.la \
+ ../../../common_audio/signal_processing/libsignal_processing.la \
+ ../../../system_wrappers/source/libsystem_wrappers.la
@@ -974,9 +1039,9 @@ diff -up webrtc-20120613svn2401/src/modules/audio_processing/aecm/Makefile.am.SA
+ aecm_core.h
+
+AM_CFLAGS = -Iinclude -I../../.. -I../utility -I../../../common_audio/signal_processing/include -I../../../system_wrappers/interface -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/modules/audio_processing/agc/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_processing/agc/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_processing/agc/Makefile.am.SANITY 2012-07-11 13:05:05.642004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_processing/agc/Makefile.am 2012-07-11 13:05:05.642004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_processing/agc/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_processing/agc/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_processing/agc/Makefile.am.SANITY 2012-12-18 21:36:22.489635851 -0500
++++ webrtc-20121218svn2718/src/modules/audio_processing/agc/Makefile.am 2012-12-18 21:36:22.489635851 -0500
@@ -0,0 +1,16 @@
+lib_LTLIBRARIES = libagc.la
+
@@ -994,9 +1059,9 @@ diff -up webrtc-20120613svn2401/src/modules/audio_processing/agc/Makefile.am.SAN
+ digital_agc.h
+
+AM_CFLAGS = -Iinclude -I../../.. -I../../../common_audio/signal_processing/include -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/modules/audio_processing/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_processing/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_processing/Makefile.am.SANITY 2012-07-11 13:05:05.642004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_processing/Makefile.am 2012-07-11 13:05:05.642004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_processing/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_processing/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_processing/Makefile.am.SANITY 2012-12-18 21:36:22.493635854 -0500
++++ webrtc-20121218svn2718/src/modules/audio_processing/Makefile.am 2012-12-18 21:36:22.493635854 -0500
@@ -0,0 +1,42 @@
+lib_LTLIBRARIES = libaudio_processing.la
+
@@ -1040,15 +1105,19 @@ diff -up webrtc-20120613svn2401/src/modules/audio_processing/Makefile.am.SANITY
+AM_CXXFLAGS = -Iinclude -I../interface -I../.. -I../../common_audio/signal_processing/include -DWEBRTC_LINUX -DWEBRTC_NS_FLOAT \
+ -I../../common_audio/vad/include -I../../system_wrappers/interface -Iaec/include -Iaecm/include -Iagc/include \
+ -Ins/include
-diff -up webrtc-20120613svn2401/src/modules/audio_processing/ns/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_processing/ns/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_processing/ns/Makefile.am.SANITY 2012-07-11 13:05:05.642004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_processing/ns/Makefile.am 2012-07-11 13:05:05.642004811 -0400
-@@ -0,0 +1,17 @@
+diff -up webrtc-20121218svn2718/src/modules/audio_processing/ns/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_processing/ns/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_processing/ns/Makefile.am.SANITY 2012-12-18 21:36:22.493635854 -0500
++++ webrtc-20121218svn2718/src/modules/audio_processing/ns/Makefile.am 2012-12-18 21:36:22.494635855 -0500
+@@ -0,0 +1,21 @@
+lib_LTLIBRARIES = libns.la
+
+libns_la_SOURCES = noise_suppression.c \
+ ns_core.c
+
++if ARM7_ENABLED
++libns_la_SOURCES += nsx_core_neon.c
++endif
++
+libns_la_LIBADD = ../utility/libapm_util.la \
+ ../../../common_audio/signal_processing/libsignal_processing.la
+
@@ -1061,9 +1130,9 @@ diff -up webrtc-20120613svn2401/src/modules/audio_processing/ns/Makefile.am.SANI
+ ns_core.h
+
+AM_CFLAGS = -Iinclude -I../../.. -I../utility -I../../../common_audio/signal_processing/include -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/modules/audio_processing/utility/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/audio_processing/utility/Makefile.am
---- webrtc-20120613svn2401/src/modules/audio_processing/utility/Makefile.am.SANITY 2012-07-11 13:05:05.643004811 -0400
-+++ webrtc-20120613svn2401/src/modules/audio_processing/utility/Makefile.am 2012-07-11 13:05:05.643004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/audio_processing/utility/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/audio_processing/utility/Makefile.am
+--- webrtc-20121218svn2718/src/modules/audio_processing/utility/Makefile.am.SANITY 2012-12-18 21:36:22.494635855 -0500
++++ webrtc-20121218svn2718/src/modules/audio_processing/utility/Makefile.am 2012-12-18 21:36:22.494635855 -0500
@@ -0,0 +1,20 @@
+lib_LTLIBRARIES = libapm_util.la
+
@@ -1085,16 +1154,16 @@ diff -up webrtc-20120613svn2401/src/modules/audio_processing/utility/Makefile.am
+ ring_buffer.h
+
+AM_CFLAGS = -Iinclude -I../interface -I../../.. -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/modules/bitrate_controller/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/bitrate_controller/Makefile.am
---- webrtc-20120613svn2401/src/modules/bitrate_controller/Makefile.am.SANITY 2012-07-11 13:05:05.643004811 -0400
-+++ webrtc-20120613svn2401/src/modules/bitrate_controller/Makefile.am 2012-07-11 13:05:05.643004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/bitrate_controller/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/bitrate_controller/Makefile.am
+--- webrtc-20121218svn2718/src/modules/bitrate_controller/Makefile.am.SANITY 2012-12-18 21:36:22.495635856 -0500
++++ webrtc-20121218svn2718/src/modules/bitrate_controller/Makefile.am 2012-12-18 21:36:22.495635856 -0500
@@ -0,0 +1,16 @@
+lib_LTLIBRARIES = libbitrate_controller.la
+
+libbitrate_controller_la_SOURCES = bitrate_controller_impl.cc \
+ send_side_bandwidth_estimation.cc
+
-+libbitrate_controller_la_LIBADD = ../../common_audio/signal_processing/libsignal_processing.la
++libbitrate_controller_la_LIBADD = ../../system_wrappers/source/libsystem_wrappers.la
+
+libbitrate_controller_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
+
@@ -1105,9 +1174,9 @@ diff -up webrtc-20120613svn2401/src/modules/bitrate_controller/Makefile.am.SANIT
+ send_side_bandwidth_estimation.h
+
+AM_CXXFLAGS = -Iinclude -I../interface -I../.. -I../../common_audio/signal_processing/include -I../rtp_rtcp/interface -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/modules/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/Makefile.am
---- webrtc-20120613svn2401/src/modules/Makefile.am.SANITY 2012-07-11 13:05:05.643004811 -0400
-+++ webrtc-20120613svn2401/src/modules/Makefile.am 2012-07-11 13:05:05.643004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/Makefile.am
+--- webrtc-20121218svn2718/src/modules/Makefile.am.SANITY 2012-12-18 21:36:22.495635856 -0500
++++ webrtc-20121218svn2718/src/modules/Makefile.am 2012-12-18 21:36:22.496635857 -0500
@@ -0,0 +1,6 @@
+SUBDIRS = audio_coding video_coding utility audio_processing/utility audio_processing/aec audio_processing/aecm audio_processing/agc audio_processing/ns audio_processing \
+ audio_conference_mixer audio_device bitrate_controller media_file remote_bitrate_estimator rtp_rtcp udp_transport video_capture video_processing video_render .
@@ -1115,18 +1184,18 @@ diff -up webrtc-20120613svn2401/src/modules/Makefile.am.SANITY webrtc-20120613sv
+modules_includedir = $(includedir)/webrtc/modules/
+nobase_modules_include_HEADERS = interface/module_common_types.h \
+ interface/module.h
-diff -up webrtc-20120613svn2401/src/modules/media_file/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/media_file/Makefile.am
---- webrtc-20120613svn2401/src/modules/media_file/Makefile.am.SANITY 2012-07-11 13:05:05.643004811 -0400
-+++ webrtc-20120613svn2401/src/modules/media_file/Makefile.am 2012-07-11 13:05:05.643004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/media_file/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/media_file/Makefile.am
+--- webrtc-20121218svn2718/src/modules/media_file/Makefile.am.SANITY 2012-12-18 21:36:22.496635857 -0500
++++ webrtc-20121218svn2718/src/modules/media_file/Makefile.am 2012-12-18 21:36:22.496635857 -0500
@@ -0,0 +1,5 @@
+SUBDIRS = source .
+
+media_file_includedir = $(includedir)/webrtc/modules/media_file/
+nobase_media_file_include_HEADERS = interface/media_file.h \
+ interface/media_file_defines.h
-diff -up webrtc-20120613svn2401/src/modules/media_file/source/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/media_file/source/Makefile.am
---- webrtc-20120613svn2401/src/modules/media_file/source/Makefile.am.SANITY 2012-07-11 13:05:05.644004811 -0400
-+++ webrtc-20120613svn2401/src/modules/media_file/source/Makefile.am 2012-07-11 13:05:05.643004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/media_file/source/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/media_file/source/Makefile.am
+--- webrtc-20121218svn2718/src/modules/media_file/source/Makefile.am.SANITY 2012-12-18 21:36:22.497635858 -0500
++++ webrtc-20121218svn2718/src/modules/media_file/source/Makefile.am 2012-12-18 21:36:22.497635858 -0500
@@ -0,0 +1,20 @@
+lib_LTLIBRARIES = libmedia_file.la
+
@@ -1148,9 +1217,9 @@ diff -up webrtc-20120613svn2401/src/modules/media_file/source/Makefile.am.SANITY
+AM_CXXFLAGS = -I../interface -I../../interface -I../../utility/interface \
+ -DWEBRTC_LINUX -I../../.. -I../../../system_wrappers/interface \
+ -DWEBRTC_MODULE_UTILITY_VIDEO
-diff -up webrtc-20120613svn2401/src/modules/remote_bitrate_estimator/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/remote_bitrate_estimator/Makefile.am
---- webrtc-20120613svn2401/src/modules/remote_bitrate_estimator/Makefile.am.SANITY 2012-07-11 13:05:05.644004811 -0400
-+++ webrtc-20120613svn2401/src/modules/remote_bitrate_estimator/Makefile.am 2012-07-11 13:05:05.644004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/remote_bitrate_estimator/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/remote_bitrate_estimator/Makefile.am
+--- webrtc-20121218svn2718/src/modules/remote_bitrate_estimator/Makefile.am.SANITY 2012-12-18 21:36:22.497635858 -0500
++++ webrtc-20121218svn2718/src/modules/remote_bitrate_estimator/Makefile.am 2012-12-18 21:36:22.497635858 -0500
@@ -0,0 +1,21 @@
+lib_LTLIBRARIES = libremote_bitrate_estimator.la
+
@@ -1173,9 +1242,9 @@ diff -up webrtc-20120613svn2401/src/modules/remote_bitrate_estimator/Makefile.am
+
+AM_CXXFLAGS = -Iinclude -I../interface -I../.. -I../../system_wrappers/interface -DWEBRTC_LINUX \
+ -I../rtp_rtcp/interface
-diff -up webrtc-20120613svn2401/src/modules/rtp_rtcp/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/rtp_rtcp/Makefile.am
---- webrtc-20120613svn2401/src/modules/rtp_rtcp/Makefile.am.SANITY 2012-07-11 13:05:05.644004811 -0400
-+++ webrtc-20120613svn2401/src/modules/rtp_rtcp/Makefile.am 2012-07-11 13:05:05.644004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/rtp_rtcp/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/rtp_rtcp/Makefile.am
+--- webrtc-20121218svn2718/src/modules/rtp_rtcp/Makefile.am.SANITY 2012-12-18 21:36:22.498635859 -0500
++++ webrtc-20121218svn2718/src/modules/rtp_rtcp/Makefile.am 2012-12-18 21:36:22.498635859 -0500
@@ -0,0 +1,6 @@
+SUBDIRS = source .
+
@@ -1183,9 +1252,9 @@ diff -up webrtc-20120613svn2401/src/modules/rtp_rtcp/Makefile.am.SANITY webrtc-2
+nobase_rtp_rtcp_include_HEADERS = interface/rtp_rtcp.h \
+ interface/rtp_rtcp_defines.h \
+ mocks/mock_rtp_rtcp.h
-diff -up webrtc-20120613svn2401/src/modules/rtp_rtcp/source/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/rtp_rtcp/source/Makefile.am
---- webrtc-20120613svn2401/src/modules/rtp_rtcp/source/Makefile.am.SANITY 2012-07-11 13:05:05.644004811 -0400
-+++ webrtc-20120613svn2401/src/modules/rtp_rtcp/source/Makefile.am 2012-07-11 13:05:05.644004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/rtp_rtcp/source/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/rtp_rtcp/source/Makefile.am
+--- webrtc-20121218svn2718/src/modules/rtp_rtcp/source/Makefile.am.SANITY 2012-12-18 21:36:22.499635860 -0500
++++ webrtc-20121218svn2718/src/modules/rtp_rtcp/source/Makefile.am 2012-12-19 09:59:43.741788029 -0500
@@ -0,0 +1,68 @@
+lib_LTLIBRARIES = librtp_rtcp.la
+
@@ -1255,17 +1324,17 @@ diff -up webrtc-20120613svn2401/src/modules/rtp_rtcp/source/Makefile.am.SANITY w
+AM_CXXFLAGS = -I../interface -I../../interface \
+ -DWEBRTC_LINUX -I../../.. -I../../../system_wrappers/interface \
+ -I../../remote_bitrate_estimator/include
-diff -up webrtc-20120613svn2401/src/modules/udp_transport/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/udp_transport/Makefile.am
---- webrtc-20120613svn2401/src/modules/udp_transport/Makefile.am.SANITY 2012-07-11 13:05:05.645004811 -0400
-+++ webrtc-20120613svn2401/src/modules/udp_transport/Makefile.am 2012-07-11 13:05:05.644004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/udp_transport/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/udp_transport/Makefile.am
+--- webrtc-20121218svn2718/src/modules/udp_transport/Makefile.am.SANITY 2012-12-18 21:36:22.499635860 -0500
++++ webrtc-20121218svn2718/src/modules/udp_transport/Makefile.am 2012-12-18 21:36:22.499635860 -0500
@@ -0,0 +1,4 @@
+SUBDIRS = source .
+
+udp_transport_includedir = $(includedir)/webrtc/modules/udp_transport/
+nobase_udp_transport_include_HEADERS = interface/udp_transport.h
-diff -up webrtc-20120613svn2401/src/modules/udp_transport/source/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/udp_transport/source/Makefile.am
---- webrtc-20120613svn2401/src/modules/udp_transport/source/Makefile.am.SANITY 2012-07-11 13:05:05.645004811 -0400
-+++ webrtc-20120613svn2401/src/modules/udp_transport/source/Makefile.am 2012-07-11 13:05:05.645004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/udp_transport/source/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/udp_transport/source/Makefile.am
+--- webrtc-20121218svn2718/src/modules/udp_transport/source/Makefile.am.SANITY 2012-12-18 21:36:22.500635861 -0500
++++ webrtc-20121218svn2718/src/modules/udp_transport/source/Makefile.am 2012-12-18 21:36:22.500635861 -0500
@@ -0,0 +1,22 @@
+lib_LTLIBRARIES = libudp_transport.la
+
@@ -1289,9 +1358,9 @@ diff -up webrtc-20120613svn2401/src/modules/udp_transport/source/Makefile.am.SAN
+
+AM_CXXFLAGS = -I../interface -I../../interface -fno-strict-aliasing \
+ -DWEBRTC_LINUX -I../../.. -I../../../system_wrappers/interface
-diff -up webrtc-20120613svn2401/src/modules/utility/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/utility/Makefile.am
---- webrtc-20120613svn2401/src/modules/utility/Makefile.am.SANITY 2012-07-11 13:05:05.645004811 -0400
-+++ webrtc-20120613svn2401/src/modules/utility/Makefile.am 2012-07-11 13:05:05.645004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/utility/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/utility/Makefile.am
+--- webrtc-20121218svn2718/src/modules/utility/Makefile.am.SANITY 2012-12-18 21:36:22.501635862 -0500
++++ webrtc-20121218svn2718/src/modules/utility/Makefile.am 2012-12-18 21:36:22.501635862 -0500
@@ -0,0 +1,8 @@
+SUBDIRS = source .
+
@@ -1301,9 +1370,9 @@ diff -up webrtc-20120613svn2401/src/modules/utility/Makefile.am.SANITY webrtc-20
+ interface/file_recorder.h \
+ interface/process_thread.h \
+ interface/rtp_dump.h
-diff -up webrtc-20120613svn2401/src/modules/utility/source/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/utility/source/Makefile.am
---- webrtc-20120613svn2401/src/modules/utility/source/Makefile.am.SANITY 2012-07-11 13:05:05.645004811 -0400
-+++ webrtc-20120613svn2401/src/modules/utility/source/Makefile.am 2012-07-11 13:05:05.645004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/utility/source/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/utility/source/Makefile.am
+--- webrtc-20121218svn2718/src/modules/utility/source/Makefile.am.SANITY 2012-12-18 21:36:22.502635863 -0500
++++ webrtc-20121218svn2718/src/modules/utility/source/Makefile.am 2012-12-18 21:36:22.502635863 -0500
@@ -0,0 +1,31 @@
+lib_LTLIBRARIES = libwebrtc_utility.la
+
@@ -1336,19 +1405,20 @@ diff -up webrtc-20120613svn2401/src/modules/utility/source/Makefile.am.SANITY we
+ -I../../audio_coding/main/interface -I../../video_coding/main/interface \
+ -DWEBRTC_LINUX -DWEBRTC_MODULE_UTILITY_VIDEO -I../../.. -I../../../system_wrappers/interface \
+ -I../../../common_audio/resampler/include
-diff -up webrtc-20120613svn2401/src/modules/video_capture/main/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_capture/main/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_capture/main/Makefile.am.SANITY 2012-07-11 13:05:05.645004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_capture/main/Makefile.am 2012-07-11 13:05:05.645004811 -0400
-@@ -0,0 +1,6 @@
+diff -up webrtc-20121218svn2718/src/modules/video_capture/main/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_capture/main/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_capture/main/Makefile.am.SANITY 2012-12-18 21:36:22.502635863 -0500
++++ webrtc-20121218svn2718/src/modules/video_capture/main/Makefile.am 2012-12-18 21:36:22.502635863 -0500
+@@ -0,0 +1,7 @@
+SUBDIRS = source .
+
+video_capture_main_includedir = $(includedir)/webrtc/modules/video_capture/main/
+nobase_video_capture_main_include_HEADERS = interface/video_capture_defines.h \
+ interface/video_capture_factory.h \
+ interface/video_capture.h
-diff -up webrtc-20120613svn2401/src/modules/video_capture/main/source/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_capture/main/source/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_capture/main/source/Makefile.am.SANITY 2012-07-11 13:05:05.646004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_capture/main/source/Makefile.am 2012-07-11 13:05:05.646004811 -0400
++
+diff -up webrtc-20121218svn2718/src/modules/video_capture/main/source/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_capture/main/source/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_capture/main/source/Makefile.am.SANITY 2012-12-18 21:36:22.503635864 -0500
++++ webrtc-20121218svn2718/src/modules/video_capture/main/source/Makefile.am 2012-12-18 21:36:22.503635864 -0500
@@ -0,0 +1,26 @@
+lib_LTLIBRARIES = libvideo_capture_module.la
+
@@ -1373,25 +1443,25 @@ diff -up webrtc-20120613svn2401/src/modules/video_capture/main/source/Makefile.a
+ Linux/device_info_linux.h \
+ Linux/video_capture_linux.h
+
-+AM_CXXFLAGS = -I../interface -I../../../interface -I../../../.. -ILinux \
++AM_CXXFLAGS = -I../../../interface -I../interface -I../.. -I../../../.. -ILinux \
+ -I../../../../system_wrappers/interface -DWEBRTC_LINUX \
+ -I../../../utility/interface -I../../../../common_video/libyuv/include
-diff -up webrtc-20120613svn2401/src/modules/video_capture/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_capture/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_capture/Makefile.am.SANITY 2012-07-11 13:05:05.646004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_capture/Makefile.am 2012-07-11 13:05:05.646004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/video_capture/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_capture/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_capture/Makefile.am.SANITY 2012-12-18 21:36:22.503635864 -0500
++++ webrtc-20121218svn2718/src/modules/video_capture/Makefile.am 2012-12-18 21:36:22.504635865 -0500
@@ -0,0 +1 @@
+SUBDIRS = main
-diff -up webrtc-20120613svn2401/src/modules/video_coding/codecs/i420/main/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_coding/codecs/i420/main/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_coding/codecs/i420/main/Makefile.am.SANITY 2012-07-11 13:05:05.646004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_coding/codecs/i420/main/Makefile.am 2012-07-11 13:05:05.646004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/video_coding/codecs/i420/main/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_coding/codecs/i420/main/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_coding/codecs/i420/main/Makefile.am.SANITY 2012-12-18 21:36:22.504635865 -0500
++++ webrtc-20121218svn2718/src/modules/video_coding/codecs/i420/main/Makefile.am 2012-12-18 21:36:22.504635865 -0500
@@ -0,0 +1,4 @@
+SUBDIRS = source .
+
+video_coding_codecs_i420_main_includedir = $(includedir)/webrtc/modules/video_coding/codecs/i420/main/
+nobase_video_coding_codecs_i420_main_include_HEADERS = interface/i420.h
-diff -up webrtc-20120613svn2401/src/modules/video_coding/codecs/i420/main/source/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_coding/codecs/i420/main/source/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_coding/codecs/i420/main/source/Makefile.am.SANITY 2012-07-11 13:05:05.647004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_coding/codecs/i420/main/source/Makefile.am 2012-07-11 13:05:05.646004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/video_coding/codecs/i420/main/source/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_coding/codecs/i420/main/source/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_coding/codecs/i420/main/source/Makefile.am.SANITY 2012-12-18 21:36:22.505635866 -0500
++++ webrtc-20121218svn2718/src/modules/video_coding/codecs/i420/main/source/Makefile.am 2012-12-18 21:36:22.505635866 -0500
@@ -0,0 +1,13 @@
+lib_LTLIBRARIES = libwebrtc_i420.la
+
@@ -1406,34 +1476,25 @@ diff -up webrtc-20120613svn2401/src/modules/video_coding/codecs/i420/main/source
+libwebrtc_i420_include_HEADERS =
+
+AM_CXXFLAGS = -I../interface -I../../../interface -I../../../../../../common_video/interface -I../../../../../.. -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/modules/video_coding/codecs/i420/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_coding/codecs/i420/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_coding/codecs/i420/Makefile.am.SANITY 2012-07-11 13:05:05.647004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_coding/codecs/i420/Makefile.am 2012-07-11 13:05:05.647004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/video_coding/codecs/i420/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_coding/codecs/i420/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_coding/codecs/i420/Makefile.am.SANITY 2012-12-18 21:36:22.505635866 -0500
++++ webrtc-20121218svn2718/src/modules/video_coding/codecs/i420/Makefile.am 2012-12-18 21:36:22.506635867 -0500
@@ -0,0 +1 @@
+SUBDIRS = main
-diff -up webrtc-20120613svn2401/src/modules/video_coding/codecs/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_coding/codecs/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_coding/codecs/Makefile.am.SANITY 2012-07-11 13:05:05.647004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_coding/codecs/Makefile.am 2012-07-11 13:05:05.647004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/video_coding/codecs/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_coding/codecs/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_coding/codecs/Makefile.am.SANITY 2012-12-18 21:36:22.506635867 -0500
++++ webrtc-20121218svn2718/src/modules/video_coding/codecs/Makefile.am 2012-12-18 21:36:22.506635867 -0500
@@ -0,0 +1,6 @@
-+SUBDIRS = i420 vp8 .
++SUBDIRS = vp8 i420 .
+
+video_coding_codecs_includedir = $(includedir)/webrtc/modules/video_coding/codecs/
+nobase_video_coding_codecs_include_HEADERS = interface/mock/mock_video_codec_interface.h \
+ interface/video_codec_interface.h \
+ interface/video_error_codes.h
-diff -up webrtc-20120613svn2401/src/modules/video_coding/codecs/vp8/main/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_coding/codecs/vp8/main/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_coding/codecs/vp8/main/Makefile.am.SANITY 2012-07-11 13:05:05.647004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_coding/codecs/vp8/main/Makefile.am 2012-07-11 13:05:05.647004811 -0400
-@@ -0,0 +1,5 @@
-+SUBDIRS = source .
-+
-+video_coding_codecs_vp8_main_includedir = $(includedir)/webrtc/modules/video_coding/codecs/vp8/main/
-+nobase_video_coding_codecs_vp8_main_include_HEADERS = interface/vp8_common_types.h \
-+ interface/vp8.h
-diff -up webrtc-20120613svn2401/src/modules/video_coding/codecs/vp8/main/source/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_coding/codecs/vp8/main/source/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_coding/codecs/vp8/main/source/Makefile.am.SANITY 2012-07-11 13:05:05.647004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_coding/codecs/vp8/main/source/Makefile.am 2012-07-11 13:05:05.647004811 -0400
-@@ -0,0 +1,20 @@
+diff -up webrtc-20121218svn2718/src/modules/video_coding/codecs/vp8/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_coding/codecs/vp8/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_coding/codecs/vp8/Makefile.am.SANITY 2012-12-18 21:36:22.507635868 -0500
++++ webrtc-20121218svn2718/src/modules/video_coding/codecs/vp8/Makefile.am 2012-12-18 21:36:22.507635868 -0500
+@@ -0,0 +1,22 @@
+lib_LTLIBRARIES = libwebrtc_vp8.la
+
+libwebrtc_vp8_la_SOURCES = temporal_layers.cc \
@@ -1441,27 +1502,24 @@ diff -up webrtc-20120613svn2401/src/modules/video_coding/codecs/vp8/main/source/
+ vp8.cc
+
+libwebrtc_vp8_la_LIBADD = $(VPX_LIBS) \
-+ ../../../../../../system_wrappers/source/libsystem_wrappers.la \
-+ ../../../../../../common_video/libyuv/libwebrtc_libyuv.la
++ ../../../../system_wrappers/source/libsystem_wrappers.la \
++ ../../../../common_video/libyuv/libwebrtc_libyuv.la
+
+libwebrtc_vp8_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
+
-+libwebrtc_vp8_includedir = $(includedir)/webrtc/modules/video_coding/codecs/vp8/main/
++libwebrtc_vp8_includedir = $(includedir)/webrtc/modules/video_coding/codecs/vp8
+
-+libwebrtc_vp8_include_HEADERS = temporal_layers.h \
-+ reference_picture_selection.h
++nobase_libwebrtc_vp8_include_HEADERS = temporal_layers.h \
++ reference_picture_selection.h \
++ include/vp8.h \
++ include/vp8_common_types.h
+
-+AM_CXXFLAGS = -I../interface -I../../../interface -I../../../../../interface -DWEBRTC_LIBVPX_VERSION=971 \
-+ -I../../../../../../common_video/interface -I../../../../../.. -DWEBRTC_LINUX \
-+ -I../../../../../../system_wrappers/interface
-diff -up webrtc-20120613svn2401/src/modules/video_coding/codecs/vp8/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_coding/codecs/vp8/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_coding/codecs/vp8/Makefile.am.SANITY 2012-07-11 13:05:05.648004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_coding/codecs/vp8/Makefile.am 2012-07-11 13:05:05.648004811 -0400
-@@ -0,0 +1 @@
-+SUBDIRS = main
-diff -up webrtc-20120613svn2401/src/modules/video_coding/main/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_coding/main/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_coding/main/Makefile.am.SANITY 2012-07-11 13:05:05.648004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_coding/main/Makefile.am 2012-07-11 13:05:05.648004811 -0400
++AM_CXXFLAGS = -I../interface -I../../../interface -DWEBRTC_LIBVPX_VERSION=971 \
++ -I../../../../common_video/interface -I../../../.. -DWEBRTC_LINUX \
++ -I../../../../system_wrappers/interface -Iinclude
+diff -up webrtc-20121218svn2718/src/modules/video_coding/main/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_coding/main/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_coding/main/Makefile.am.SANITY 2012-12-18 21:36:22.507635868 -0500
++++ webrtc-20121218svn2718/src/modules/video_coding/main/Makefile.am 2012-12-18 21:36:22.508635869 -0500
@@ -0,0 +1,6 @@
+SUBDIRS = source .
+
@@ -1469,10 +1527,10 @@ diff -up webrtc-20120613svn2401/src/modules/video_coding/main/Makefile.am.SANITY
+nobase_video_coding_main_include_HEADERS = interface/mock/mock_vcm_callbacks.h \
+ interface/video_coding_defines.h \
+ interface/video_coding.h
-diff -up webrtc-20120613svn2401/src/modules/video_coding/main/source/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_coding/main/source/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_coding/main/source/Makefile.am.SANITY 2012-07-11 13:05:05.648004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_coding/main/source/Makefile.am 2012-07-11 13:05:05.648004811 -0400
-@@ -0,0 +1,73 @@
+diff -up webrtc-20121218svn2718/src/modules/video_coding/main/source/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_coding/main/source/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_coding/main/source/Makefile.am.SANITY 2012-12-18 21:36:22.508635869 -0500
++++ webrtc-20121218svn2718/src/modules/video_coding/main/source/Makefile.am 2012-12-18 21:36:22.508635869 -0500
+@@ -0,0 +1,72 @@
+lib_LTLIBRARIES = libwebrtc_video_coding.la
+
+libwebrtc_video_coding_la_SOURCES = codec_database.cc\
@@ -1502,8 +1560,7 @@ diff -up webrtc-20120613svn2401/src/modules/video_coding/main/source/Makefile.am
+ video_coding_impl.cc
+
+libwebrtc_video_coding_la_LIBADD = ../../codecs/i420/main/source/libwebrtc_i420.la \
-+ ../../codecs/vp8/main/source/libwebrtc_vp8.la \
-+ ../../../../common_video/libyuv/libwebrtc_libyuv.la \
++ ../../codecs/vp8/libwebrtc_vp8.la \
+ ../../../../system_wrappers/source/libsystem_wrappers.la
+
+libwebrtc_video_coding_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
@@ -1545,25 +1602,25 @@ diff -up webrtc-20120613svn2401/src/modules/video_coding/main/source/Makefile.am
+
+AM_CXXFLAGS = -I../interface -I../../../interface -I../../codecs/interface -I../../../.. \
+ -I../../../../common_video/interface -I../../../../system_wrappers/interface -DWEBRTC_LINUX \
-+ -I../../codecs/vp8/main/interface/ -I../../codecs/i420/main/interface
-diff -up webrtc-20120613svn2401/src/modules/video_coding/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_coding/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_coding/Makefile.am.SANITY 2012-07-11 13:05:05.649004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_coding/Makefile.am 2012-07-11 13:05:05.648004811 -0400
++ -I../../codecs/vp8/include -I../../codecs/i420/main/interface
+diff -up webrtc-20121218svn2718/src/modules/video_coding/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_coding/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_coding/Makefile.am.SANITY 2012-12-18 21:36:22.509635870 -0500
++++ webrtc-20121218svn2718/src/modules/video_coding/Makefile.am 2012-12-18 21:36:22.509635870 -0500
@@ -0,0 +1 @@
+SUBDIRS = codecs main
-diff -up webrtc-20120613svn2401/src/modules/video_processing/main/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_processing/main/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_processing/main/Makefile.am.SANITY 2012-07-11 13:05:05.649004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_processing/main/Makefile.am 2012-07-11 13:05:05.649004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/video_processing/main/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_processing/main/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_processing/main/Makefile.am.SANITY 2012-12-18 21:36:22.510635871 -0500
++++ webrtc-20121218svn2718/src/modules/video_processing/main/Makefile.am 2012-12-18 21:36:22.510635871 -0500
@@ -0,0 +1,5 @@
+SUBDIRS = source .
+
+video_processing_includedir = $(includedir)/webrtc/modules/video_processing/
+nobase_video_processing_include_HEADERS = interface/video_processing_defines.h \
+ interface/video_processing.h
-diff -up webrtc-20120613svn2401/src/modules/video_processing/main/source/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_processing/main/source/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_processing/main/source/Makefile.am.SANITY 2012-07-11 13:05:05.649004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_processing/main/source/Makefile.am 2012-07-11 13:05:05.649004811 -0400
-@@ -0,0 +1,37 @@
+diff -up webrtc-20121218svn2718/src/modules/video_processing/main/source/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_processing/main/source/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_processing/main/source/Makefile.am.SANITY 2012-12-18 21:36:22.510635871 -0500
++++ webrtc-20121218svn2718/src/modules/video_processing/main/source/Makefile.am 2012-12-18 21:36:22.510635871 -0500
+@@ -0,0 +1,48 @@
+lib_LTLIBRARIES = libvideo_processing.la
+
+libvideo_processing_la_SOURCES = brighten.cc \
@@ -1575,8 +1632,13 @@ diff -up webrtc-20120613svn2401/src/modules/video_processing/main/source/Makefil
+ frame_preprocessor.cc \
+ spatial_resampler.cc \
+ video_decimator.cc \
-+ video_processing_impl.cc \
-+ content_analysis_sse2.cc
++ video_processing_impl.cc
++
++if ARM
++# Do nothing for now.
++else
++libvideo_processing_la_SOURCES += content_analysis_sse2.cc
++endif
+
+libvideo_processing_la_LIBADD = ../../../../common_video/libyuv/libwebrtc_libyuv.la \
+ ../../../../common_audio/signal_processing/libsignal_processing.la \
@@ -1600,24 +1662,31 @@ diff -up webrtc-20120613svn2401/src/modules/video_processing/main/source/Makefil
+
+AM_CXXFLAGS = -I../interface -I../../../interface -I../../../.. -DWEBRTC_LINUX \
+ -I../../../../common_video/libyuv/include -I../../../../common_audio/signal_processing/include \
-+ -I../../../../system_wrappers/interface -msse2
-diff -up webrtc-20120613svn2401/src/modules/video_processing/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_processing/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_processing/Makefile.am.SANITY 2012-07-11 13:05:05.649004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_processing/Makefile.am 2012-07-11 13:05:05.649004811 -0400
++ -I../../../../system_wrappers/interface
++
++if ARM
++# Do nothing for now.
++else
++AM_CXXFLAGS += -msse2
++endif
+diff -up webrtc-20121218svn2718/src/modules/video_processing/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_processing/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_processing/Makefile.am.SANITY 2012-12-18 21:36:22.513635873 -0500
++++ webrtc-20121218svn2718/src/modules/video_processing/Makefile.am 2012-12-18 21:36:22.513635873 -0500
@@ -0,0 +1 @@
+SUBDIRS = main
-diff -up webrtc-20120613svn2401/src/modules/video_render/main/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_render/main/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_render/main/Makefile.am.SANITY 2012-07-11 13:05:05.649004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_render/main/Makefile.am 2012-07-11 13:05:05.649004811 -0400
-@@ -0,0 +1,5 @@
+diff -up webrtc-20121218svn2718/src/modules/video_render/main/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_render/main/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_render/main/Makefile.am.SANITY 2012-12-18 21:36:22.513635873 -0500
++++ webrtc-20121218svn2718/src/modules/video_render/main/Makefile.am 2012-12-18 21:36:22.513635873 -0500
+@@ -0,0 +1,6 @@
+SUBDIRS = source .
+
+video_render_main_includedir = $(includedir)/webrtc/modules/video_render/main/
+nobase_video_render_main_include_HEADERS = interface/video_render_defines.h \
+ interface/video_render.h
-diff -up webrtc-20120613svn2401/src/modules/video_render/main/source/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_render/main/source/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_render/main/source/Makefile.am.SANITY 2012-07-11 13:05:05.650004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_render/main/source/Makefile.am 2012-07-11 13:05:05.650004811 -0400
++
+diff -up webrtc-20121218svn2718/src/modules/video_render/main/source/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_render/main/source/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_render/main/source/Makefile.am.SANITY 2012-12-18 21:36:22.514635874 -0500
++++ webrtc-20121218svn2718/src/modules/video_render/main/source/Makefile.am 2012-12-18 21:36:22.514635874 -0500
@@ -0,0 +1,30 @@
+lib_LTLIBRARIES = libvideo_render_module.la
+
@@ -1649,50 +1718,51 @@ diff -up webrtc-20120613svn2401/src/modules/video_render/main/source/Makefile.am
+AM_CXXFLAGS = -I../interface -I../../../interface -I../../ -I../../../.. -DWEBRTC_LINUX \
+ -I../../../../common_video/libyuv/include -I../../../../system_wrappers/interface \
+ -I../../../utility/interface -DWEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER
-diff -up webrtc-20120613svn2401/src/modules/video_render/Makefile.am.SANITY webrtc-20120613svn2401/src/modules/video_render/Makefile.am
---- webrtc-20120613svn2401/src/modules/video_render/Makefile.am.SANITY 2012-07-11 13:05:05.650004811 -0400
-+++ webrtc-20120613svn2401/src/modules/video_render/Makefile.am 2012-07-11 13:05:05.650004811 -0400
+diff -up webrtc-20121218svn2718/src/modules/video_render/Makefile.am.SANITY webrtc-20121218svn2718/src/modules/video_render/Makefile.am
+--- webrtc-20121218svn2718/src/modules/video_render/Makefile.am.SANITY 2012-12-18 21:36:22.515635875 -0500
++++ webrtc-20121218svn2718/src/modules/video_render/Makefile.am 2012-12-18 21:36:22.515635875 -0500
@@ -0,0 +1 @@
+SUBDIRS = main
-diff -up webrtc-20120613svn2401/src/system_wrappers/Makefile.am.SANITY webrtc-20120613svn2401/src/system_wrappers/Makefile.am
---- webrtc-20120613svn2401/src/system_wrappers/Makefile.am.SANITY 2012-07-11 13:05:05.650004811 -0400
-+++ webrtc-20120613svn2401/src/system_wrappers/Makefile.am 2012-07-11 13:05:05.650004811 -0400
-@@ -0,0 +1,29 @@
+diff -up webrtc-20121218svn2718/src/system_wrappers/Makefile.am.SANITY webrtc-20121218svn2718/src/system_wrappers/Makefile.am
+--- webrtc-20121218svn2718/src/system_wrappers/Makefile.am.SANITY 2012-12-18 21:36:22.515635875 -0500
++++ webrtc-20121218svn2718/src/system_wrappers/Makefile.am 2012-12-18 21:36:22.515635875 -0500
+@@ -0,0 +1,30 @@
+SUBDIRS = source .
+
-+voice_engine_includedir = $(includedir)/webrtc/system_wrappers/
-+nobase_voice_engine_include_HEADERS = interface/aligned_malloc.h \
-+ interface/atomic32.h \
-+ interface/compile_assert.h \
-+ interface/condition_variable_wrapper.h \
-+ interface/constructor_magic.h \
-+ interface/cpu_features_wrapper.h \
-+ interface/cpu_info.h \
-+ interface/cpu_wrapper.h \
-+ interface/critical_section_wrapper.h \
-+ interface/data_log_c.h \
-+ interface/data_log.h \
-+ interface/data_log_impl.h \
-+ interface/event_wrapper.h \
-+ interface/file_wrapper.h \
-+ interface/fix_interlocked_exchange_pointer_win.h \
-+ interface/list_wrapper.h \
-+ interface/map_wrapper.h \
-+ interface/ref_count.h \
-+ interface/rw_lock_wrapper.h \
-+ interface/scoped_ptr.h \
-+ interface/scoped_refptr.h \
-+ interface/sort.h \
-+ interface/static_instance.h \
-+ interface/thread_wrapper.h \
-+ interface/tick_util.h \
-+ interface/trace.h
-diff -up webrtc-20120613svn2401/src/system_wrappers/source/Makefile.am.SANITY webrtc-20120613svn2401/src/system_wrappers/source/Makefile.am
---- webrtc-20120613svn2401/src/system_wrappers/source/Makefile.am.SANITY 2012-07-11 13:05:05.651004811 -0400
-+++ webrtc-20120613svn2401/src/system_wrappers/source/Makefile.am 2012-07-11 13:05:05.650004811 -0400
-@@ -0,0 +1,47 @@
++system_wrappers_includedir = $(includedir)/webrtc/system_wrappers/
++nobase_system_wrappers_include_HEADERS = interface/aligned_malloc.h \
++ interface/atomic32.h \
++ interface/compile_assert.h \
++ interface/condition_variable_wrapper.h \
++ interface/constructor_magic.h \
++ interface/cpu_features_wrapper.h \
++ interface/cpu_info.h \
++ interface/cpu_wrapper.h \
++ interface/critical_section_wrapper.h \
++ interface/data_log_c.h \
++ interface/data_log.h \
++ interface/data_log_impl.h \
++ interface/event_wrapper.h \
++ interface/file_wrapper.h \
++ interface/fix_interlocked_exchange_pointer_win.h \
++ interface/list_wrapper.h \
++ interface/map_wrapper.h \
++ interface/ref_count.h \
++ interface/rw_lock_wrapper.h \
++ interface/scoped_ptr.h \
++ interface/scoped_refptr.h \
++ interface/sleep.h \
++ interface/sort.h \
++ interface/static_instance.h \
++ interface/thread_wrapper.h \
++ interface/tick_util.h \
++ interface/trace.h
+diff -up webrtc-20121218svn2718/src/system_wrappers/source/Makefile.am.SANITY webrtc-20121218svn2718/src/system_wrappers/source/Makefile.am
+--- webrtc-20121218svn2718/src/system_wrappers/source/Makefile.am.SANITY 2012-12-18 21:36:22.516635876 -0500
++++ webrtc-20121218svn2718/src/system_wrappers/source/Makefile.am 2012-12-18 21:36:22.516635876 -0500
+@@ -0,0 +1,48 @@
+lib_LTLIBRARIES = libsystem_wrappers.la
-+
++
+libsystem_wrappers_la_SOURCES = aligned_malloc.cc \
+ atomic32_posix.cc \
+ condition_variable.cc \
@@ -1712,6 +1782,7 @@ diff -up webrtc-20120613svn2401/src/system_wrappers/source/Makefile.am.SANITY we
+ map.cc \
+ rw_lock.cc \
+ rw_lock_posix.cc \
++ sleep.cc \
+ sort.cc \
+ thread.cc \
+ thread_posix.cc \
@@ -1738,13 +1809,77 @@ diff -up webrtc-20120613svn2401/src/system_wrappers/source/Makefile.am.SANITY we
+ spreadsortlib/spreadsort.hpp
+
+AM_CXXFLAGS = -Ispreadsortlib -I../interface -I../../ -DWEBRTC_LINUX
-diff -up webrtc-20120613svn2401/src/video_engine/Makefile.am.SANITY webrtc-20120613svn2401/src/video_engine/Makefile.am
---- webrtc-20120613svn2401/src/video_engine/Makefile.am.SANITY 2012-07-11 13:05:05.651004811 -0400
-+++ webrtc-20120613svn2401/src/video_engine/Makefile.am 2012-07-11 13:05:05.651004811 -0400
-@@ -0,0 +1,105 @@
+diff -up webrtc-20121218svn2718/src/tools/converter/Makefile.am.SANITY webrtc-20121218svn2718/src/tools/converter/Makefile.am
+--- webrtc-20121218svn2718/src/tools/converter/Makefile.am.SANITY 2012-12-18 21:36:22.518635878 -0500
++++ webrtc-20121218svn2718/src/tools/converter/Makefile.am 2012-12-18 21:36:22.518635878 -0500
+@@ -0,0 +1,7 @@
++bin_PROGRAMS = rgba_to_i420_converter
++
++rgba_to_i420_converter_SOURCES = converter.cc rgba_to_i420_converter.cc
++
++rgba_to_i420_converter_LDADD = ../libsimple_command_line_parser.la $(LIBYUV_LIBS)
++
++AM_CXXFLAGS = -I. -DWEBRTC_LINUX $(LIBYUV_CFLAGS) -I../..
+diff -up webrtc-20121218svn2718/src/tools/frame_analyzer/Makefile.am.SANITY webrtc-20121218svn2718/src/tools/frame_analyzer/Makefile.am
+--- webrtc-20121218svn2718/src/tools/frame_analyzer/Makefile.am.SANITY 2012-12-18 21:36:22.519635879 -0500
++++ webrtc-20121218svn2718/src/tools/frame_analyzer/Makefile.am 2012-12-18 21:36:22.519635879 -0500
+@@ -0,0 +1,18 @@
++lib_LTLIBRARIES = libvideo_quality_analysis.la
++
++bin_PROGRAMS = frame_analyzer
++
++frame_analyzer_SOURCES = frame_analyzer.cc
++
++frame_analyzer_LDADD = libvideo_quality_analysis.la ../libsimple_command_line_parser.la
++
++libvideo_quality_analysis_la_SOURCES = video_quality_analysis.cc
++
++libvideo_quality_analysis_la_LIBADD = $(LIBYUV_LIBS)
++
++libvideo_quality_analysis_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
++
++libvideo_quality_analysis_includedir = $(includedir)/webrtc/tools/frame_analyzer/
++nobase_libvideo_quality_analysis_include_HEADERS = video_quality_analysis.h
++
++AM_CXXFLAGS = -I. $(LIBYUV_CFLAGS) -I../.. -DWEBRTC_LINUX
+diff -up webrtc-20121218svn2718/src/tools/Makefile.am.SANITY webrtc-20121218svn2718/src/tools/Makefile.am
+--- webrtc-20121218svn2718/src/tools/Makefile.am.SANITY 2012-12-18 21:36:22.519635879 -0500
++++ webrtc-20121218svn2718/src/tools/Makefile.am 2012-12-18 21:36:22.519635879 -0500
+@@ -0,0 +1,14 @@
++SUBDIRS = . frame_analyzer psnr_ssim_analyzer converter
++
++lib_LTLIBRARIES = libsimple_command_line_parser.la
++
++libsimple_command_line_parser_la_SOURCES = simple_command_line_parser.cc
++
++libsimple_command_line_parser_la_LIBADD =
++
++libsimple_command_line_parser_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
++
++libsimple_command_line_parser_includedir = $(includedir)/webrtc/tools
++nobase_libsimple_command_line_parser_include_HEADERS = simple_command_line_parser.h
++
++AM_CXXFLAGS = -I. -I..
+diff -up webrtc-20121218svn2718/src/tools/psnr_ssim_analyzer/Makefile.am.SANITY webrtc-20121218svn2718/src/tools/psnr_ssim_analyzer/Makefile.am
+--- webrtc-20121218svn2718/src/tools/psnr_ssim_analyzer/Makefile.am.SANITY 2012-12-18 21:36:22.520635880 -0500
++++ webrtc-20121218svn2718/src/tools/psnr_ssim_analyzer/Makefile.am 2012-12-18 21:36:22.520635880 -0500
+@@ -0,0 +1,7 @@
++bin_PROGRAMS = psnr_ssim_analyzer
++
++psnr_ssim_analyzer_SOURCES = psnr_ssim_analyzer.cc
++
++psnr_ssim_analyzer_LDADD = ../frame_analyzer/libvideo_quality_analysis.la ../libsimple_command_line_parser.la
++
++AM_CXXFLAGS = -I. -DWEBRTC_LINUX -I../..
+diff -up webrtc-20121218svn2718/src/video_engine/Makefile.am.SANITY webrtc-20121218svn2718/src/video_engine/Makefile.am
+--- webrtc-20121218svn2718/src/video_engine/Makefile.am.SANITY 2012-12-18 21:36:22.521635881 -0500
++++ webrtc-20121218svn2718/src/video_engine/Makefile.am 2012-12-19 10:00:43.940790454 -0500
+@@ -0,0 +1,109 @@
+lib_LTLIBRARIES = libvideo_engine_core.la
+
-+libvideo_engine_core_la_SOURCES = vie_base_impl.cc \
++libvideo_engine_core_la_SOURCES = encoder_state_feedback.cc \
++ stream_synchronization.cc \
++ vie_base_impl.cc \
+ vie_capture_impl.cc \
+ vie_codec_impl.cc \
+ vie_encryption_impl.cc \
@@ -1787,7 +1922,7 @@ diff -up webrtc-20120613svn2401/src/video_engine/Makefile.am.SANITY webrtc-20120
+ ../modules/video_coding/main/source/libwebrtc_video_coding.la \
+ ../modules/video_processing/main/source/libvideo_processing.la \
+ ../modules/video_render/main/source/libvideo_render_module.la \
-+ ../voice_engine/main/source/libvoice_engine_core.la \
++ ../voice_engine/libvoice_engine_core.la \
+ ../system_wrappers/source/libsystem_wrappers.la
+
+libvideo_engine_core_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
@@ -1805,6 +1940,8 @@ diff -up webrtc-20120613svn2401/src/video_engine/Makefile.am.SANITY webrtc-20120
+ include/vie_network.h \
+ include/vie_render.h \
+ include/vie_rtp_rtcp.h \
++ encoder_state_feedback.h \
++ stream_synchronization.h \
+ vie_base_impl.h \
+ vie_capture_impl.h \
+ vie_codec_impl.h \
@@ -1844,37 +1981,13 @@ diff -up webrtc-20120613svn2401/src/video_engine/Makefile.am.SANITY webrtc-20120
+ -I../modules/media_file/interface -I../modules/rtp_rtcp/interface \
+ -I../modules/udp_transport/interface -I../modules/utility/interface \
+ -I../modules/bitrate_controller/include -I../modules/video_coding/main/interface \
-+ -I../modules/video_processing/main/interface -I../voice_engine/main/interface \
++ -I../modules/video_processing/main/interface -I../voice_engine/include \
+ -I../system_wrappers/interface -I../modules/interface -I../modules/audio_coding/main/interface \
+ -I../modules/video_coding/codecs/interface
-diff -up webrtc-20120613svn2401/src/voice_engine/main/Makefile.am.SANITY webrtc-20120613svn2401/src/voice_engine/main/Makefile.am
---- webrtc-20120613svn2401/src/voice_engine/main/Makefile.am.SANITY 2012-07-11 13:05:05.651004811 -0400
-+++ webrtc-20120613svn2401/src/voice_engine/main/Makefile.am 2012-07-11 13:05:05.651004811 -0400
-@@ -0,0 +1,20 @@
-+SUBDIRS = source .
-+
-+voice_engine_includedir = $(includedir)/webrtc/voice_engine/main/
-+nobase_voice_engine_include_HEADERS = interface/voe_audio_processing.h \
-+ interface/voe_base.h \
-+ interface/voe_call_report.h \
-+ interface/voe_codec.h \
-+ interface/voe_dtmf.h \
-+ interface/voe_encryption.h \
-+ interface/voe_errors.h \
-+ interface/voe_external_media.h \
-+ interface/voe_file.h \
-+ interface/voe_hardware.h \
-+ interface/voe_neteq_stats.h \
-+ interface/voe_network.h \
-+ interface/voe_rtp_rtcp.h \
-+ interface/voe_video_sync.h \
-+ interface/voe_volume_control.h
-+
-+
-diff -up webrtc-20120613svn2401/src/voice_engine/main/source/Makefile.am.SANITY webrtc-20120613svn2401/src/voice_engine/main/source/Makefile.am
---- webrtc-20120613svn2401/src/voice_engine/main/source/Makefile.am.SANITY 2012-07-11 13:05:05.652004811 -0400
-+++ webrtc-20120613svn2401/src/voice_engine/main/source/Makefile.am 2012-07-11 13:05:05.651004811 -0400
-@@ -0,0 +1,83 @@
+diff -up webrtc-20121218svn2718/src/voice_engine/Makefile.am.SANITY webrtc-20121218svn2718/src/voice_engine/Makefile.am
+--- webrtc-20121218svn2718/src/voice_engine/Makefile.am.SANITY 2012-12-18 21:36:22.521635881 -0500
++++ webrtc-20121218svn2718/src/voice_engine/Makefile.am 2012-12-18 21:36:22.521635881 -0500
+@@ -0,0 +1,102 @@
+lib_LTLIBRARIES = libvoice_engine_core.la
+
+libvoice_engine_core_la_SOURCES = channel.cc \
@@ -1885,6 +1998,7 @@ diff -up webrtc-20120613svn2401/src/voice_engine/main/source/Makefile.am.SANITY
+ level_indicator.cc \
+ monitor_module.cc \
+ output_mixer.cc \
++ output_mixer_internal.cc \
+ shared_data.cc \
+ statistics.cc \
+ transmit_mixer.cc \
@@ -1905,23 +2019,23 @@ diff -up webrtc-20120613svn2401/src/voice_engine/main/source/Makefile.am.SANITY
+ voe_volume_control_impl.cc \
+ voice_engine_impl.cc
+
-+libvoice_engine_core_la_LIBADD = ../../../common_audio/resampler/libresampler.la \
-+ ../../../common_audio/signal_processing/libsignal_processing.la \
-+ ../../../modules/audio_coding/main/source/libaudio_coding_module.la \
-+ ../../../modules/audio_conference_mixer/source/libaudio_conference_mixer.la \
-+ ../../../modules/audio_device/main/source/libaudio_device.la \
-+ ../../../modules/audio_processing/libaudio_processing.la \
-+ ../../../modules/media_file/source/libmedia_file.la \
-+ ../../../modules/rtp_rtcp/source/librtp_rtcp.la \
-+ ../../../modules/udp_transport/source/libudp_transport.la \
-+ ../../../modules/utility/source/libwebrtc_utility.la \
-+ ../../../system_wrappers/source/libsystem_wrappers.la
++libvoice_engine_core_la_LIBADD = ../common_audio/resampler/libresampler.la \
++ ../common_audio/signal_processing/libsignal_processing.la \
++ ../modules/audio_coding/main/source/libaudio_coding_module.la \
++ ../modules/audio_conference_mixer/source/libaudio_conference_mixer.la \
++ ../modules/audio_device/main/source/libaudio_device.la \
++ ../modules/audio_processing/libaudio_processing.la \
++ ../modules/media_file/source/libmedia_file.la \
++ ../modules/rtp_rtcp/source/librtp_rtcp.la \
++ ../modules/udp_transport/source/libudp_transport.la \
++ ../modules/utility/source/libwebrtc_utility.la \
++ ../system_wrappers/source/libsystem_wrappers.la
+
+libvoice_engine_core_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
+
-+libvoice_engine_core_includedir = $(includedir)/webrtc/voice_engine/main/
++libvoice_engine_core_includedir = $(includedir)/webrtc/voice_engine/
+
-+libvoice_engine_core_include_HEADERS = channel.h \
++nobase_libvoice_engine_core_include_HEADERS = channel.h \
+ channel_manager.h \
+ channel_manager_base.h \
+ dtmf_inband.h \
@@ -1929,10 +2043,28 @@ diff -up webrtc-20120613svn2401/src/voice_engine/main/source/Makefile.am.SANITY
+ level_indicator.h \
+ monitor_module.h \
+ output_mixer.h \
++ output_mixer_internal.h \
+ shared_data.h \
+ statistics.h \
+ transmit_mixer.h \
+ utility.h \
++ include/voe_audio_processing.h \
++ include/voe_base.h \
++ include/voe_call_report.h \
++ include/voe_codec.h \
++ include/voe_dtmf.h \
++ include/voe_encryption.h \
++ include/voe_errors.h \
++ include/voe_external_media.h \
++ include/voe_file.h \
++ include/voe_hardware.h \
++ include/voe_neteq_stats.h \
++ include/voe_network.h \
++ include/voe_rtp_rtcp.h \
++ include/voe_video_sync.h \
++ include/voe_volume_control.h \
++ include/mock/mock_voe_connection_observer.h \
++ include/mock/mock_voe_observer.h \
+ voe_audio_processing_impl.h \
+ voe_base_impl.h \
+ voe_call_report_impl.h \
@@ -1950,16 +2082,11 @@ diff -up webrtc-20120613svn2401/src/voice_engine/main/source/Makefile.am.SANITY
+ voice_engine_defines.h \
+ voice_engine_impl.h
+
-+AM_CXXFLAGS = -I../interface -I../../.. -DWEBRTC_LINUX -I../../../common_audio/resampler/include \
-+ -I../../../common_audio/signal_processing/include -I../../../modules/audio_coding/main/interface \
-+ -I../../../modules/audio_conference_mixer/interface -I../../../modules/audio_device/main/interface \
-+ -I../../../modules/audio_processing/include -I../../../modules/media_file/interface \
-+ -I../../../modules/rtp_rtcp/interface -I../../../modules/udp_transport/interface \
-+ -I../../../modules/utility/interface -I../../../system_wrappers/interface \
-+ -I../../../modules/audio_device/main/source -I../../../modules/interface \
-+ -DWEBRTC_SVNREVISION='"n/a"'
-diff -up webrtc-20120613svn2401/src/voice_engine/Makefile.am.SANITY webrtc-20120613svn2401/src/voice_engine/Makefile.am
---- webrtc-20120613svn2401/src/voice_engine/Makefile.am.SANITY 2012-07-11 13:05:05.652004811 -0400
-+++ webrtc-20120613svn2401/src/voice_engine/Makefile.am 2012-07-11 13:05:05.652004811 -0400
-@@ -0,0 +1 @@
-+SUBDIRS = main
++AM_CXXFLAGS = -I../interface -DWEBRTC_LINUX -I../common_audio/resampler/include \
++ -I../common_audio/signal_processing/include -I../modules/audio_coding/main/interface \
++ -I../modules/audio_conference_mixer/interface -I../modules/audio_device/main/interface \
++ -I../modules/audio_processing/include -I../modules/media_file/interface \
++ -I../modules/rtp_rtcp/interface -I../modules/udp_transport/interface \
++ -I../modules/utility/interface -I../system_wrappers/interface \
++ -I../modules/audio_device/main/source -I../modules/interface \
++ -Iinclude -I.. -DWEBRTC_SVNREVISION='"n/a"'
diff --git a/system-libyuv.patch b/system-libyuv.patch
deleted file mode 100644
index d71981b..0000000
--- a/system-libyuv.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up webrtc-20120613svn2401/src/common_video/libyuv/libyuv.cc.system-libyuv webrtc-20120613svn2401/src/common_video/libyuv/libyuv.cc
---- webrtc-20120613svn2401/src/common_video/libyuv/libyuv.cc.system-libyuv 2012-05-04 13:07:30.000000000 -0400
-+++ webrtc-20120613svn2401/src/common_video/libyuv/libyuv.cc 2012-06-14 13:47:44.835000436 -0400
-@@ -13,7 +13,7 @@
- #include <assert.h>
-
- // LibYuv includes
--#include "third_party/libyuv/include/libyuv.h"
-+#include "/usr/include/libyuv.h"
-
- namespace webrtc {
-
-diff -up webrtc-20120613svn2401/src/common_video/libyuv/scaler.cc.system-libyuv webrtc-20120613svn2401/src/common_video/libyuv/scaler.cc
---- webrtc-20120613svn2401/src/common_video/libyuv/scaler.cc.system-libyuv 2012-06-14 13:48:56.913000436 -0400
-+++ webrtc-20120613svn2401/src/common_video/libyuv/scaler.cc 2012-06-14 13:49:07.822000436 -0400
-@@ -11,7 +11,7 @@
- #include "common_video/libyuv/include/scaler.h"
-
- // LibYuv
--#include "third_party/libyuv/include/libyuv.h"
-+#include "/usr/include/libyuv.h"
-
- namespace webrtc {
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/webrtc.git/commitdiff/73e446383aee4f07fe511334d75d2e4db000cc58
More information about the pld-cvs-commit
mailing list