quicktime: rename plugin to isomp4

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

diff --git a/Android.mk b/Android.mk
index ec38092..534fd84 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -28,7 +28,7 @@ GST_PLUGINS_GOOD_BUILT_SOURCES = \
        gst/matroska/Android.mk         \
        gst/multifile/Android.mk        \
        gst/multipart/Android.mk        \
-       gst/quicktime/Android.mk        \
+       gst/isomp4/Android.mk   \
        gst/replaygain/Android.mk       \
        gst/rtp/Android.mk              \
        gst/rtpmanager/Android.mk       \
@@ -94,7 +94,7 @@ CONFIGURE_TARGETS += gst-plugins-good-configure
 -include $(GST_PLUGINS_GOOD_TOP)/gst/matroska/Android.mk
 -include $(GST_PLUGINS_GOOD_TOP)/gst/multifile/Android.mk
 -include $(GST_PLUGINS_GOOD_TOP)/gst/multipart/Android.mk
--include $(GST_PLUGINS_GOOD_TOP)/gst/quicktime/Android.mk
+-include $(GST_PLUGINS_GOOD_TOP)/gst/isomp4/Android.mk
 -include $(GST_PLUGINS_GOOD_TOP)/gst/replaygain/Android.mk
 -include $(GST_PLUGINS_GOOD_TOP)/gst/rtp/Android.mk
 -include $(GST_PLUGINS_GOOD_TOP)/gst/rtpmanager/Android.mk

diff --git a/configure.ac b/configure.ac
index 0f50db5..bb79012 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -350,13 +350,13 @@ AG_GST_CHECK_PLUGIN(flx)
 AG_GST_CHECK_PLUGIN(goom)
 AG_GST_CHECK_PLUGIN(goom2k1)
 AG_GST_CHECK_PLUGIN(imagefreeze)
+AG_GST_CHECK_PLUGIN(isomp4)
 AG_GST_CHECK_PLUGIN(law)
 AG_GST_CHECK_PLUGIN(level)
 AG_GST_CHECK_PLUGIN(matroska)
 AG_GST_CHECK_PLUGIN(monoscope)
 AG_GST_CHECK_PLUGIN(multifile)
 AG_GST_CHECK_PLUGIN(multipart)
-AG_GST_CHECK_PLUGIN(quicktime)
 AG_GST_CHECK_PLUGIN(replaygain)
 AG_GST_CHECK_PLUGIN(rtp)
 AG_GST_CHECK_PLUGIN(rtpmanager)
@@ -1157,19 +1157,19 @@ gst/debugutils/Makefile
 gst/effectv/Makefile
 gst/equalizer/Makefile
 gst/flv/Makefile
+gst/goom/Makefile
+gst/goom2k1/Makefile
 gst/id3demux/Makefile
 gst/icydemux/Makefile
 gst/imagefreeze/Makefile
 gst/interleave/Makefile
-gst/goom/Makefile
-gst/goom2k1/Makefile
+gst/isomp4/Makefile
 gst/law/Makefile
 gst/level/Makefile
 gst/matroska/Makefile
 gst/monoscope/Makefile
 gst/multifile/Makefile
 gst/multipart/Makefile
-gst/quicktime/Makefile
 gst/replaygain/Makefile
 gst/rtp/Makefile
 gst/rtpmanager/Makefile

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 410123e..0219ecc 100644 (file)
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -190,9 +190,9 @@ EXTRA_HFILES = \
        $(top_srcdir)/gst/multifile/gstmultifilesrc.h \
        $(top_srcdir)/gst/multipart/multipartdemux.h \
        $(top_srcdir)/gst/multipart/multipartmux.h \
-       $(top_srcdir)/gst/quicktime/qtdemux.h \
-       $(top_srcdir)/gst/quicktime/gstqtmux.h \
-       $(top_srcdir)/gst/quicktime/gstqtmux-doc.h \
+       $(top_srcdir)/gst/isomp4/qtdemux.h \
+       $(top_srcdir)/gst/isomp4/gstqtmux.h \
+       $(top_srcdir)/gst/isomp4/gstqtmux-doc.h \
        $(top_srcdir)/gst/replaygain/gstrganalysis.h \
        $(top_srcdir)/gst/replaygain/gstrglimiter.h \
        $(top_srcdir)/gst/replaygain/gstrgvolume.h \

diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index 17584d7..8b198ac 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -222,6 +222,7 @@
     <xi:include href="xml/plugin-id3demux.xml" />
     <xi:include href="xml/plugin-imagefreeze.xml" />
     <xi:include href="xml/plugin-interleave.xml" />
+    <xi:include href="xml/plugin-isomp4.xml" />
     <xi:include href="xml/plugin-jack.xml" />
     <xi:include href="xml/plugin-jpeg.xml" />
     <xi:include href="xml/plugin-level.xml" />
