From c95a7ab1cae56eb485992f3d5ae033baafa4e7a2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 20 Oct 2021 01:03:26 +0100 Subject: [PATCH] docs: remove mention of mms from docs and mmssrc from tutorials Prerequisite for our removing it from the cerbero build, see https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/760 Part-of: --- .../examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m | 6 ------ .../examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m | 6 ------ .../examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m | 6 ------ .../examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m | 6 ------ .../examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m | 6 ------ .../gst-docs/markdown/additional/design/missing-plugins.md | 14 +++++++------- .../application-development/advanced/interfaces.md | 2 +- .../markdown/installing/for-android-development.md | 2 +- .../gst-docs/markdown/tutorials/playback/playbin-usage.md | 2 +- .../player/android/app/src/main/AndroidManifest.xml | 8 -------- .../playback/player/ios/GstPlay/gst_ios_init.m | 6 ------ 11 files changed, 10 insertions(+), 54 deletions(-) diff --git a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m index 3de3791..f5903be 100644 --- a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m +++ b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m @@ -515,9 +515,6 @@ GST_PLUGIN_STATIC_DECLARE(x264); #if defined(GST_IOS_PLUGIN_LIBAV) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED) GST_PLUGIN_STATIC_DECLARE(libav); #endif -#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) -GST_PLUGIN_STATIC_DECLARE(mms); -#endif #if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) GST_PLUGIN_STATIC_DECLARE(rtmp); #endif @@ -1090,9 +1087,6 @@ gst_ios_init (void) #if defined(GST_IOS_PLUGIN_LIBAV) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED) GST_PLUGIN_STATIC_REGISTER(libav); #endif -#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) - GST_PLUGIN_STATIC_REGISTER(mms); -#endif #if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) GST_PLUGIN_STATIC_REGISTER(rtmp); #endif diff --git a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m index 3de3791..f5903be 100644 --- a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m +++ b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m @@ -515,9 +515,6 @@ GST_PLUGIN_STATIC_DECLARE(x264); #if defined(GST_IOS_PLUGIN_LIBAV) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED) GST_PLUGIN_STATIC_DECLARE(libav); #endif -#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) -GST_PLUGIN_STATIC_DECLARE(mms); -#endif #if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) GST_PLUGIN_STATIC_DECLARE(rtmp); #endif @@ -1090,9 +1087,6 @@ gst_ios_init (void) #if defined(GST_IOS_PLUGIN_LIBAV) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED) GST_PLUGIN_STATIC_REGISTER(libav); #endif -#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) - GST_PLUGIN_STATIC_REGISTER(mms); -#endif #if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) GST_PLUGIN_STATIC_REGISTER(rtmp); #endif diff --git a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m index 3de3791..f5903be 100644 --- a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m +++ b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m @@ -515,9 +515,6 @@ GST_PLUGIN_STATIC_DECLARE(x264); #if defined(GST_IOS_PLUGIN_LIBAV) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED) GST_PLUGIN_STATIC_DECLARE(libav); #endif -#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) -GST_PLUGIN_STATIC_DECLARE(mms); -#endif #if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) GST_PLUGIN_STATIC_DECLARE(rtmp); #endif @@ -1090,9 +1087,6 @@ gst_ios_init (void) #if defined(GST_IOS_PLUGIN_LIBAV) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED) GST_PLUGIN_STATIC_REGISTER(libav); #endif -#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) - GST_PLUGIN_STATIC_REGISTER(mms); -#endif #if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) GST_PLUGIN_STATIC_REGISTER(rtmp); #endif diff --git a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m index 3de3791..f5903be 100644 --- a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m +++ b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m @@ -515,9 +515,6 @@ GST_PLUGIN_STATIC_DECLARE(x264); #if defined(GST_IOS_PLUGIN_LIBAV) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED) GST_PLUGIN_STATIC_DECLARE(libav); #endif -#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) -GST_PLUGIN_STATIC_DECLARE(mms); -#endif #if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) GST_PLUGIN_STATIC_DECLARE(rtmp); #endif @@ -1090,9 +1087,6 @@ gst_ios_init (void) #if defined(GST_IOS_PLUGIN_LIBAV) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED) GST_PLUGIN_STATIC_REGISTER(libav); #endif -#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) - GST_PLUGIN_STATIC_REGISTER(mms); -#endif #if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) GST_PLUGIN_STATIC_REGISTER(rtmp); #endif diff --git a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m index 3de3791..f5903be 100644 --- a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m +++ b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m @@ -515,9 +515,6 @@ GST_PLUGIN_STATIC_DECLARE(x264); #if defined(GST_IOS_PLUGIN_LIBAV) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED) GST_PLUGIN_STATIC_DECLARE(libav); #endif -#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) -GST_PLUGIN_STATIC_DECLARE(mms); -#endif #if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) GST_PLUGIN_STATIC_DECLARE(rtmp); #endif @@ -1090,9 +1087,6 @@ gst_ios_init (void) #if defined(GST_IOS_PLUGIN_LIBAV) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED) GST_PLUGIN_STATIC_REGISTER(libav); #endif -#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) - GST_PLUGIN_STATIC_REGISTER(mms); -#endif #if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) GST_PLUGIN_STATIC_REGISTER(rtmp); #endif diff --git a/subprojects/gst-docs/markdown/additional/design/missing-plugins.md b/subprojects/gst-docs/markdown/additional/design/missing-plugins.md index 19990df..7d8ab86 100644 --- a/subprojects/gst-docs/markdown/additional/design/missing-plugins.md +++ b/subprojects/gst-docs/markdown/additional/design/missing-plugins.md @@ -17,21 +17,21 @@ missing plugins, with the following fields set: * **`type`**: (string) { "urisource", "urisink", "decoder", "encoder", "element" } (we do not distinguish between demuxer/decoders/parsers etc.) -* **`detail`**: (string) or (caps) depending on the type { ANY } ex: "mms, -"mmsh", "audio/x-mp3,rate=48000,…" +* **`detail`**: (string) or (caps) depending on the type { ANY } ex: "rtsp, +"rtspt", "audio/x-mp3,rate=48000,…" -* **`name`**: (string) { ANY } ex: "MMS protocol handler",.. +* **`name`**: (string) { ANY } ex: "RTSP protocol handler",.. ### missing uri handler -ex. mms://foo.bar/file.asf +ex. rtsp://some.camera/stream1 -When no protocol handler is installed for mms://, the application will not be +When no protocol handler is installed for rtsp://, the application will not be able to instantiate an element for that uri (`gst_element_make_from_uri()` returns NULL). Playbin will post a `missing-plugin` element message with the type set to -"urisource", detail set to "mms". Optionally the friendly name can be filled +"urisource", detail set to "rtsp". Optionally the friendly name can be filled in as well. ### missing typefind function @@ -162,7 +162,7 @@ plugin install mechanism in the same way. - identifier string for the required component, e.g. -- urisource-(`PROTOCOL_REQUIRED`) e.g. `urisource-http` or `urisource-mms` +- urisource-(`PROTOCOL_REQUIRED`) e.g. `urisource-http` or `urisource-rtsp` - element-(`ELEMENT_REQUIRED`), e.g. `element-videoconvert` diff --git a/subprojects/gst-docs/markdown/application-development/advanced/interfaces.md b/subprojects/gst-docs/markdown/application-development/advanced/interfaces.md index b639801..c798b72 100644 --- a/subprojects/gst-docs/markdown/application-development/advanced/interfaces.md +++ b/subprojects/gst-docs/markdown/application-development/advanced/interfaces.md @@ -34,7 +34,7 @@ correct plugins installed, GStreamer supports: ``` file://// http://// -mms://// +rtsp:/// dvb:// ... ``` diff --git a/subprojects/gst-docs/markdown/installing/for-android-development.md b/subprojects/gst-docs/markdown/installing/for-android-development.md index 4b1e4c2..c067f78 100644 --- a/subprojects/gst-docs/markdown/installing/for-android-development.md +++ b/subprojects/gst-docs/markdown/installing/for-android-development.md @@ -330,7 +330,7 @@ and used as follows: | `GSTREAMER_PLUGINS_VIS` | libvisual goom goom2k1 audiovisualizers | | `GSTREAMER_PLUGINS_EFFECTS` | alpha alphacolor audiofx cairo cutter debug deinterlace dtmf effectv equalizer gdkpixbuf imagefreeze interleave level multifile replaygain shapewipe smpte spectrum videobox videocrop videomixer accurip aiff audiofxbad autoconvert bayer coloreffects debugutilsbad fieldanalysis freeverb frei0r gaudieffects geometrictransform inter interlace ivtc rawparse removesilence segmentclip smooth speed soundtouch videofiltersbad audiomixer compositor webrtcdsp | | `GSTREAMER_PLUGINS_NET` | tcp rtsp rtp rtpmanager soup udp dataurisrc sdp srtp rtspclientsink | -| `GSTREAMER_PLUGINS_NET_RESTRICTED` | mms rtmp | +| `GSTREAMER_PLUGINS_NET_RESTRICTED` | rtmp | | `GSTREAMER_PLUGINS_CODECS` | subparse ogg theora vorbis opus ivorbisdec alaw apetag audioparsers auparse avi dv flac flv flxdec icydemux id3demux isomp4 jpeg matroska mulaw multipart png speex taglib vpx wavenc wavpack wavparse y4menc adpcmdec adpcmenc dashdemux dvbsuboverlay dvdspu hls id3tag kate midi mxf openh264 opusparse pcapparse pnm rfbsrc schro gstsiren smoothstreaming subenc videoparsersbad y4mdec jpegformat gdp rsvg openjpeg spandsp sbc androidmedia | | `GSTREAMER_PLUGINS_CODECS_GPL` | assrender | | `GSTREAMER_PLUGINS_CODECS_RESTRICTED` | asfmux dtsdec faad mpegpsdemux mpegpsmux mpegtsdemux mpegtsmux voaacenc a52dec amrnb amrwbdec asf dvdsub dvdlpcmdec mad mpeg2dec xingmux realmedia x264 lame mpg123 libav | diff --git a/subprojects/gst-docs/markdown/tutorials/playback/playbin-usage.md b/subprojects/gst-docs/markdown/tutorials/playback/playbin-usage.md index 35dad5f..c6326f9 100644 --- a/subprojects/gst-docs/markdown/tutorials/playback/playbin-usage.md +++ b/subprojects/gst-docs/markdown/tutorials/playback/playbin-usage.md @@ -402,7 +402,7 @@ This property is not really useful in this example. `connection-speed` informs `playbin` of the maximum speed of our network connection, so, in case multiple versions of the requested media are available in the server, `playbin` chooses the most appropriate. This is -mostly used in combination with streaming protocols like `mms` or +mostly used in combination with streaming protocols like `hls` or `rtsp`. We have set all these properties one by one, but we could have all of diff --git a/subprojects/gst-examples/playback/player/android/app/src/main/AndroidManifest.xml b/subprojects/gst-examples/playback/player/android/app/src/main/AndroidManifest.xml index 0296672..39ad252 100644 --- a/subprojects/gst-examples/playback/player/android/app/src/main/AndroidManifest.xml +++ b/subprojects/gst-examples/playback/player/android/app/src/main/AndroidManifest.xml @@ -294,10 +294,6 @@ - - - - @@ -330,10 +326,6 @@ - - - - diff --git a/subprojects/gst-examples/playback/player/ios/GstPlay/gst_ios_init.m b/subprojects/gst-examples/playback/player/ios/GstPlay/gst_ios_init.m index 3de3791..f5903be 100644 --- a/subprojects/gst-examples/playback/player/ios/GstPlay/gst_ios_init.m +++ b/subprojects/gst-examples/playback/player/ios/GstPlay/gst_ios_init.m @@ -515,9 +515,6 @@ GST_PLUGIN_STATIC_DECLARE(x264); #if defined(GST_IOS_PLUGIN_LIBAV) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED) GST_PLUGIN_STATIC_DECLARE(libav); #endif -#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) -GST_PLUGIN_STATIC_DECLARE(mms); -#endif #if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) GST_PLUGIN_STATIC_DECLARE(rtmp); #endif @@ -1090,9 +1087,6 @@ gst_ios_init (void) #if defined(GST_IOS_PLUGIN_LIBAV) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED) GST_PLUGIN_STATIC_REGISTER(libav); #endif -#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) - GST_PLUGIN_STATIC_REGISTER(mms); -#endif #if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED) GST_PLUGIN_STATIC_REGISTER(rtmp); #endif -- 2.7.4