Cargo.toml

@@ -8,6 +8,7 @@ members = [
     "gst-plugin-flv",
     "gst-plugin-audiofx",
     "gst-plugin-togglerecord",
+    "gst-plugin-tutorial",
 ]
 
 [profile.release]

README.md

@@ -12,7 +12,7 @@ API builds upon the [application-side GStreamer bindings](https://github.com/sdr
 Check the README.md of that repository also for details about how to set-up
 your development environment.
 
-Various example plugins can be found in the [GIT repository](https://github.com/sdroege/gst-plugin-rs/).
+Various example plugins can be found in the [GIT repository](https://github.com/sdroege/gst-plugin-rs/). A blog post series about writing GStreamer plugins/elements can be found [here](https://coaxion.net/blog/2018/01/how-to-write-gstreamer-elements-in-rust-part-1-a-video-filter-for-converting-rgb-to-grayscale/)[2](https://coaxion.net/blog/2018/02/how-to-write-gstreamer-elements-in-rust-part-2-a-raw-audio-sine-wave-source/).
 
 For background and motivation, see the [announcement
 blogpost](https://coaxion.net/blog/2016/05/writing-gstreamer-plugins-and-elements-in-rust/)

gst-plugin-audiofx/Cargo.toml

 [package]
 name = "gst-plugin-audiofx"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://github.com/sdroege/gst-plugin-rs"
 license = "MIT/Apache-2.0"
 
 [dependencies]
-gst-plugin = { path="../gst-plugin" }
-glib = { git = "https://github.com/gtk-rs/glib" }
-gstreamer = { git = "https://github.com/sdroege/gstreamer-rs", features = ["v1_10"] }
-gstreamer-base = { git = "https://github.com/sdroege/gstreamer-rs", features = ["v1_10"] }
-gstreamer-audio = { git = "https://github.com/sdroege/gstreamer-rs", features = ["v1_10"] }
+gst-plugin = { version = "0.2", path="../gst-plugin" }
+glib = "0.5"
+gstreamer = "0.11"
+gstreamer-base = "0.11"
+gstreamer-audio = "0.11"
 byte-slice-cast = "0.1"
-num-traits = "0.1"
+num-traits = "0.2"
 
 [lib]
 name = "gstrsaudiofx"

gst-plugin-audiofx/src/audioecho.rs

@@ -98,9 +98,9 @@ impl AudioEcho {
     fn new(_transform: &BaseTransform) -> Self {
         Self {
             cat: gst::DebugCategory::new(
-                "rsaudiofx",
+                "rsaudioecho",
                 gst::DebugColorFlags::empty(),
-                "Rust audiofx effect",
+                "Rust audioecho effect",
             ),
             settings: Mutex::new(Default::default()),
             state: Mutex::new(None),
@@ -180,7 +180,9 @@ impl ObjectImpl<BaseTransform> for AudioEcho {
         match *prop {
             Property::UInt64("max-delay", ..) => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.max_delay = value.get().unwrap();
+                if self.state.lock().unwrap().is_none() {
+                    settings.max_delay = value.get().unwrap();
+                }
             }
             Property::UInt64("delay", ..) => {
                 let mut settings = self.settings.lock().unwrap();
@@ -204,11 +206,7 @@ impl ObjectImpl<BaseTransform> for AudioEcho {
         match *prop {
             Property::UInt64("max-delay", ..) => {
                 let settings = self.settings.lock().unwrap();
-                if self.state.lock().unwrap().is_none() {
-                    Ok(settings.max_delay.to_value())
-                } else {
-                    Err(())
-                }
+                Ok(settings.max_delay.to_value())
             }
             Property::UInt64("delay", ..) => {
                 let settings = self.settings.lock().unwrap();

gst-plugin-audiofx/src/lib.rs

@@ -12,6 +12,7 @@ extern crate byte_slice_cast;
 extern crate glib;
 #[macro_use]
 extern crate gst_plugin;
+#[macro_use]
 extern crate gstreamer as gst;
 extern crate gstreamer_audio as gst_audio;
 extern crate gstreamer_base as gst_base;

gst-plugin-file/Cargo.toml

 [package]
 name = "gst-plugin-file"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://github.com/sdroege/gst-plugin-rs"
 license = "MIT/Apache-2.0"
 
 [dependencies]
 url = "1.1"
-gst-plugin = { path="../gst-plugin" }
-gst-plugin-simple = { path="../gst-plugin-simple" }
-gstreamer = { git = "https://github.com/sdroege/gstreamer-rs", features = ["v1_10"] }
+gst-plugin = { version = "0.2", path="../gst-plugin" }
+gst-plugin-simple = { version = "0.2", path="../gst-plugin-simple" }
+gstreamer = "0.11"
 
 [lib]
 name = "gstrsfile"

gst-plugin-flv/Cargo.toml

 [package]
 name = "gst-plugin-flv"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://github.com/sdroege/gst-plugin-rs"
 license = "MIT/Apache-2.0"
 
 [dependencies]
 url = "1.1"
-gst-plugin = { path="../gst-plugin" }
-gst-plugin-simple = { path="../gst-plugin-simple" }
-gstreamer = { git = "https://github.com/sdroege/gstreamer-rs", features = ["v1_10"] }
+gst-plugin = { version = "0.2", path="../gst-plugin" }
+gst-plugin-simple = { version = "0.2", path="../gst-plugin-simple" }
+gstreamer = "0.11"
 num-rational = { version = "0.1", default-features = false, features = [] }
 nom = "3.0"
 flavors = {git = "https://github.com/rust-av/flavors.git"}

gst-plugin-http/Cargo.toml

 [package]
 name = "gst-plugin-http"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://github.com/sdroege/gst-plugin-rs"
 license = "MIT/Apache-2.0"
 
 [dependencies]
 url = "1.1"
-gst-plugin = { path="../gst-plugin" }
-gst-plugin-simple = { path="../gst-plugin-simple" }
+gst-plugin = { version = "0.2", path="../gst-plugin" }
+gst-plugin-simple = { version = "0.2", path="../gst-plugin-simple" }
 reqwest = "0.8"
-gstreamer = { git = "https://github.com/sdroege/gstreamer-rs", features = ["v1_10"] }
+gstreamer = "0.11"
 
 [lib]
 name = "gstrshttp"

gst-plugin-simple/Cargo.toml

 [package]
 name = "gst-plugin-simple"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://github.com/sdroege/gst-plugin-rs"
 license = "MIT/Apache-2.0"
 
 [dependencies]
 url = "1.1"
-glib = { git = "https://github.com/gtk-rs/glib" }
-gst-plugin = { path="../gst-plugin" }
-gstreamer = { git = "https://github.com/sdroege/gstreamer-rs", features = ["v1_10"] }
-gstreamer-base = { git = "https://github.com/sdroege/gstreamer-rs", features = ["v1_10"] }
+glib = "0.5"
+gst-plugin = { version = "0.2", path="../gst-plugin" }
+gstreamer = "0.11"
+gstreamer-base = "0.11"
 
 [lib]
 name = "gst_plugin_simple"

gst-plugin-simple/src/demuxer.rs

@@ -271,7 +271,7 @@ impl Demuxer {
     fn sink_activate(pad: &gst::Pad, _parent: &Option<gst::Object>) -> bool {
         let mode = {
             let mut query = gst::Query::new_scheduling();
-            if !pad.peer_query(query.get_mut().unwrap()) {
+            if !pad.peer_query(&mut query) {
                 return false;
             }
 

gst-plugin-simple/src/sink.rs

@@ -168,10 +168,7 @@ impl BaseSinkImpl<BaseSink> for Sink {
             }
             (None, _) => {
                 gst_error!(self.cat, obj: sink, "No URI given");
-                sink.post_error_message(&gst_error_msg!(
-                    gst::ResourceError::OpenRead,
-                    ["No URI given"]
-                ));
+                gst_element_error!(sink, gst::ResourceError::OpenRead, ["No URI given"]);
                 return false;
             }
         };

gst-plugin-simple/src/source.rs

@@ -187,10 +187,7 @@ impl BaseSrcImpl<BaseSrc> for Source {
             }
             (None, _) => {
                 gst_error!(self.cat, obj: src, "No URI given");
-                src.post_error_message(&gst_error_msg!(
-                    gst::ResourceError::OpenRead,
-                    ["No URI given"]
-                ));
+                gst_element_error!(src, gst::ResourceError::OpenRead, ["No URI given"]);
                 return false;
             }
         };

gst-plugin-togglerecord/Cargo.toml

 [package]
 name = "gst-plugin-togglerecord"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 license = "LGPL-2.1+"
 
 [dependencies]
-glib = { git = "https://github.com/gtk-rs/glib" }
-gstreamer = { git = "https://github.com/sdroege/gstreamer-rs", features = ["v1_10"] }
-gstreamer-video = { git = "https://github.com/sdroege/gstreamer-rs", features = ["v1_10"] }
-gst-plugin = { path = "../gst-plugin" }
-gtk = { git = "https://github.com/gtk-rs/gtk", features = ["v3_6"], optional = true }
-gio = { git = "https://github.com/gtk-rs/gio", optional = true }
+glib = "0.5"
+gstreamer = "0.11"
+gstreamer-video = "0.11"
+gst-plugin = { version = "0.2", path = "../gst-plugin" }
+gtk = { version = "0.4", features = ["v3_6"], optional = true }
+gio = { version = "0.4", optional = true }
 send-cell = { version = "0.1", optional = true }
 
 [dev-dependencies]

gst-plugin-togglerecord/src/togglerecord.rs

@@ -1118,27 +1118,23 @@ impl ToggleRecord {
         match query.view_mut() {
             QueryView::Scheduling(ref mut q) => {
                 let mut new_query = gst::Query::new_scheduling();
-                let res = stream.sinkpad.peer_query(new_query.get_mut().unwrap());
+                let res = stream.sinkpad.peer_query(&mut new_query);
                 if !res {
                     return res;
                 }
 
                 gst_log!(self.cat, obj: pad, "Downstream returned {:?}", new_query);
 
-                match new_query.view() {
-                    QueryView::Scheduling(ref n) => {
-                        let (flags, min, max, align) = n.get_result();
-                        q.set(flags, min, max, align);
-                        q.add_scheduling_modes(&n.get_scheduling_modes()
-                            .iter()
-                            .cloned()
-                            .filter(|m| m != &gst::PadMode::Pull)
-                            .collect::<Vec<_>>());
-                        gst_log!(self.cat, obj: pad, "Returning {:?}", q.get_mut_query());
-                        return true;
-                    }
-                    _ => unreachable!(),
-                }
+                let (flags, min, max, align) = new_query.get_result();
+                q.set(flags, min, max, align);
+                q.add_scheduling_modes(&new_query
+                    .get_scheduling_modes()
+                    .iter()
+                    .cloned()
+                    .filter(|m| m != &gst::PadMode::Pull)
+                    .collect::<Vec<_>>());
+                gst_log!(self.cat, obj: pad, "Returning {:?}", q.get_mut_query());
+                return true;
             }
             QueryView::Seeking(ref mut q) => {
                 // Seeking is not possible here

gst-plugin-tutorial/Cargo.toml

+[package]
+name = "gst-plugin-tutorial"
+version = "0.2.0"
+authors = ["Sebastian Dröge <sebastian@centricular.com>"]
+repository = "https://github.com/sdroege/gst-plugin-rs"
+license = "MIT/Apache-2.0"
+
+[dependencies]
+gst-plugin = { version = "0.2", path="../gst-plugin" }
+glib = "0.5"
+gstreamer = "0.11"
+gstreamer-base = "0.11"
+gstreamer-video = "0.11"
+gstreamer-audio = "0.11"
+byte-slice-cast = "0.1"
+num-traits = "0.2"
+
+[lib]
+name = "gstrstutorial"
+crate-type = ["cdylib"]
+path = "src/lib.rs"

gst-plugin-tutorial/src/lib.rs

+// Copyright (C) 2017 Sebastian Dröge <sebastian@centricular.com>
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+extern crate glib;
+#[macro_use]
+extern crate gst_plugin;
+#[macro_use]
+extern crate gstreamer as gst;
+extern crate gstreamer_audio as gst_audio;
+extern crate gstreamer_base as gst_base;
+extern crate gstreamer_video as gst_video;
+
+extern crate byte_slice_cast;
+extern crate num_traits;
+
+mod rgb2gray;
+mod sinesrc;
+
+// Plugin entry point that should register all elements provided by this plugin,
+// and everything else that this plugin might provide (e.g. typefinders or device providers).
+fn plugin_init(plugin: &gst::Plugin) -> bool {
+    rgb2gray::register(plugin);
+    sinesrc::register(plugin);
+    true
+}
+
+// Static plugin metdata that is directly stored in the plugin shared object and read by GStreamer
+// upon loading.
+// Plugin name, plugin description, plugin entry point function, version number of this plugin,
+// license of the plugin, source package name, binary package name, origin where it comes from
+// and the date/time of release.
+plugin_define!(
+    b"rstutorial\0",
+    b"Rust Tutorial Plugin\0",
+    plugin_init,
+    b"1.0\0",
+    b"MIT/X11\0",
+    b"rstutorial\0",
+    b"rstutorial\0",
+    b"https://github.com/sdroege/gst-plugin-rs\0",
+    b"2017-12-30\0"
+);

gst-plugin/CHANGELOG.md

+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html),
+specifically the [variant used by Rust](http://doc.crates.io/manifest.html#the-version-field).
+
+## [0.2.0] - 2018-03-20
+### Changed
+- Update to gstreamer-rs 0.11
+- BaseTransform::transform_caps() takes caps by reference instead of value
+
+### Added
+- Send+Sync impls for all wrapper types
+
+## [0.1.4] - 2018-02-12
+### Fixed
+- Fix BaseSrc::unlock_stop() and the same in BaseSink. It was calling unlock()
+  instead of unlock_stop() before, making it rather useless.
+
+## [0.1.3] - 2018-01-15
+### Fixed
+- Only require GStreamer >= 1.8, not >= 1.10. We didn't use any 1.10 API
+  anymore since quite a while
+- Don't call BaseTransform::transform_ip in passthrough mode with a mutable
+  reference, but call a new transform_ip_passthrough with an immutable
+  reference. The mutable reference would've failed all mutable operations.
+
+## [0.1.2] - 2018-01-03
+### Fixed
+- BaseTransform::transform_caps() caps parameter is not owned when chainging
+  to the parent class' implementation either
+
+## [0.1.1] - 2018-01-03
+### Fixed
+- BaseTransform::transform_caps() caps parameter is not owned
+
+## [0.1.0] - 2017-12-22
+- Initial release of the `gst-plugin` crate.
+
+[Unreleased]: https://github.com/sdroege/gstreamer-rs/compare/0.1.1...HEAD
+[0.1.0]: https://github.com/sdroege/gstreamer-rs/compare/0.1.0...0.1.1

gst-plugin/Cargo.toml

 [package]
 name = "gst-plugin"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 categories = ["multimedia"]
 description = "Infrastructure for writing GStreamer plugins in Rust"
-repository = "https://github.com/sdroege/gst-plugin-rs/gst-plugin"
+repository = "https://github.com/sdroege/gst-plugin-rs/tree/master/gst-plugin"
 license = "MIT/Apache-2.0"
 readme = "README.md"
 homepage = "https://gstreamer.freedesktop.org"
-documentation = "https://sdroege.github.io/rustdoc/gst-plugin/gst_plugin_rs"
+documentation = "https://sdroege.github.io/rustdoc/gst-plugin/gst_plugin/"
 keywords = ["gstreamer", "multimedia", "audio", "video", "gnome"]
 
 [dependencies]
 libc = "0.2"
 lazy_static = "1.0"
 byteorder = "1.0"
-glib-sys = { git = "https://github.com/gtk-rs/sys" }
-gobject-sys = { git = "https://github.com/gtk-rs/sys" }
-gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_10"] }
-gstreamer-base-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_10"] }
-glib = { git = "https://github.com/gtk-rs/glib" }
-gstreamer = { git = "https://github.com/sdroege/gstreamer-rs", features = ["v1_10"] }
-gstreamer-base = { git = "https://github.com/sdroege/gstreamer-rs" }
+glib-sys = "0.6"
+gobject-sys = "0.6"
+gstreamer-sys = "0.5"
+gstreamer-base-sys = "0.5"
+glib = "0.5"
+gstreamer = "0.11"
+gstreamer-base = "0.11"
 
 [lib]
 name = "gst_plugin"