mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-11-22 01:21:05 +00:00
Code Issues Projects Releases Wiki Activity

Improve Segment bindings to directly store the segment instead of a pointer to it

Browse source
This commit is contained in:
Sebastian Dröge 2017-07-31 10:45:04 +01:00
parent 0a0b82d1b2
commit 7e24bae7c0
5 changed files with 161 additions and 229 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Gir_Gst.toml
View file

@ -68,6 +68,7 @@ manual = [
"GObject.Object",
"Gst.Structure",
"Gst.Iterator",
"Gst.Segment",
]
[[object]]
@ -456,11 +457,6 @@ status = "generate"
# Has setter/getter functions
ignore = true
[[object]]
name = "Gst.Segment"
status = "generate"
concurrency = "send"
[[object]]
name = "Gst.Plugin"
status = "generate"

3
gstreamer/src/auto/mod.rs
View file

@ -95,9 +95,6 @@ pub use self::u_r_i_handler::URIHandlerExt;
mod date_time;
pub use self::date_time::DateTime;
mod segment;
pub use self::segment::Segment;
mod enums;
pub use self::enums::BufferingMode;
pub use self::enums::BusSyncReply;

151
gstreamer/src/auto/segment.rs
View file

@ -1,151 +0,0 @@
// This file was generated by gir (a01311c+) from gir-files (???)
// DO NOT EDIT
use Format;
use SeekFlags;
use SeekType;
use ffi;
use glib::translate::*;
use glib_ffi;
use gobject_ffi;
use std::mem;
use std::ptr;
glib_wrapper! {
pub struct Segment(Boxed<ffi::GstSegment>);
match fn {
copy => |ptr| ffi::gst_segment_copy(mut_override(ptr)),
free => |ptr| ffi::gst_segment_free(ptr),
get_type => || ffi::gst_segment_get_type(),
}
}
impl Segment {
pub fn new() -> Segment {
assert_initialized_main_thread!();
unsafe {
from_glib_full(ffi::gst_segment_new())
}
}
pub fn clip(&self, format: Format, start: u64, stop: u64) -> Option<(u64, u64)> {
unsafe {
let mut clip_start = mem::uninitialized();
let mut clip_stop = mem::uninitialized();
let ret = from_glib(ffi::gst_segment_clip(self.to_glib_none().0, format.to_glib(), start, stop, &mut clip_start, &mut clip_stop));
if ret { Some((clip_start, clip_stop)) } else { None }
}
}
pub fn copy_into(&self, dest: &mut Segment) {
unsafe {
ffi::gst_segment_copy_into(self.to_glib_none().0, dest.to_glib_none_mut().0);
}
}
pub fn do_seek(&mut self, rate: f64, format: Format, flags: SeekFlags, start_type: SeekType, start: u64, stop_type: SeekType, stop: u64) -> Option<bool> {
unsafe {
let mut update = mem::uninitialized();
let ret = from_glib(ffi::gst_segment_do_seek(self.to_glib_none_mut().0, rate, format.to_glib(), flags.to_glib(), start_type.to_glib(), start, stop_type.to_glib(), stop, &mut update));
if ret { Some(from_glib(update)) } else { None }
}
}
pub fn init(&mut self, format: Format) {
unsafe {
ffi::gst_segment_init(self.to_glib_none_mut().0, format.to_glib());
}
}
fn is_equal(&self, s1: &Segment) -> bool {
unsafe {
from_glib(ffi::gst_segment_is_equal(self.to_glib_none().0, s1.to_glib_none().0))
}
}
pub fn offset_running_time(&mut self, format: Format, offset: i64) -> bool {
unsafe {
from_glib(ffi::gst_segment_offset_running_time(self.to_glib_none_mut().0, format.to_glib(), offset))
}
}
pub fn position_from_running_time(&self, format: Format, running_time: u64) -> u64 {
unsafe {
ffi::gst_segment_position_from_running_time(self.to_glib_none().0, format.to_glib(), running_time)
}
}
pub fn position_from_running_time_full(&self, format: Format, running_time: u64) -> (i32, u64) {
unsafe {
let mut position = mem::uninitialized();
let ret = ffi::gst_segment_position_from_running_time_full(self.to_glib_none().0, format.to_glib(), running_time, &mut position);
(ret, position)
}
}
pub fn position_from_stream_time(&self, format: Format, stream_time: u64) -> u64 {
unsafe {
ffi::gst_segment_position_from_stream_time(self.to_glib_none().0, format.to_glib(), stream_time)
}
}
pub fn position_from_stream_time_full(&self, format: Format, stream_time: u64) -> (i32, u64) {
unsafe {
let mut position = mem::uninitialized();
let ret = ffi::gst_segment_position_from_stream_time_full(self.to_glib_none().0, format.to_glib(), stream_time, &mut position);
(ret, position)
}
}
pub fn set_running_time(&mut self, format: Format, running_time: u64) -> bool {
unsafe {
from_glib(ffi::gst_segment_set_running_time(self.to_glib_none_mut().0, format.to_glib(), running_time))
}
}
pub fn to_position(&self, format: Format, running_time: u64) -> u64 {
unsafe {
ffi::gst_segment_to_position(self.to_glib_none().0, format.to_glib(), running_time)
}
}
pub fn to_running_time(&self, format: Format, position: u64) -> u64 {
unsafe {
ffi::gst_segment_to_running_time(self.to_glib_none().0, format.to_glib(), position)
}
}
pub fn to_running_time_full(&self, format: Format, position: u64) -> (i32, u64) {
unsafe {
let mut running_time = mem::uninitialized();
let ret = ffi::gst_segment_to_running_time_full(self.to_glib_none().0, format.to_glib(), position, &mut running_time);
(ret, running_time)
}
}
pub fn to_stream_time(&self, format: Format, position: u64) -> u64 {
unsafe {
ffi::gst_segment_to_stream_time(self.to_glib_none().0, format.to_glib(), position)
}
}
pub fn to_stream_time_full(&self, format: Format, position: u64) -> (i32, u64) {
unsafe {
let mut stream_time = mem::uninitialized();
let ret = ffi::gst_segment_to_stream_time_full(self.to_glib_none().0, format.to_glib(), position, &mut stream_time);
(ret, stream_time)
}
}
}
impl PartialEq for Segment {
#[inline]
fn eq(&self, other: &Self) -> bool {
self.is_equal(other)
}
}
impl Eq for Segment {}
unsafe impl Send for Segment {}

