rtp: move VP8 payloader and depayloader from -bad

Spec is still in draft state, but should hopefully not
change much now. Besides, we announce things as VP8-DRAFT-IETF-01
in our caps, so even if things change in incompatible ways it
should not break anything.

https://bugzilla.gnome.org/show_bug.cgi?id=687263

diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am
index 1437518914a0a539c034a83d23d4d1930742d4e5..6c80d41ddd4dc3af976b01c3ffdeca6831ee4d22 100644 (file)
--- a/gst/rtp/Makefile.am
+++ b/gst/rtp/Makefile.am
@@ -1,6 +1,7 @@
 plugin_LTLIBRARIES = libgstrtp.la
 
 libgstrtp_la_SOURCES = \
+       dboolhuff.c \
        fnv1hash.c \
        gstrtp.c \
        gstrtpchannels.c \
@@ -70,10 +71,13 @@ libgstrtp_la_SOURCES = \
        gstrtptheorapay.c \
        gstrtpvorbisdepay.c \
        gstrtpvorbispay.c  \
+       gstrtpvp8depay.c \
+       gstrtpvp8pay.c \
        gstrtpvrawdepay.c  \
        gstrtpvrawpay.c 
 
-libgstrtp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+libgstrtp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
+               $(GST_CFLAGS) -Dvp8_norm=gst_rtpvp8_vp8_norm
 libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
                -lgstaudio-@GST_API_VERSION@ \
                -lgstvideo-@GST_API_VERSION@ \
@@ -86,6 +90,7 @@ libgstrtp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstrtp_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS =                       \
+                dboolhuff.h \
                 fnv1hash.h             \
                  gstrtpchannels.h       \
                 gstrtpL16depay.h       \
@@ -154,9 +159,13 @@ noinst_HEADERS =                   \
                 gstrtptheorapay.h      \
                 gstrtpvorbisdepay.h    \
                 gstrtpvorbispay.h      \
+                gstrtpvp8depay.c \
+                gstrtpvp8pay.c \
                 gstrtpvrawdepay.h      \
                 gstrtpvrawpay.h
 
+EXTRA_DIST = dboolhuff.LICENSE
+
 Android.mk: Makefile.am $(BUILT_SOURCES)
        androgenizer \
        -:PROJECT libgstrtp -:SHARED libgstrtp \

diff --git a/gst/rtp/gstrtp.c b/gst/rtp/gstrtp.c
index ca104ecb9473c27f01803d403aab86b74e9aefea..1dee25c8df69a37348bd9b3c055dcde4e45891b3 100644 (file)
--- a/gst/rtp/gstrtp.c
+++ b/gst/rtp/gstrtp.c
@@ -87,6 +87,8 @@
 #include "gstrtptheorapay.h"
 #include "gstrtpvorbisdepay.h"
 #include "gstrtpvorbispay.h"
+#include "gstrtpvp8depay.h"
+#include "gstrtpvp8pay.h"
 #include "gstrtpvrawdepay.h"
 #include "gstrtpvrawpay.h"
 
@@ -291,6 +293,12 @@ plugin_init (GstPlugin * plugin)
   if (!gst_rtp_vorbis_pay_plugin_init (plugin))
     return FALSE;
 
+  if (!gst_rtp_vp8_depay_plugin_init (plugin))
+    return FALSE;
+
+  if (!gst_rtp_vp8_pay_plugin_init (plugin))
+    return FALSE;
+
   if (!gst_rtp_vraw_depay_plugin_init (plugin))
     return FALSE;
 

diff --git a/gst/rtp/gstrtpvp8.c b/gst/rtp/gstrtpvp8.c
deleted file mode 100644 (file)
index d1d112f..0000000
--- a/gst/rtp/gstrtpvp8.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gstrtpvp8pay.h"
-#include "gstrtpvp8depay.h"
-
-static gboolean
-plugin_init (GstPlugin *plugin)
-{
-  gst_rtp_vp8_depay_plugin_init (plugin);
-  gst_rtp_vp8_pay_plugin_init (plugin);
-
-  return TRUE;
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    rtpvp8,
-    "rtpvp8",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)