@@ -237,7 +238,6 @@
     <xi:include href="xml/plugin-osxvideo.xml" />
     <xi:include href="xml/plugin-png.xml" />
     <xi:include href="xml/plugin-pulseaudio.xml" />
-    <xi:include href="xml/plugin-quicktime.xml" />
     <xi:include href="xml/plugin-replaygain.xml" />
     <xi:include href="xml/plugin-rtp.xml" />
     <xi:include href="xml/plugin-gstrtpmanager.xml" />

diff --git a/docs/plugins/inspect/plugin-quicktime.xml b/docs/plugins/inspect/plugin-isomp4.xml
similarity index 98%
rename from docs/plugins/inspect/plugin-quicktime.xml
rename to docs/plugins/inspect/plugin-isomp4.xml
index 8411926..7da9df4 100644 (file)
--- a/docs/plugins/inspect/plugin-quicktime.xml
+++ b/docs/plugins/inspect/plugin-isomp4.xml
@@ -1,8 +1,8 @@
 <plugin>
-  <name>quicktime</name>
-  <description>Quicktime support</description>
-  <filename>../../gst/quicktime/.libs/libgstquicktime.so</filename>
-  <basename>libgstquicktime.so</basename>
+  <name>isomp4</name>
+  <description>ISO base media file format support (mp4, 3gpp, qt, mj2)</description>
+  <filename>../../gst/isomp4/.libs/libgstisomp4.so</filename>
+  <basename>libgstisomp4.so</basename>
   <version>0.10.28.3</version>
   <license>LGPL</license>
   <source>gst-plugins-good</source>
@@ -235,4 +235,4 @@
       </pads>
     </element>
   </elements>
-</plugin>
\ No newline at end of file
+</plugin>

diff --git a/gst-plugins-good.spec.in b/gst-plugins-good.spec.in
index 83641b2..2dfc0eb 100644 (file)
--- a/gst-plugins-good.spec.in
+++ b/gst-plugins-good.spec.in
@@ -98,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-%{majorminor}/libgstlevel.so
 %{_libdir}/gstreamer-%{majorminor}/libgstefence.so
 %{_libdir}/gstreamer-%{majorminor}/libgstmulaw.so
-%{_libdir}/gstreamer-%{majorminor}/libgstquicktime.so
+%{_libdir}/gstreamer-%{majorminor}/libgstisomp4.so
 %{_libdir}/gstreamer-%{majorminor}/libgstrtp.so
 %{_libdir}/gstreamer-%{majorminor}/libgstrtpmanager.so
 %{_libdir}/gstreamer-%{majorminor}/libgstrtsp.so

diff --git a/gst/quicktime/LEGAL b/gst/isomp4/LEGAL
similarity index 100%
rename from gst/quicktime/LEGAL
rename to gst/isomp4/LEGAL

diff --git a/gst/quicktime/Makefile.am b/gst/isomp4/Makefile.am
similarity index 64%
rename from gst/quicktime/Makefile.am
rename to gst/isomp4/Makefile.am
index 67932f7..010e09c 100644 (file)
--- a/gst/quicktime/Makefile.am
+++ b/gst/isomp4/Makefile.am
@@ -1,8 +1,8 @@
 
-plugin_LTLIBRARIES = libgstquicktime.la
+plugin_LTLIBRARIES = libgstisomp4.la
 
-libgstquicktime_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstquicktime_la_LIBADD = \
+libgstisomp4_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+libgstisomp4_la_LIBADD = \
     $(GST_PLUGINS_BASE_LIBS) \
     -lgstriff-@GST_MAJORMINOR@ \
     -lgstaudio-@GST_MAJORMINOR@ \
@@ -10,12 +10,12 @@ libgstquicktime_la_LIBADD = \
     -lgsttag-@GST_MAJORMINOR@ \
     -lgstpbutils-@GST_MAJORMINOR@ \
     $(GST_BASE_LIBS) $(GST_LIBS) $(ZLIB_LIBS)
-libgstquicktime_la_LDFLAGS = ${GST_PLUGIN_LDFLAGS}
-libgstquicktime_la_SOURCES = quicktime.c gstrtpxqtdepay.c \
+libgstisomp4_la_LDFLAGS = ${GST_PLUGIN_LDFLAGS}
+libgstisomp4_la_SOURCES = isomp4-plugin.c gstrtpxqtdepay.c \
        qtdemux.c qtdemux_types.c qtdemux_dump.c qtdemux_lang.c \
        gstqtmux.c gstqtmoovrecover.c atoms.c atomsrecovery.c descriptors.c \
        properties.c gstqtmuxmap.c