4
gstreamer/src/lib.rs
View file

@ -74,7 +74,6 @@ mod bin;
mod bus;
mod pad;
mod gobject;
mod segment;
mod proxy_pad;
mod ghost_pad;
mod child_proxy;
@ -91,6 +90,9 @@ pub use self::iterator::Iterator;
mod value;
pub use value::*;
mod segment;
pub use segment::*;
use std::ptr;
pub fn init() -> Result<(), glib::Error> {

226
gstreamer/src/segment.rs
View file

@ -6,144 +6,232 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use Segment;
use SegmentFlags;
use Format;
use SeekFlags;
use SeekType;
use ffi;
use glib::translate::*;
use glib_ffi;
use gobject_ffi;
use glib;
use std::mem;
use std::ptr;
use glib::translate::{from_glib, ToGlib, ToGlibPtr, ToGlibPtrMut};
// TODO: Plain struct implementation without heap allocation
pub struct Segment(ffi::GstSegment);
impl Segment {
pub fn set_flags(&mut self, flags: SegmentFlags) {
pub fn new() -> Segment {
assert_initialized_main_thread!();
unsafe {
(*self.to_glib_none_mut().0).flags = flags.to_glib();
Self::uninitialized()
}
}
pub fn get_flags(&self) -> SegmentFlags {
pub fn clip(&self, format: Format, start: u64, stop: u64) -> Option<(u64, u64)> {
unsafe {
from_glib((*self.to_glib_none().0).flags)
let mut clip_start = mem::uninitialized();
let mut clip_stop = mem::uninitialized();
let ret = from_glib(ffi::gst_segment_clip(self.to_glib_none().0, format.to_glib(), start, stop, &mut clip_start, &mut clip_stop));
if ret { Some((clip_start, clip_stop)) } else { None }
}
}
pub fn set_rate(&mut self, rate: f64) {
pub fn copy_into(&self, dest: &mut Segment) {
unsafe {
(*self.to_glib_none_mut().0).rate = rate;
ffi::gst_segment_copy_into(self.to_glib_none().0, dest.to_glib_none_mut().0);
}
}
pub fn get_rate(&self) -> f64 {
pub fn do_seek(&mut self, rate: f64, format: Format, flags: SeekFlags, start_type: SeekType, start: u64, stop_type: SeekType, stop: u64) -> Option<bool> {
unsafe {
(*self.to_glib_none().0).rate
let mut update = mem::uninitialized();
let ret = from_glib(ffi::gst_segment_do_seek(self.to_glib_none_mut().0, rate, format.to_glib(), flags.to_glib(), start_type.to_glib(), start, stop_type.to_glib(), stop, &mut update));
if ret { Some(from_glib(update)) } else { None }
}
}
pub fn set_applied_rate(&mut self, applied_rate: f64) {
pub fn init(&mut self, format: Format) {
unsafe {
(*self.to_glib_none_mut().0).applied_rate = applied_rate;
ffi::gst_segment_init(self.to_glib_none_mut().0, format.to_glib());
}
}
pub fn get_applied_rate(&self) -> f64 {
fn is_equal(&self, s1: &Segment) -> bool {
unsafe {
(*self.to_glib_none().0).applied_rate
from_glib(ffi::gst_segment_is_equal(self.to_glib_none().0, s1.to_glib_none().0))
}
}
pub fn set_format(&mut self, format: Format) {
pub fn offset_running_time(&mut self, format: Format, offset: i64) -> bool {
unsafe {
(*self.to_glib_none_mut().0).format = format.to_glib();
from_glib(ffi::gst_segment_offset_running_time(self.to_glib_none_mut().0, format.to_glib(), offset))
}
}
pub fn get_format(&self) -> Format {
pub fn position_from_running_time(&self, format: Format, running_time: u64) -> u64 {
unsafe {
from_glib((*self.to_glib_none().0).format)
ffi::gst_segment_position_from_running_time(self.to_glib_none().0, format.to_glib(), running_time)
}
}
pub fn set_base(&mut self, base: u64) {
pub fn position_from_running_time_full(&self, format: Format, running_time: u64) -> (i32, u64) {
unsafe {
(*self.to_glib_none_mut().0).base = base;
let mut position = mem::uninitialized();
let ret = ffi::gst_segment_position_from_running_time_full(self.to_glib_none().0, format.to_glib(), running_time, &mut position);
(ret, position)
}
}
pub fn get_base(&self) -> u64 {
pub fn position_from_stream_time(&self, format: Format, stream_time: u64) -> u64 {
unsafe {
(*self.to_glib_none().0).base
ffi::gst_segment_position_from_stream_time(self.to_glib_none().0, format.to_glib(), stream_time)
}
}
pub fn set_offset(&mut self, offset: u64) {
pub fn position_from_stream_time_full(&self, format: Format, stream_time: u64) -> (i32, u64) {
unsafe {
(*self.to_glib_none_mut().0).offset = offset;
let mut position = mem::uninitialized();
let ret = ffi::gst_segment_position_from_stream_time_full(self.to_glib_none().0, format.to_glib(), stream_time, &mut position);
(ret, position)
}
}
pub fn get_offset(&self) -> u64 {
pub fn set_running_time(&mut self, format: Format, running_time: u64) -> bool {
unsafe {
(*self.to_glib_none().0).offset
from_glib(ffi::gst_segment_set_running_time(self.to_glib_none_mut().0, format.to_glib(), running_time))
}
}
pub fn set_start(&mut self, start: u64) {
pub fn to_position(&self, format: Format, running_time: u64) -> u64 {
unsafe {
(*self.to_glib_none_mut().0).start = start;
ffi::gst_segment_to_position(self.to_glib_none().0, format.to_glib(), running_time)
}
}
pub fn get_start(&self) -> u64 {
pub fn to_running_time(&self, format: Format, position: u64) -> u64 {
unsafe {
(*self.to_glib_none().0).start
ffi::gst_segment_to_running_time(self.to_glib_none().0, format.to_glib(), position)
}
}
pub fn set_stop(&mut self, stop: u64) {
pub fn to_running_time_full(&self, format: Format, position: u64) -> (i32, u64) {
unsafe {
(*self.to_glib_none_mut().0).stop = stop;
let mut running_time = mem::uninitialized();
let ret = ffi::gst_segment_to_running_time_full(self.to_glib_none().0, format.to_glib(), position, &mut running_time);
(ret, running_time)
}
}
pub fn get_stop(&self) -> u64 {
pub fn to_stream_time(&self, format: Format, position: u64) -> u64 {
unsafe {
(*self.to_glib_none().0).stop
ffi::gst_segment_to_stream_time(self.to_glib_none().0, format.to_glib(), position)
}
}
pub fn set_time(&mut self, time: u64) {
pub fn to_stream_time_full(&self, format: Format, position: u64) -> (i32, u64) {
unsafe {
(*self.to_glib_none_mut().0).time = time;
}
}
pub fn get_time(&self) -> u64 {
unsafe {
(*self.to_glib_none().0).time
}
}
pub fn set_position(&mut self, position: u64) {
unsafe {
(*self.to_glib_none_mut().0).position = position;
}
}
pub fn get_position(&self) -> u64 {
unsafe {
(*self.to_glib_none().0).position
}
}
pub fn set_duration(&mut self, duration: u64) {
unsafe {
(*self.to_glib_none_mut().0).duration = duration;
}
}
pub fn get_duration(&self) -> u64 {
unsafe {
(*self.to_glib_none().0).duration
let mut stream_time = mem::uninitialized();
let ret = ffi::gst_segment_to_stream_time_full(self.to_glib_none().0, format.to_glib(), position, &mut stream_time);
(ret, stream_time)
}
}
}
impl PartialEq for Segment {
#[inline]
fn eq(&self, other: &Self) -> bool {
self.is_equal(other)
}
}
impl Eq for Segment {}
unsafe impl Send for Segment {}
impl Clone for Segment {
fn clone(&self) -> Self {
unsafe {
Segment(ptr::read(&self.0))
}
}
}
impl glib::types::StaticType for Segment {
fn static_type() -> glib::types::Type {
unsafe { glib::translate::from_glib(ffi::gst_segment_get_type()) }
}
}
#[doc(hidden)]
impl<'a> glib::value::FromValueOptional<'a> for Segment {
unsafe fn from_value_optional(value: &glib::Value) -> Option<Self> {
Option::<Segment>::from_glib_full(gobject_ffi::g_value_get_boxed(value.to_glib_none().0) as *mut ffi::GstSegment)
}
}
#[doc(hidden)]
impl glib::value::SetValue for Segment {
unsafe fn set_value(value: &mut glib::Value, this: &Self) {
gobject_ffi::g_value_set_boxed(value.to_glib_none_mut().0, glib::translate::ToGlibPtr::<*const ffi::GstSegment>::to_glib_none(this).0 as glib_ffi::gpointer)
}
}
#[doc(hidden)]
impl glib::value::SetValueOptional for Segment {
unsafe fn set_value_optional(value: &mut glib::Value, this: Option<&Self>) {
gobject_ffi::g_value_set_boxed(value.to_glib_none_mut().0, glib::translate::ToGlibPtr::<*const ffi::GstSegment>::to_glib_none(&this).0 as glib_ffi::gpointer)
}
}
#[doc(hidden)]
impl glib::translate::Uninitialized for Segment {
unsafe fn uninitialized() -> Self {
mem::zeroed()
}
}
#[doc(hidden)]
impl glib::translate::GlibPtrDefault for Segment {
type GlibType = *mut ffi::GstSegment;
}
#[doc(hidden)]
impl<'a> glib::translate::ToGlibPtr<'a, *const ffi::GstSegment> for Segment {
type Storage = &'a Segment;
fn to_glib_none(&'a self) -> glib::translate::Stash<'a, *const ffi::GstSegment, Self> {
glib::translate::Stash(&self.0, self)
}
fn to_glib_full(&self) -> *const ffi::GstSegment {
unimplemented!()
}
}
#[doc(hidden)]
impl<'a> glib::translate::ToGlibPtrMut<'a, *mut ffi::GstSegment> for Segment {
type Storage = &'a mut Segment;
#[inline]
fn to_glib_none_mut(&'a mut self) -> glib::translate::StashMut<'a, *mut ffi::GstSegment, Self> {
glib::translate::StashMut(&mut self.0, self)
}
}
#[doc(hidden)]
impl glib::translate::FromGlibPtrNone<*mut ffi::GstSegment> for Segment {
#[inline]
unsafe fn from_glib_none(ptr: *mut ffi::GstSegment) -> Self {
Segment(ptr::read(ptr))
}
}
#[doc(hidden)]
impl glib::translate::FromGlibPtrFull<*mut ffi::GstSegment> for Segment {
#[inline]
unsafe fn from_glib_full(ptr: *mut ffi::GstSegment) -> Self {
let segment = from_glib_none(ptr);
glib_ffi::g_free(ptr as *mut _);
segment
}
}