From da6fd77de9ff556f60e45f09be9d76552c4883a2 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Fri, 4 Nov 2011 08:57:45 +0100 Subject: [PATCH] Really remove all mention of gstnetbuffer --- Android.mk | 4 - android/netbuffer.mk | 38 ----- docs/libs/gst-plugins-base-libs-docs.sgml | 10 -- docs/libs/gst-plugins-base-libs-sections.txt | 35 ----- gst-plugins-base.spec.in | 6 - pkgconfig/Makefile.am | 3 - .../gstreamer-plugins-base-uninstalled.pc.in | 4 +- pkgconfig/gstreamer-plugins-base.pc.in | 2 +- tests/check/Makefile.am | 9 -- tests/check/libs/.gitignore | 1 - tests/check/libs/gstlibscpp.cc | 2 - tests/check/libs/libsabi.c | 1 - tests/check/libs/netbuffer.c | 140 ------------------ tests/check/libs/struct_arm.h | 3 - tests/check/libs/struct_i386_osx.h | 3 - tests/check/libs/struct_x86_64.h | 1 - win32/MANIFEST | 2 - win32/common/libgstnetbuffer.def | 11 -- win32/vs6/gst_plugins_base.dsw | 11 -- win32/vs6/libgstnetbuffer.dsp | 127 ---------------- 20 files changed, 3 insertions(+), 410 deletions(-) delete mode 100644 android/netbuffer.mk delete mode 100644 tests/check/libs/netbuffer.c delete mode 100644 win32/common/libgstnetbuffer.def delete mode 100644 win32/vs6/libgstnetbuffer.dsp diff --git a/Android.mk b/Android.mk index f9f4cef553..65a3bd9de6 100644 --- a/Android.mk +++ b/Android.mk @@ -9,7 +9,6 @@ GST_PLUGINS_BASE_BUILT_SOURCES := \ pkgconfig/gstreamer-cdda-0.10.pc \ pkgconfig/gstreamer-fft-0.10.pc \ pkgconfig/gstreamer-interfaces-0.10.pc \ - pkgconfig/gstreamer-netbuffer-0.10.pc \ pkgconfig/gstreamer-pbutils-0.10.pc \ pkgconfig/gstreamer-plugins-base-0.10.pc \ pkgconfig/gstreamer-riff-0.10.pc \ @@ -23,7 +22,6 @@ GST_PLUGINS_BASE_BUILT_SOURCES := \ pkgconfig/gstreamer-cdda-0.10-uninstalled.pc \ pkgconfig/gstreamer-fft-0.10-uninstalled.pc \ pkgconfig/gstreamer-interfaces-0.10-uninstalled.pc \ - pkgconfig/gstreamer-netbuffer-0.10-uninstalled.pc \ pkgconfig/gstreamer-pbutils-0.10-uninstalled.pc \ pkgconfig/gstreamer-plugins-base-0.10-uninstalled.pc \ pkgconfig/gstreamer-riff-0.10-uninstalled.pc \ @@ -40,7 +38,6 @@ GST_PLUGINS_BASE_BUILT_SOURCES := \ gst-libs/gst/pbutils/Android.mk \ gst-libs/gst/rtp/Android.mk \ gst-libs/gst/rtsp/Android.mk \ - gst-libs/gst/netbuffer/Android.mk \ gst-libs/gst/sdp/Android.mk \ gst-libs/gst/app/Android.mk \ gst-libs/gst/fft/Android.mk \ @@ -102,7 +99,6 @@ CONFIGURE_TARGETS += gst-plugins-base-configure -include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/pbutils/Android.mk -include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/rtp/Android.mk -include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/rtsp/Android.mk --include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/netbuffer/Android.mk -include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/sdp/Android.mk -include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/app/Android.mk -include $(GST_PLUGINS_BASE_TOP)/gst/playback/Android.mk diff --git a/android/netbuffer.mk b/android/netbuffer.mk deleted file mode 100644 index 8b217f9fff..0000000000 --- a/android/netbuffer.mk +++ /dev/null @@ -1,38 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -#---------------------------------------- -# include -gst_netbuffer_COPY_HEADERS_TO := gstreamer-0.11/gst/netbuffer -gst_netbuffer_COPY_HEADERS := \ - ../gst-libs/gst/netbuffer/gstnetbuffer.h - -include $(CLEAR_VARS) - -LOCAL_ARM_MODE := arm - -netbuffer_LOCAL_SRC_FILES:= \ - gst-libs/gst/netbuffer/gstnetbuffer.c - -LOCAL_SRC_FILES:= $(addprefix ../,$(netbuffer_LOCAL_SRC_FILES)) - -LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.11 \ - libgstbase-0.11 \ - libglib-2.0 \ - libgthread-2.0 \ - libgmodule-2.0 \ - libgobject-2.0 - -LOCAL_MODULE:= libgstnetbuffer-0.11 - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ - $(GST_PLUGINS_BASE_CFLAGS) -# -# define LOCAL_PRELINK_MODULE to false to not use pre-link map -# -LOCAL_PRELINK_MODULE := false - -LOCAL_COPY_HEADERS_TO := $(gst_netbuffer_COPY_HEADERS_TO) -LOCAL_COPY_HEADERS := $(gst_netbuffer_COPY_HEADERS) -LOCAL_MODULE_TAGS := optional - -include $(BUILD_SHARED_LIBRARY) diff --git a/docs/libs/gst-plugins-base-libs-docs.sgml b/docs/libs/gst-plugins-base-libs-docs.sgml index b4707673b5..243c7fc334 100644 --- a/docs/libs/gst-plugins-base-libs-docs.sgml +++ b/docs/libs/gst-plugins-base-libs-docs.sgml @@ -108,16 +108,6 @@ - - Network Buffer Library - - This library should be linked to by getting cflags and libs from - gstreamer-plugins-base-&GST_MAJORMINOR;.pc and adding - -lgstnetbuffer-&GST_MAJORMINOR; to the library flags. - - - - Riff Media Library diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt index 9f7a0a429a..6d77f0f9fa 100644 --- a/docs/libs/gst-plugins-base-libs-sections.txt +++ b/docs/libs/gst-plugins-base-libs-sections.txt @@ -905,41 +905,6 @@ gst_video_overlay_get_type -# netbuffer - -
-gstnetbuffer -gst/netbuffer/gstnetbuffer.h -GstNetBuffer -GstNetType -GST_NETADDRESS_MAX_LEN -GstNetAddress - -gst_netbuffer_new -gst_netaddress_get_net_type - -gst_netaddress_set_ip4_address -gst_netaddress_get_ip4_address - -gst_netaddress_set_ip6_address -gst_netaddress_get_ip6_address - -gst_netaddress_get_address_bytes -gst_netaddress_set_address_bytes - -gst_netaddress_equal - -gst_netaddress_to_string - -GstNetBufferClass -GST_TYPE_NETBUFFER -GST_NETBUFFER -GST_NETBUFFER_CLASS -GST_NETBUFFER_GET_CLASS -GST_IS_NETBUFFER -GST_IS_NETBUFFER_CLASS -gst_netbuffer_get_type -
# riff diff --git a/gst-plugins-base.spec.in b/gst-plugins-base.spec.in index f815c78c75..408a14894c 100644 --- a/gst-plugins-base.spec.in +++ b/gst-plugins-base.spec.in @@ -87,7 +87,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgstaudio-%{majorminor}.so.* %{_libdir}/libgstcdda-%{majorminor}.so* %{_libdir}/libgstinterfaces-%{majorminor}.so.* -%{_libdir}/libgstnetbuffer-%{majorminor}.so* %{_libdir}/libgstpbutils-%{majorminor}.so* %{_libdir}/libgstriff-%{majorminor}.so.* %{_libdir}/libgstrtp-%{majorminor}.so* @@ -179,7 +178,6 @@ GStreamer Plugins Base library development and header files. %{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstbasertppayload.h %{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideofilter.h %{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideosink.h -%{_includedir}/gstreamer-%{majorminor}/gst/netbuffer/gstnetbuffer.h %{_includedir}/gstreamer-%{majorminor}/gst/cdda/gstcddabasesrc.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/mixerutils.h %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/videoorientation.h @@ -232,7 +230,6 @@ GStreamer Plugins Base library development and header files. %{_libdir}/libgstvideo-%{majorminor}.so %{_libdir}/libgstrtp-%{majorminor}.so %{_libdir}/libgstinterfaces-%{majorminor}.so -%{_libdir}/libgstnetbuffer-%{majorminor}.so %{_libdir}/libgstpbutils-%{majorminor}.so %{_libdir}/libgstcdda-%{majorminor}.so %{_libdir}/libgstapp-%{majorminor}.so @@ -243,7 +240,6 @@ GStreamer Plugins Base library development and header files. %{_libdir}/pkgconfig/gstreamer-cdda-%{majorminor}.pc %{_libdir}/pkgconfig/gstreamer-fft-%{majorminor}.pc %{_libdir}/pkgconfig/gstreamer-interfaces-%{majorminor}.pc -%{_libdir}/pkgconfig/gstreamer-netbuffer-%{majorminor}.pc %{_libdir}/pkgconfig/gstreamer-pbutils-%{majorminor}.pc %{_libdir}/pkgconfig/gstreamer-riff-%{majorminor}.pc %{_libdir}/pkgconfig/gstreamer-rtp-%{majorminor}.pc @@ -257,7 +253,6 @@ GStreamer Plugins Base library development and header files. %{_libdir}/girepository-1.0/GstAudio-%{majorminor}.typelib %{_libdir}/girepository-1.0/GstFft-%{majorminor}.typelib %{_libdir}/girepository-1.0/GstInterfaces-%{majorminor}.typelib -%{_libdir}/girepository-1.0/GstNetbuffer-%{majorminor}.typelib %{_libdir}/girepository-1.0/GstPbutils-%{majorminor}.typelib %{_libdir}/girepository-1.0/GstRiff-%{majorminor}.typelib %{_libdir}/girepository-1.0/GstRtp-%{majorminor}.typelib @@ -269,7 +264,6 @@ GStreamer Plugins Base library development and header files. %{_datadir}/gir-1.0/GstAudio-%{majorminor}.gir %{_datadir}/gir-1.0/GstFft-%{majorminor}.gir %{_datadir}/gir-1.0/GstInterfaces-%{majorminor}.gir -%{_datadir}/gir-1.0/GstNetbuffer-%{majorminor}.gir %{_datadir}/gir-1.0/GstPbutils-%{majorminor}.gir %{_datadir}/gir-1.0/GstRiff-%{majorminor}.gir %{_datadir}/gir-1.0/GstRtp-%{majorminor}.gir diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am index 11b8f473d0..af03a84fd0 100644 --- a/pkgconfig/Makefile.am +++ b/pkgconfig/Makefile.am @@ -5,7 +5,6 @@ pcverfiles = \ gstreamer-cdda-@GST_MAJORMINOR@.pc \ gstreamer-fft-@GST_MAJORMINOR@.pc \ gstreamer-interfaces-@GST_MAJORMINOR@.pc \ - gstreamer-netbuffer-@GST_MAJORMINOR@.pc \ gstreamer-pbutils-@GST_MAJORMINOR@.pc \ gstreamer-riff-@GST_MAJORMINOR@.pc \ gstreamer-rtp-@GST_MAJORMINOR@.pc \ @@ -20,7 +19,6 @@ pcverfiles_uninstalled = \ gstreamer-cdda-@GST_MAJORMINOR@-uninstalled.pc \ gstreamer-fft-@GST_MAJORMINOR@-uninstalled.pc \ gstreamer-interfaces-@GST_MAJORMINOR@-uninstalled.pc \ - gstreamer-netbuffer-@GST_MAJORMINOR@-uninstalled.pc \ gstreamer-pbutils-@GST_MAJORMINOR@-uninstalled.pc \ gstreamer-riff-@GST_MAJORMINOR@-uninstalled.pc \ gstreamer-rtp-@GST_MAJORMINOR@-uninstalled.pc \ @@ -52,7 +50,6 @@ pcinfiles = \ gstreamer-cdda.pc.in gstreamer-cdda-uninstalled.pc.in \ gstreamer-fft.pc.in gstreamer-fft-uninstalled.pc.in \ gstreamer-interfaces.pc.in gstreamer-interfaces-uninstalled.pc.in \ - gstreamer-netbuffer.pc.in gstreamer-netbuffer-uninstalled.pc.in \ gstreamer-pbutils.pc.in gstreamer-pbutils-uninstalled.pc.in \ gstreamer-riff.pc.in gstreamer-riff-uninstalled.pc.in \ gstreamer-rtp.pc.in gstreamer-rtp-uninstalled.pc.in \ diff --git a/pkgconfig/gstreamer-plugins-base-uninstalled.pc.in b/pkgconfig/gstreamer-plugins-base-uninstalled.pc.in index 8a9bea2178..e2358ffa76 100644 --- a/pkgconfig/gstreamer-plugins-base-uninstalled.pc.in +++ b/pkgconfig/gstreamer-plugins-base-uninstalled.pc.in @@ -10,7 +10,7 @@ Name: GStreamer Base Plugins Libraries, Uninstalled Description: Streaming media framework, base plugins libraries, uninstalled Version: @VERSION@ Requires: gstreamer-@GST_MAJORMINOR@ -Libs: -L@abs_top_builddir@/gst-libs/gst/audio -L@abs_top_builddir@/gst-libs/gst/cdda -L@abs_top_builddir@/gst-libs/gst/fft -L@abs_top_builddir@/gst-libs/gst/floatcast -L@abs_top_builddir@/gst-libs/gst/interfaces -L@abs_top_builddir@/gst-libs/gst/netbuffer -L@abs_top_builddir@/gst-libs/gst/riff -L@abs_top_builddir@/gst-libs/gst/rtp -L@abs_top_builddir@/gst-libs/gst/rtsp -L@abs_top_builddir@/gst-libs/gst/sdp -L@abs_top_builddir@/gst-libs/gst/tag -L@abs_top_builddir@/gst-libs/gst/pbutils -L@abs_top_builddir@/gst-libs/gst/video -L@abs_top_builddir@/gst-libs/gst/app +Libs: -L@abs_top_builddir@/gst-libs/gst/audio -L@abs_top_builddir@/gst-libs/gst/cdda -L@abs_top_builddir@/gst-libs/gst/fft -L@abs_top_builddir@/gst-libs/gst/floatcast -L@abs_top_builddir@/gst-libs/gst/interfaces -L@abs_top_builddir@/gst-libs/gst/riff -L@abs_top_builddir@/gst-libs/gst/rtp -L@abs_top_builddir@/gst-libs/gst/rtsp -L@abs_top_builddir@/gst-libs/gst/sdp -L@abs_top_builddir@/gst-libs/gst/tag -L@abs_top_builddir@/gst-libs/gst/pbutils -L@abs_top_builddir@/gst-libs/gst/video -L@abs_top_builddir@/gst-libs/gst/app Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs -libraries=app audio cdda fft floatcast interfaces netbuffer riff rtp rtsp sdp tag pbutils video +libraries=app audio cdda fft floatcast interfaces riff rtp rtsp sdp tag pbutils video diff --git a/pkgconfig/gstreamer-plugins-base.pc.in b/pkgconfig/gstreamer-plugins-base.pc.in index 4bc6088c2a..beac61634a 100644 --- a/pkgconfig/gstreamer-plugins-base.pc.in +++ b/pkgconfig/gstreamer-plugins-base.pc.in @@ -11,4 +11,4 @@ Version: @VERSION@ Libs: -L${libdir} Cflags: -I${includedir} -libraries=audio cdda fft floatcast interfaces netbuffer riff rtp tag pbutils video +libraries=audio cdda fft floatcast interfaces riff rtp tag pbutils video diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 86369107c2..dbb04e1344 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -119,7 +119,6 @@ check_PROGRAMS = \ libs/fft \ libs/mixer \ libs/navigation \ - libs/netbuffer \ libs/pbutils \ libs/profile \ libs/rtp \ @@ -200,7 +199,6 @@ libs_libsabi_LDADD = \ $(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/fft/libgstfft-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/netbuffer/libgstnetbuffer-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/rtp/libgstrtp-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/rtsp/libgstrtsp-@GST_MAJORMINOR@.la \ @@ -269,13 +267,6 @@ libs_navigation_LDADD = \ $(GST_BASE_LIBS) \ $(LDADD) -libs_netbuffer_CFLAGS = \ - $(GST_PLUGINS_BASE_CFLAGS) \ - $(AM_CFLAGS) -libs_netbuffer_LDADD = \ - $(top_builddir)/gst-libs/gst/netbuffer/libgstnetbuffer-@GST_MAJORMINOR@.la \ - $(LDADD) - libs_rtp_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(AM_CFLAGS) diff --git a/tests/check/libs/.gitignore b/tests/check/libs/.gitignore index 4972a9aee1..d448ce30b9 100644 --- a/tests/check/libs/.gitignore +++ b/tests/check/libs/.gitignore @@ -7,7 +7,6 @@ gstlibscpp libsabi mixer navigation -netbuffer pbutils profile rtp diff --git a/tests/check/libs/gstlibscpp.cc b/tests/check/libs/gstlibscpp.cc index f95cd784a4..e0931d020b 100644 --- a/tests/check/libs/gstlibscpp.cc +++ b/tests/check/libs/gstlibscpp.cc @@ -64,8 +64,6 @@ #include #include -#include - #include #include #include diff --git a/tests/check/libs/libsabi.c b/tests/check/libs/libsabi.c index 5c4135de5b..6f03e86ef9 100644 --- a/tests/check/libs/libsabi.c +++ b/tests/check/libs/libsabi.c @@ -46,7 +46,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/check/libs/netbuffer.c b/tests/check/libs/netbuffer.c deleted file mode 100644 index b470afc30e..0000000000 --- a/tests/check/libs/netbuffer.c +++ /dev/null @@ -1,140 +0,0 @@ -/* GStreamer unit tests for libgstnetbuffer - * - * Copyright (C) 2006 Tim-Philipp Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include - -#define DATA_STRING "Yoho this is a string" - -GST_START_TEST (test_netbuffer_copy) -{ - GstBuffer *netbuf, *copy; - guint8 ipv6_addr[16] = { 0xff, 0x11, 0xee, 0x22, 0xdd, 0x33, 0xcc, - 0x44, 0xbb, 0x55, 0xaa, 0x66, 0x00, 0x77, 0x99, 0x88 - }; - guint8 ipv6_copy[16]; - guint32 ipv4_copy, ipv4_addr = 0xfe12dc34; - guint16 ipv6_port = 3490; - guint16 ipv4_port = 5678; - guint16 port; - GstNetAddressMeta *meta, *cmeta; - gsize len; - guint8 *data1, *data2; - gsize size1, size2; - - netbuf = gst_buffer_new (); - fail_unless (netbuf != NULL, "failed to create net buffer"); - meta = gst_buffer_add_net_address_meta (netbuf); - - gst_net_address_set_ip4_address (&meta->naddr, ipv4_addr, ipv4_port); - - len = strlen (DATA_STRING); - gst_buffer_take_memory (netbuf, -1, - gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY, - (gpointer) DATA_STRING, NULL, len, 0, len)); - - GST_BUFFER_FLAG_SET (netbuf, GST_BUFFER_FLAG_DISCONT); - - copy = gst_buffer_copy (netbuf); - fail_unless (copy != NULL, "failed to copy net buffer"); - - cmeta = gst_buffer_get_net_address_meta (copy); - fail_unless (cmeta != NULL, "copied buffer is not a GstNetBuffer!"); - - fail_unless_equals_int (GST_MINI_OBJECT_REFCOUNT_VALUE (copy), 1); - - data1 = gst_buffer_map (netbuf, &size1, NULL, GST_MAP_READ); - data2 = gst_buffer_map (copy, &size2, NULL, GST_MAP_READ); - fail_unless_equals_int (size1, size2); - fail_unless (memcmp (data1, data2, size1) == 0); - gst_buffer_unmap (copy, data2, size2); - gst_buffer_unmap (netbuf, data1, size1); - - fail_unless (GST_BUFFER_FLAG_IS_SET (copy, GST_BUFFER_FLAG_DISCONT)); - - fail_unless (gst_net_address_get_ip4_address (&cmeta->naddr, &ipv4_copy, - &port)); - fail_unless (ipv4_copy == ipv4_addr, - "Copied buffer has wrong IPV4 from address"); - fail_unless (port == ipv4_port, "Copied buffer has wrong IPV4 from port"); - gst_buffer_unref (netbuf); - gst_buffer_unref (copy); - - netbuf = gst_buffer_new (); - fail_unless (netbuf != NULL, "failed to create net buffer"); - meta = gst_buffer_add_net_address_meta (netbuf); - - gst_net_address_set_ip6_address (&meta->naddr, ipv6_addr, ipv6_port); - - len = strlen (DATA_STRING); - gst_buffer_take_memory (netbuf, -1, - gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY, - (gpointer) DATA_STRING, NULL, len, 0, len)); - - GST_BUFFER_FLAG_SET (netbuf, GST_BUFFER_FLAG_DISCONT); - - copy = gst_buffer_copy (netbuf); - fail_unless (copy != NULL, "failed to copy net buffer"); - - cmeta = gst_buffer_get_net_address_meta (copy); - fail_unless (cmeta != NULL, "copied buffer is not a GstNetBuffer!"); - - fail_unless_equals_int (GST_MINI_OBJECT_REFCOUNT_VALUE (copy), 1); - - data1 = gst_buffer_map (netbuf, &size1, NULL, GST_MAP_READ); - data2 = gst_buffer_map (copy, &size2, NULL, GST_MAP_READ); - fail_unless_equals_int (size1, size2); - fail_unless (memcmp (data1, data2, size1) == 0); - gst_buffer_unmap (copy, data2, size2); - gst_buffer_unmap (netbuf, data1, size1); - - fail_unless (GST_BUFFER_FLAG_IS_SET (copy, GST_BUFFER_FLAG_DISCONT)); - - fail_unless (gst_net_address_get_ip6_address (&cmeta->naddr, ipv6_copy, - &port)); - fail_unless (memcmp (ipv6_copy, ipv6_addr, 16) == 0, - "Copied buffer has wrong IPv6 destination address"); - fail_unless (port == ipv6_port, - "Copied buffer has wrong IPv6 destination port"); - gst_buffer_unref (netbuf); - gst_buffer_unref (copy); - -} - -GST_END_TEST; - -static Suite * -netbuffer_suite (void) -{ - Suite *s = suite_create ("netbuffer"); - TCase *tc_chain = tcase_create ("netbuffer"); - - suite_add_tcase (s, tc_chain); - - tcase_add_test (tc_chain, test_netbuffer_copy); - - return s; -} - -GST_CHECK_MAIN (netbuffer); diff --git a/tests/check/libs/struct_arm.h b/tests/check/libs/struct_arm.h index b5e12d3713..bc4c01acc6 100644 --- a/tests/check/libs/struct_arm.h +++ b/tests/check/libs/struct_arm.h @@ -48,9 +48,6 @@ GstCheckABIStruct list[] = { {"GstMixerTrackClass", sizeof (GstMixerTrackClass), 84}, {"GstMixerTrack", sizeof (GstMixerTrack), 32}, {"GstNavigationInterface", sizeof (GstNavigationInterface), 28}, - {"GstNetAddress", sizeof (GstNetAddress), 40}, - {"GstNetBufferClass", sizeof (GstNetBufferClass), 32}, - {"GstNetBuffer", sizeof (GstNetBuffer), 184}, {"GstPropertyProbeInterface", sizeof (GstPropertyProbeInterface), 44}, {"gst_riff_acid", sizeof (gst_riff_acid), 24}, {"gst_riff_dmlh", sizeof (gst_riff_dmlh), 4}, diff --git a/tests/check/libs/struct_i386_osx.h b/tests/check/libs/struct_i386_osx.h index fe2b410abf..e0056bdc53 100644 --- a/tests/check/libs/struct_i386_osx.h +++ b/tests/check/libs/struct_i386_osx.h @@ -48,9 +48,6 @@ GstCheckABIStruct list[] = { {"GstMixerTrackClass", sizeof (GstMixerTrackClass), 84}, {"GstMixerTrack", sizeof (GstMixerTrack), 32}, {"GstNavigationInterface", sizeof (GstNavigationInterface), 28}, - {"GstNetAddress", sizeof (GstNetAddress), 40}, - {"GstNetBufferClass", sizeof (GstNetBufferClass), 32}, - {"GstNetBuffer", sizeof (GstNetBuffer), 176}, {"GstPropertyProbeInterface", sizeof (GstPropertyProbeInterface), 44}, {"gst_riff_acid", sizeof (gst_riff_acid), 24}, {"gst_riff_dmlh", sizeof (gst_riff_dmlh), 4}, diff --git a/tests/check/libs/struct_x86_64.h b/tests/check/libs/struct_x86_64.h index 5da5f9c8b4..a651b77773 100644 --- a/tests/check/libs/struct_x86_64.h +++ b/tests/check/libs/struct_x86_64.h @@ -46,7 +46,6 @@ GstCheckABIStruct list[] = { {"GstMixerTrackClass", sizeof (GstMixerTrackClass), 168}, {"GstMixerTrack", sizeof (GstMixerTrack), 48}, {"GstNavigationInterface", sizeof (GstNavigationInterface), 56}, - {"GstNetAddress", sizeof (GstNetAddress), 56}, {"GstPropertyProbeInterface", sizeof (GstPropertyProbeInterface), 88}, {"gst_riff_acid", sizeof (gst_riff_acid), 24}, {"gst_riff_dmlh", sizeof (gst_riff_dmlh), 4}, diff --git a/win32/MANIFEST b/win32/MANIFEST index 6785c88fb3..7e7c5a95f2 100644 --- a/win32/MANIFEST +++ b/win32/MANIFEST @@ -9,7 +9,6 @@ win32/common/libgstapp.def win32/common/libgstaudio.def win32/common/libgstcdda.def win32/common/libgstinterfaces.def -win32/common/libgstnetbuffer.def win32/common/libgstpbutils.def win32/common/libgstriff.def win32/common/libgstrtp.def @@ -38,7 +37,6 @@ win32/vs6/libgstdecodebin.dsp win32/vs6/libgstfft.dsp win32/vs6/libgstgdp.dsp win32/vs6/libgstinterfaces.dsp -win32/vs6/libgstnetbuffer.dsp win32/vs6/libgstogg.dsp win32/vs6/libgstpbutils.dsp win32/vs6/libgstplaybin.dsp diff --git a/win32/common/libgstnetbuffer.def b/win32/common/libgstnetbuffer.def deleted file mode 100644 index 4a191d4aef..0000000000 --- a/win32/common/libgstnetbuffer.def +++ /dev/null @@ -1,11 +0,0 @@ -EXPORTS - gst_meta_net_address_get_info - gst_netaddress_equal - gst_netaddress_get_address_bytes - gst_netaddress_get_ip4_address - gst_netaddress_get_ip6_address - gst_netaddress_get_net_type - gst_netaddress_set_address_bytes - gst_netaddress_set_ip4_address - gst_netaddress_set_ip6_address - gst_netaddress_to_string diff --git a/win32/vs6/gst_plugins_base.dsw b/win32/vs6/gst_plugins_base.dsw index a651927a75..ad52796f5b 100644 --- a/win32/vs6/gst_plugins_base.dsw +++ b/win32/vs6/gst_plugins_base.dsw @@ -177,17 +177,6 @@ Package=<4> ############################################################################### -Project: "libgstnetbuffer"=".\libgstnetbuffer.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### Project: "libgstogg"=".\libgstogg.dsp" - Package Owner=<4> diff --git a/win32/vs6/libgstnetbuffer.dsp b/win32/vs6/libgstnetbuffer.dsp deleted file mode 100644 index 31110697ea..0000000000 --- a/win32/vs6/libgstnetbuffer.dsp +++ /dev/null @@ -1,127 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libgstnetbuffer" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=libgstnetbuffer - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libgstnetbuffer.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libgstnetbuffer.mak" CFG="libgstnetbuffer - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libgstnetbuffer - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libgstnetbuffer - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libgstnetbuffer - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTNETBUFFER_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTNETBUFFER_EXPORTS" /D "HAVE_CONFIG_H" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /out:"Release/libgstnetbuffer-0.10.dll" /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" -# Begin Special Build Tool -TargetPath=.\Release\libgstnetbuffer-0.10.dll -SOURCE="$(InputPath)" -PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\bin -# End Special Build Tool - -!ELSEIF "$(CFG)" == "libgstnetbuffer - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTNETBUFFER_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTNETBUFFER_EXPORTS" /D "HAVE_CONFIG_H" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /out:"Debug/libgstnetbuffer-0.10.dll" /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" -# Begin Special Build Tool -TargetPath=.\Debug\libgstnetbuffer-0.10.dll -SOURCE="$(InputPath)" -PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\bin -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "libgstnetbuffer - Win32 Release" -# Name "libgstnetbuffer - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\..\gst-libs\gst\netbuffer\gstnetbuffer.c" -# End Source File -# Begin Source File - -SOURCE=..\common\libgstnetbuffer.def -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE="..\..\gst-libs\gst\net\gstnetbuffer.h" -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project