-libgstquicktime_la_LIBTOOLFLAGS = --tag=disable-static
+libgstisomp4_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = \
        qtatomparser.h   \
@@ -42,13 +42,13 @@ EXTRA_DIST = \
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
        androgenizer \
-       -:PROJECT libgstquicktime -:SHARED libgstquicktime \
+       -:PROJECT libgstisomp4 -:SHARED libgstisomp4 \
         -:TAGS eng debug \
          -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstquicktime_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(CPPFLAGS) $(libgstquicktime_la_CFLAGS) \
-        -:LDFLAGS $(libgstquicktime_la_LDFLAGS) \
-                  $(libgstquicktime_la_LIBADD) \
+        -:SOURCES $(libgstisomp4_la_SOURCES) \
+        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(CPPFLAGS) $(libgstisomp4_la_CFLAGS) \
+        -:LDFLAGS $(libgstisomp4_la_LDFLAGS) \
+                  $(libgstisomp4_la_LIBADD) \
                   -ldl \
         -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
                       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \

diff --git a/gst/quicktime/atoms.c b/gst/isomp4/atoms.c
similarity index 100%
rename from gst/quicktime/atoms.c
rename to gst/isomp4/atoms.c

diff --git a/gst/quicktime/atoms.h b/gst/isomp4/atoms.h
similarity index 100%
rename from gst/quicktime/atoms.h
rename to gst/isomp4/atoms.h

diff --git a/gst/quicktime/atomsrecovery.c b/gst/isomp4/atomsrecovery.c
similarity index 100%
rename from gst/quicktime/atomsrecovery.c
rename to gst/isomp4/atomsrecovery.c

diff --git a/gst/quicktime/atomsrecovery.h b/gst/isomp4/atomsrecovery.h
similarity index 100%
rename from gst/quicktime/atomsrecovery.h
rename to gst/isomp4/atomsrecovery.h

diff --git a/gst/quicktime/descriptors.c b/gst/isomp4/descriptors.c
similarity index 100%
rename from gst/quicktime/descriptors.c
rename to gst/isomp4/descriptors.c

diff --git a/gst/quicktime/descriptors.h b/gst/isomp4/descriptors.h
similarity index 100%
rename from gst/quicktime/descriptors.h
rename to gst/isomp4/descriptors.h

diff --git a/gst/quicktime/fourcc.h b/gst/isomp4/fourcc.h
similarity index 100%
rename from gst/quicktime/fourcc.h
rename to gst/isomp4/fourcc.h

diff --git a/gst/quicktime/ftypcc.h b/gst/isomp4/ftypcc.h
similarity index 100%
rename from gst/quicktime/ftypcc.h
rename to gst/isomp4/ftypcc.h

diff --git a/gst/quicktime/gstqtmoovrecover.c b/gst/isomp4/gstqtmoovrecover.c
similarity index 100%
rename from gst/quicktime/gstqtmoovrecover.c
rename to gst/isomp4/gstqtmoovrecover.c

diff --git a/gst/quicktime/gstqtmoovrecover.h b/gst/isomp4/gstqtmoovrecover.h
similarity index 100%
rename from gst/quicktime/gstqtmoovrecover.h
rename to gst/isomp4/gstqtmoovrecover.h

diff --git a/gst/quicktime/gstqtmux-doc.c b/gst/isomp4/gstqtmux-doc.c
similarity index 100%
rename from gst/quicktime/gstqtmux-doc.c
rename to gst/isomp4/gstqtmux-doc.c

diff --git a/gst/quicktime/gstqtmux-doc.h b/gst/isomp4/gstqtmux-doc.h
similarity index 100%
rename from gst/quicktime/gstqtmux-doc.h
rename to gst/isomp4/gstqtmux-doc.h

diff --git a/gst/quicktime/gstqtmux.c b/gst/isomp4/gstqtmux.c
similarity index 100%
rename from gst/quicktime/gstqtmux.c
rename to gst/isomp4/gstqtmux.c

diff --git a/gst/quicktime/gstqtmux.h b/gst/isomp4/gstqtmux.h
similarity index 100%
rename from gst/quicktime/gstqtmux.h
rename to gst/isomp4/gstqtmux.h

diff --git a/gst/quicktime/gstqtmuxmap.c b/gst/isomp4/gstqtmuxmap.c
similarity index 100%
rename from gst/quicktime/gstqtmuxmap.c
rename to gst/isomp4/gstqtmuxmap.c

diff --git a/gst/quicktime/gstqtmuxmap.h b/gst/isomp4/gstqtmuxmap.h
similarity index 100%
rename from gst/quicktime/gstqtmuxmap.h
rename to gst/isomp4/gstqtmuxmap.h

