jitterbuffer: do skew estimation only for new timestamps

[platform/upstream/gstreamer.git] / gst / rtpmanager / Makefile.am

diff --git a/gst/rtpmanager/Makefile.am b/gst/rtpmanager/Makefile.am
index 9e47cbd..662b18c 100644 (file)
--- a/gst/rtpmanager/Makefile.am
+++ b/gst/rtpmanager/Makefile.am
@@ -1,9 +1,13 @@
 plugin_LTLIBRARIES = libgstrtpmanager.la
 
+# FIXME 0.11: ignore GValueArray warnings for now until this is sorted
+ERROR_CFLAGS=
+
 glib_enum_define = GST_RTP_BIN
-glib_enum_prefix = gst_rtp_bin
+glib_gen_prefix = gst_rtp_bin
+glib_gen_basename = gstrtpbin
 
-include $(top_srcdir)/common/glib-gen.mak
+include $(top_srcdir)/common/gst-glib-gen.mak
 
 built_sources = gstrtpbin-marshal.c
 built_headers = gstrtpbin-marshal.h
@@ -12,11 +16,12 @@ BUILT_SOURCES = $(built_sources) $(built_headers)
 
 libgstrtpmanager_la_SOURCES = gstrtpmanager.c \
                              gstrtpbin.c \
-                             gstrtpclient.c \
-                             async_jitter_queue.c \
+                             gstrtpdtmfmux.c \
                              gstrtpjitterbuffer.c \
+                             gstrtpmux.c \
                              gstrtpptdemux.c \
                              gstrtpssrcdemux.c \
+                             rtpjitterbuffer.c      \
                              rtpsession.c      \
                              rtpsource.c      \
                              rtpstats.c      \
@@ -26,23 +31,41 @@ nodist_libgstrtpmanager_la_SOURCES = \
       $(built_sources)
 
 noinst_HEADERS = gstrtpbin.h \
-                gstrtpclient.h \
-                 async_jitter_queue.h \
+                gstrtpdtmfmux.h \
                 gstrtpjitterbuffer.h \
+                gstrtpmux.h \
                  gstrtpptdemux.h \
                  gstrtpssrcdemux.h \
+                 rtpjitterbuffer.h \
                 rtpsession.h  \
                 rtpsource.h  \
                 rtpstats.h  \
                 gstrtpsession.h
 
-libgstrtpmanager_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS)
-libgstrtpmanager_la_LIBADD = $(GST_LIBS_LIBS)
-libgstrtpmanager_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ \
-                             -lgstnetbuffer-@GST_MAJORMINOR@
+libgstrtpmanager_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
+       $(GST_NET_CFLAGS) $(WARNING_CFLAGS) $(ERROR_CFLAGS)
+libgstrtpmanager_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
+       $(GST_NET_LIBS) -lgstrtp-@GST_API_VERSION@ \
+       $(GST_BASE_LIBS) $(GST_LIBS_LIBS)
+libgstrtpmanager_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstrtpmanager_la_LIBTOOLFLAGS = --tag=disable-static
 
 CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = gstrtpbin-marshal.list
 
 
+Android.mk: Makefile.am $(BUILT_SOURCES)
+       androgenizer \
+       -:PROJECT libgstrtpmanager -:SHARED libgstrtpmanager \
+        -:TAGS eng debug \
+         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+        -:SOURCES $(libgstrtpmanager_la_SOURCES) \
+                  $(nodist_libgstrtpmanager_la_SOURCES) \
+        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstrtpmanager_la_CFLAGS) \
+        -:LDFLAGS $(libgstrtpmanager_la_LDFLAGS) \
+                  $(libgstrtpmanager_la_LIBADD) \
+                  -ldl \
+        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
+       > $@