diff --git a/gst/quicktime/gstrtpxqtdepay.c b/gst/isomp4/gstrtpxqtdepay.c
similarity index 100%
rename from gst/quicktime/gstrtpxqtdepay.c
rename to gst/isomp4/gstrtpxqtdepay.c

diff --git a/gst/quicktime/gstrtpxqtdepay.h b/gst/isomp4/gstrtpxqtdepay.h
similarity index 100%
rename from gst/quicktime/gstrtpxqtdepay.h
rename to gst/isomp4/gstrtpxqtdepay.h

diff --git a/gst/quicktime/quicktime.c b/gst/isomp4/isomp4-plugin.c
similarity index 96%
rename from gst/quicktime/quicktime.c
rename to gst/isomp4/isomp4-plugin.c
index 26df65b..1e26d30 100644 (file)
--- a/gst/quicktime/quicktime.c
+++ b/gst/isomp4/isomp4-plugin.c
@@ -69,6 +69,6 @@ plugin_init (GstPlugin * plugin)
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    "quicktime",
-    "Quicktime support",
+    "isomp4",
+    "ISO base media file format support (mp4, 3gpp, qt, mj2)",
     plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);

diff --git a/gst/quicktime/properties.c b/gst/isomp4/properties.c
similarity index 100%
rename from gst/quicktime/properties.c
rename to gst/isomp4/properties.c

diff --git a/gst/quicktime/properties.h b/gst/isomp4/properties.h
similarity index 100%
rename from gst/quicktime/properties.h
rename to gst/isomp4/properties.h

diff --git a/gst/quicktime/qtatomparser.h b/gst/isomp4/qtatomparser.h
similarity index 100%
rename from gst/quicktime/qtatomparser.h
rename to gst/isomp4/qtatomparser.h

diff --git a/gst/quicktime/qtdemux.c b/gst/isomp4/qtdemux.c
similarity index 100%
rename from gst/quicktime/qtdemux.c
rename to gst/isomp4/qtdemux.c

diff --git a/gst/quicktime/qtdemux.h b/gst/isomp4/qtdemux.h
similarity index 100%
rename from gst/quicktime/qtdemux.h
rename to gst/isomp4/qtdemux.h

diff --git a/gst/quicktime/qtdemux.vcproj b/gst/isomp4/qtdemux.vcproj
similarity index 100%
rename from gst/quicktime/qtdemux.vcproj
rename to gst/isomp4/qtdemux.vcproj

diff --git a/gst/quicktime/qtdemux_dump.c b/gst/isomp4/qtdemux_dump.c
similarity index 100%
rename from gst/quicktime/qtdemux_dump.c
rename to gst/isomp4/qtdemux_dump.c

diff --git a/gst/quicktime/qtdemux_dump.h b/gst/isomp4/qtdemux_dump.h
similarity index 100%
rename from gst/quicktime/qtdemux_dump.h
rename to gst/isomp4/qtdemux_dump.h

diff --git a/gst/quicktime/qtdemux_fourcc.h b/gst/isomp4/qtdemux_fourcc.h
similarity index 100%
rename from gst/quicktime/qtdemux_fourcc.h
rename to gst/isomp4/qtdemux_fourcc.h

diff --git a/gst/quicktime/qtdemux_lang.c b/gst/isomp4/qtdemux_lang.c
similarity index 100%
rename from gst/quicktime/qtdemux_lang.c
rename to gst/isomp4/qtdemux_lang.c

diff --git a/gst/quicktime/qtdemux_lang.h b/gst/isomp4/qtdemux_lang.h
similarity index 100%
rename from gst/quicktime/qtdemux_lang.h
rename to gst/isomp4/qtdemux_lang.h

diff --git a/gst/quicktime/qtdemux_types.c b/gst/isomp4/qtdemux_types.c
similarity index 100%
rename from gst/quicktime/qtdemux_types.c
rename to gst/isomp4/qtdemux_types.c

diff --git a/gst/quicktime/qtdemux_types.h b/gst/isomp4/qtdemux_types.h
similarity index 100%
rename from gst/quicktime/qtdemux_types.h
rename to gst/isomp4/qtdemux_types.h

diff --git a/gst/quicktime/qtpalette.h b/gst/isomp4/qtpalette.h
similarity index 100%
rename from gst/quicktime/qtpalette.h
rename to gst/isomp4/qtpalette.h

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5424a03..95fc75e 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,7 +9,7 @@ ext/wavpack/gstwavpackparse.c
 gconf/gstreamer.schemas.in
 gst/avi/gstavidemux.c
 gst/avi/gstavimux.c
-gst/quicktime/qtdemux.c
+gst/isomp4/qtdemux.c
 gst/rtsp/gstrtspsrc.c
 gst/wavparse/gstwavparse.c
 sys/oss/gstossmixer.c