Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Zeeshan Ali Khan
gstreamer-rs
Commits
4117c01f
Commit
4117c01f
authored
Feb 22, 2018
by
Sebastian Dröge
🍵
Browse files
Run everything through latest rustfmt-nightly
parent
1fbc5e76
Changes
37
Hide whitespace changes
Inline
Side-by-side
examples/src/bin/appsink.rs
View file @
4117c01f
...
...
@@ -32,7 +32,8 @@ struct ErrorMessage {
src
:
String
,
error
:
String
,
debug
:
Option
<
String
>
,
#[cause]
cause
:
glib
::
Error
,
#[cause]
cause
:
glib
::
Error
,
}
fn
create_pipeline
()
->
Result
<
gst
::
Pipeline
,
Error
>
{
...
...
examples/src/bin/appsrc.rs
View file @
4117c01f
...
...
@@ -28,7 +28,8 @@ struct ErrorMessage {
src
:
String
,
error
:
String
,
debug
:
Option
<
String
>
,
#[cause]
cause
:
glib
::
Error
,
#[cause]
cause
:
glib
::
Error
,
}
const
WIDTH
:
usize
=
320
;
...
...
examples/src/bin/decodebin.rs
View file @
4117c01f
...
...
@@ -28,7 +28,8 @@ struct ErrorMessage {
src
:
String
,
error
:
String
,
debug
:
Option
<
String
>
,
#[cause]
cause
:
glib
::
Error
,
#[cause]
cause
:
glib
::
Error
,
}
fn
example_main
()
->
Result
<
(),
Error
>
{
...
...
examples/src/bin/rtpfecclient.rs
View file @
4117c01f
...
...
@@ -38,7 +38,8 @@ struct ErrorMessage {
src
:
String
,
error
:
String
,
debug
:
Option
<
String
>
,
#[cause]
cause
:
glib
::
Error
,
#[cause]
cause
:
glib
::
Error
,
}
fn
make_element
<
'a
,
P
:
Into
<
Option
<&
'a
str
>>>
(
...
...
@@ -121,16 +122,7 @@ fn example_main() -> Result<(), Error> {
let
scale
=
make_element
(
"videoscale"
,
None
)
?
;
let
filter
=
make_element
(
"capsfilter"
,
None
)
?
;
pipeline
.add_many
(
&
[
&
src
,
&
netsim
,
&
rtpbin
,
&
depay
,
&
dec
,
&
conv
,
&
scale
,
&
filter
,
])
?
;
pipeline
.add_many
(
&
[
&
src
,
&
netsim
,
&
rtpbin
,
&
depay
,
&
dec
,
&
conv
,
&
scale
,
&
filter
])
?
;
gst
::
Element
::
link_many
(
&
[
&
depay
,
&
dec
,
&
conv
,
&
scale
,
&
filter
])
?
;
match
args
[
1
]
.as_str
()
{
...
...
@@ -253,16 +245,14 @@ fn example_main() -> Result<(), Error> {
match
msg
.view
()
{
MessageView
::
Eos
(
..
)
=>
break
,
MessageView
::
Error
(
err
)
=>
{
return
Err
(
ErrorMessage
{
src
:
msg
.get_src
()
.map
(|
s
|
s
.get_path_string
())
.unwrap_or
(
String
::
from
(
"None"
)),
error
:
err
.get_error
()
.description
()
.into
(),
debug
:
err
.get_debug
(),
cause
:
err
.get_error
(),
}
.into
(),
);
return
Err
(
ErrorMessage
{
src
:
msg
.get_src
()
.map
(|
s
|
s
.get_path_string
())
.unwrap_or
(
String
::
from
(
"None"
)),
error
:
err
.get_error
()
.description
()
.into
(),
debug
:
err
.get_debug
(),
cause
:
err
.get_error
(),
}
.into
());
}
MessageView
::
StateChanged
(
s
)
=>
match
msg
.get_src
()
{
Some
(
element
)
=>
if
element
==
pipeline
&&
s
.get_current
()
==
gst
::
State
::
Playing
{
...
...
examples/src/bin/rtpfecserver.rs
View file @
4117c01f
...
...
@@ -35,7 +35,8 @@ struct ErrorMessage {
src
:
String
,
error
:
String
,
debug
:
Option
<
String
>
,
#[cause]
cause
:
glib
::
Error
,
#[cause]
cause
:
glib
::
Error
,
}
fn
make_element
<
'a
,
P
:
Into
<
Option
<&
'a
str
>>>
(
...
...
@@ -183,16 +184,14 @@ fn example_main() -> Result<(), Error> {
match
msg
.view
()
{
MessageView
::
Eos
(
..
)
=>
break
,
MessageView
::
Error
(
err
)
=>
{
return
Err
(
ErrorMessage
{
src
:
msg
.get_src
()
.map
(|
s
|
s
.get_path_string
())
.unwrap_or
(
String
::
from
(
"None"
)),
error
:
err
.get_error
()
.description
()
.into
(),
debug
:
err
.get_debug
(),
cause
:
err
.get_error
(),
}
.into
(),
);
return
Err
(
ErrorMessage
{
src
:
msg
.get_src
()
.map
(|
s
|
s
.get_path_string
())
.unwrap_or
(
String
::
from
(
"None"
)),
error
:
err
.get_error
()
.description
()
.into
(),
debug
:
err
.get_debug
(),
cause
:
err
.get_error
(),
}
.into
());
}
MessageView
::
StateChanged
(
s
)
=>
match
msg
.get_src
()
{
Some
(
element
)
=>
if
element
==
pipeline
&&
s
.get_current
()
==
gst
::
State
::
Playing
{
...
...
examples/src/bin/rtsp-server.rs
View file @
4117c01f
...
...
@@ -50,7 +50,10 @@ fn main_loop() -> Result<(), Error> {
server
.attach
(
None
);
println!
(
"Stream ready at rtsp://127.0.0.1:{}/test"
,
server
.get_bound_port
());
println!
(
"Stream ready at rtsp://127.0.0.1:{}/test"
,
server
.get_bound_port
()
);
main_loop
.run
();
...
...
@@ -62,7 +65,9 @@ fn example_main() -> Result<(), Error> {
#[cfg(not(feature
=
"gst-rtsp-server"
))]
{
eprintln!
(
"Feature gst-rtsp-server is required. Please rebuild with --features gst-rtsp-server"
);
eprintln!
(
"Feature gst-rtsp-server is required. Please rebuild with --features gst-rtsp-server"
);
std
::
process
::
exit
(
-
1
)
}
...
...
examples/src/bin/tagsetter.rs
View file @
4117c01f
...
...
@@ -24,7 +24,8 @@ struct ErrorMessage {
src
:
String
,
error
:
String
,
debug
:
Option
<
String
>
,
#[cause]
cause
:
glib
::
Error
,
#[cause]
cause
:
glib
::
Error
,
}
fn
example_main
()
->
Result
<
(),
Error
>
{
...
...
gstreamer-audio/src/audio_info.rs
View file @
4117c01f
...
...
@@ -298,8 +298,7 @@ impl glib::types::StaticType for AudioInfo {
#[doc(hidden)]
impl
<
'a
>
glib
::
value
::
FromValueOptional
<
'a
>
for
AudioInfo
{
unsafe
fn
from_value_optional
(
value
:
&
glib
::
Value
)
->
Option
<
Self
>
{
Option
::
<
AudioInfo
>
::
from_glib_none
(
gobject_ffi
::
g_value_get_boxed
(
value
.to_glib_none
()
.0
)
as
*
mut
ffi
::
GstAudioInfo
)
Option
::
<
AudioInfo
>
::
from_glib_none
(
gobject_ffi
::
g_value_get_boxed
(
value
.to_glib_none
()
.0
)
as
*
mut
ffi
::
GstAudioInfo
)
}
}
...
...
gstreamer-player/src/config.rs
View file @
4117c01f
...
...
@@ -46,9 +46,7 @@ impl AsMut<gst::StructureRef> for PlayerConfig {
impl
PlayerConfig
{
pub
fn
get_position_update_interval
(
&
self
)
->
u32
{
assert_initialized_main_thread!
();
unsafe
{
ffi
::
gst_player_config_get_position_update_interval
(
self
.0
.to_glib_none
()
.0
)
}
unsafe
{
ffi
::
gst_player_config_get_position_update_interval
(
self
.0
.to_glib_none
()
.0
)
}
}
pub
fn
get_seek_accurate
(
&
self
)
->
bool
{
...
...
gstreamer-rtsp-server/src/lib.rs
View file @
4117c01f
...
...
@@ -10,19 +10,19 @@
extern
crate
bitflags
;
extern
crate
libc
;
extern
crate
gio
;
extern
crate
gio_sys
as
gio_ffi
;
#[macro_use]
extern
crate
glib
;
extern
crate
glib_sys
as
glib_ffi
;
extern
crate
gio
;
extern
crate
gio_sys
as
gio_ffi
;
extern
crate
gobject_sys
as
gobject_ffi
;
extern
crate
gstreamer
as
gst
;
extern
crate
gstreamer_sys
as
gst_ffi
;
extern
crate
gstreamer_rtsp
as
gst_rtsp
;
extern
crate
gstreamer_rtsp_sys
as
gst_rtsp_ffi
;
extern
crate
gstreamer_net
as
gst_net
;
extern
crate
gstreamer_net_sys
as
gst_net_ffi
;
extern
crate
gstreamer_rtsp
as
gst_rtsp
;
extern
crate
gstreamer_rtsp_server_sys
as
ffi
;
extern
crate
gstreamer_rtsp_sys
as
gst_rtsp_ffi
;
extern
crate
gstreamer_sys
as
gst_ffi
;
macro_rules!
assert_initialized_main_thread
{
()
=>
(
...
...
gstreamer-rtsp-server/src/r_t_s_p_address_pool.rs
View file @
4117c01f
...
...
@@ -7,17 +7,36 @@ use glib::translate::*;
use
std
::
ptr
;
pub
trait
RTSPAddressPoolExtManual
{
fn
reserve_address
(
&
self
,
ip_address
:
&
str
,
port
:
u32
,
n_ports
:
u32
,
ttl
:
u32
)
->
Result
<
RTSPAddress
,
RTSPAddressPoolResult
>
;
fn
reserve_address
(
&
self
,
ip_address
:
&
str
,
port
:
u32
,
n_ports
:
u32
,
ttl
:
u32
,
)
->
Result
<
RTSPAddress
,
RTSPAddressPoolResult
>
;
}
impl
<
O
:
IsA
<
RTSPAddressPool
>>
RTSPAddressPoolExtManual
for
O
{
fn
reserve_address
(
&
self
,
ip_address
:
&
str
,
port
:
u32
,
n_ports
:
u32
,
ttl
:
u32
)
->
Result
<
RTSPAddress
,
RTSPAddressPoolResult
>
{
fn
reserve_address
(
&
self
,
ip_address
:
&
str
,
port
:
u32
,
n_ports
:
u32
,
ttl
:
u32
,
)
->
Result
<
RTSPAddress
,
RTSPAddressPoolResult
>
{
unsafe
{
let
mut
address
=
ptr
::
null_mut
();
let
ret
=
from_glib
(
ffi
::
gst_rtsp_address_pool_reserve_address
(
self
.to_glib_none
()
.0
,
ip_address
.to_glib_none
()
.0
,
port
,
n_ports
,
ttl
,
&
mut
address
));
let
ret
=
from_glib
(
ffi
::
gst_rtsp_address_pool_reserve_address
(
self
.to_glib_none
()
.0
,
ip_address
.to_glib_none
()
.0
,
port
,
n_ports
,
ttl
,
&
mut
address
,
));
match
ret
{
RTSPAddressPoolResult
::
Ok
=>
Ok
(
from_glib_full
(
address
)),
_
=>
Err
(
ret
)
_
=>
Err
(
ret
)
,
}
}
}
...
...
gstreamer-rtsp-server/src/r_t_s_p_client.rs
View file @
4117c01f
...
...
@@ -14,7 +14,10 @@ impl<O: IsA<RTSPClient>> RTSPClientExtManual for O {
let
context
=
context
.into
();
let
context
=
context
.to_glib_none
();
unsafe
{
from_glib
(
ffi
::
gst_rtsp_client_attach
(
self
.to_glib_none
()
.0
,
context
.0
))
from_glib
(
ffi
::
gst_rtsp_client_attach
(
self
.to_glib_none
()
.0
,
context
.0
,
))
}
}
}
gstreamer-rtsp-server/src/r_t_s_p_server.rs
View file @
4117c01f
...
...
@@ -14,7 +14,10 @@ impl<O: IsA<RTSPServer>> RTSPServerExtManual for O {
let
context
=
context
.into
();
let
context
=
context
.to_glib_none
();
unsafe
{
from_glib
(
ffi
::
gst_rtsp_server_attach
(
self
.to_glib_none
()
.0
,
context
.0
))
from_glib
(
ffi
::
gst_rtsp_server_attach
(
self
.to_glib_none
()
.0
,
context
.0
,
))
}
}
}
gstreamer-rtsp-server/src/r_t_s_p_session_pool.rs
View file @
4117c01f
...
...
@@ -50,7 +50,7 @@ impl<O: IsA<RTSPSessionPool>> RTSPSessionPoolExtManual for O {
func
:
F
,
)
->
glib
::
Source
where
F
:
FnMut
(
&
RTSPSessionPool
)
->
Continue
+
Send
+
'static
F
:
FnMut
(
&
RTSPSessionPool
)
->
Continue
+
Send
+
'static
,
{
skip_assert_initialized!
();
unsafe
{
...
...
gstreamer-rtsp/src/lib.rs
View file @
4117c01f
...
...
@@ -15,10 +15,10 @@ extern crate glib;
extern
crate
glib_sys
as
glib_ffi
;
extern
crate
gobject_sys
as
gobject_ffi
;
extern
crate
gstreamer
as
gst
;
extern
crate
gstreamer_sys
as
gst_
ffi
;
extern
crate
gstreamer_
rtsp_
sys
as
ffi
;
extern
crate
gstreamer_sdp
as
gst_sdp
;
extern
crate
gstreamer_sdp_sys
as
gst_sdp_ffi
;
extern
crate
gstreamer_
rtsp_
sys
as
ffi
;
extern
crate
gstreamer_sys
as
gst_
ffi
;
macro_rules!
assert_initialized_main_thread
{
()
=>
(
...
...
gstreamer-sdp/src/lib.rs
View file @
4117c01f
...
...
@@ -13,8 +13,8 @@ extern crate glib;
extern
crate
glib_sys
as
glib_ffi
;
extern
crate
gobject_sys
as
gobject_ffi
;
extern
crate
gstreamer
as
gst
;
extern
crate
gstreamer_sys
as
gst_ffi
;
extern
crate
gstreamer_sdp_sys
as
ffi
;
extern
crate
gstreamer_sys
as
gst_ffi
;
macro_rules!
skip_assert_initialized
{
()
=>
(
...
...
gstreamer-video/src/lib.rs
View file @
4117c01f
...
...
@@ -16,8 +16,8 @@ extern crate glib_sys as glib_ffi;
extern
crate
gobject_sys
as
gobject_ffi
;
extern
crate
gstreamer
as
gst
;
extern
crate
gstreamer_base
as
gst_base
;
extern
crate
gstreamer_sys
as
gst_ffi
;
extern
crate
gstreamer_base_sys
as
gst_base_ffi
;
extern
crate
gstreamer_sys
as
gst_ffi
;
extern
crate
gstreamer_video_sys
as
ffi
;
macro_rules!
assert_initialized_main_thread
{
...
...
gstreamer-video/src/video_frame.rs
View file @
4117c01f
...
...
@@ -395,7 +395,10 @@ impl<'a> VideoFrameRef<&'a gst::BufferRef> {
self
.0
.id
}
pub
fn
copy
(
&
self
,
dest
:
&
mut
VideoFrameRef
<&
mut
gst
::
BufferRef
>
)
->
Result
<
(),
glib
::
BoolError
>
{
pub
fn
copy
(
&
self
,
dest
:
&
mut
VideoFrameRef
<&
mut
gst
::
BufferRef
>
,
)
->
Result
<
(),
glib
::
BoolError
>
{
unsafe
{
let
res
:
bool
=
from_glib
(
ffi
::
gst_video_frame_copy
(
&
mut
dest
.0
,
&
self
.0
));
if
res
{
...
...
gstreamer-video/src/video_info.rs
View file @
4117c01f
...
...
@@ -26,7 +26,8 @@ pub enum VideoColorRange {
Unknown
,
Range0255
,
Range16235
,
#[doc(hidden)]
__Unknown
(
i32
),
#[doc(hidden)]
__Unknown
(
i32
),
}
#[doc(hidden)]
...
...
@@ -205,7 +206,8 @@ pub struct VideoInfoBuilder<'a> {
stride
:
Option
<&
'a
[
i32
]
>
,
multiview_mode
:
Option
<
::
VideoMultiviewMode
>
,
multiview_flags
:
Option
<
::
VideoMultiviewFlags
>
,
#[cfg(any(feature
=
"v1_12"
,
feature
=
"dox"
))]
field_order
:
Option
<
::
VideoFieldOrder
>
,
#[cfg(any(feature
=
"v1_12"
,
feature
=
"dox"
))]
field_order
:
Option
<
::
VideoFieldOrder
>
,
}
impl
<
'a
>
VideoInfoBuilder
<
'a
>
{
...
...
@@ -636,8 +638,7 @@ impl glib::types::StaticType for VideoInfo {
#[doc(hidden)]
impl
<
'a
>
glib
::
value
::
FromValueOptional
<
'a
>
for
VideoInfo
{
unsafe
fn
from_value_optional
(
value
:
&
glib
::
Value
)
->
Option
<
Self
>
{
Option
::
<
VideoInfo
>
::
from_glib_none
(
gobject_ffi
::
g_value_get_boxed
(
value
.to_glib_none
()
.0
)
as
*
mut
ffi
::
GstVideoInfo
)
Option
::
<
VideoInfo
>
::
from_glib_none
(
gobject_ffi
::
g_value_get_boxed
(
value
.to_glib_none
()
.0
)
as
*
mut
ffi
::
GstVideoInfo
)
}
}
...
...
gstreamer/src/buffer.rs
View file @
4117c01f
...
...
@@ -157,9 +157,7 @@ impl GstRc<BufferRef> {
pub
fn
append
(
buffer
:
Self
,
other
:
Self
)
->
Self
{
skip_assert_initialized!
();
unsafe
{
from_glib_full
(
ffi
::
gst_buffer_append
(
buffer
.into_ptr
(),
other
.into_ptr
()))
}
unsafe
{
from_glib_full
(
ffi
::
gst_buffer_append
(
buffer
.into_ptr
(),
other
.into_ptr
()))
}
}
}
...
...
@@ -172,9 +170,8 @@ impl Default for GstRc<BufferRef> {
impl
BufferRef
{
pub
fn
map_readable
(
&
self
)
->
Option
<
BufferMap
<
Readable
>>
{
let
mut
map_info
:
ffi
::
GstMapInfo
=
unsafe
{
mem
::
zeroed
()
};
let
res
=
unsafe
{
ffi
::
gst_buffer_map
(
self
.as_mut_ptr
(),
&
mut
map_info
,
ffi
::
GST_MAP_READ
)
};
let
res
=
unsafe
{
ffi
::
gst_buffer_map
(
self
.as_mut_ptr
(),
&
mut
map_info
,
ffi
::
GST_MAP_READ
)
};
if
res
==
glib_ffi
::
GTRUE
{
Some
(
BufferMap
{
buffer
:
self
,
...
...
@@ -385,10 +382,7 @@ impl ToOwned for BufferRef {
type
Owned
=
GstRc
<
BufferRef
>
;
fn
to_owned
(
&
self
)
->
GstRc
<
BufferRef
>
{
unsafe
{
from_glib_full
(
ffi
::
gst_mini_object_copy
(
self
.as_ptr
()
as
*
const
_
)
as
*
mut
_
)
}
unsafe
{
from_glib_full
(
ffi
::
gst_mini_object_copy
(
self
.as_ptr
()
as
*
const
_
)
as
*
mut
_
)
}
}
}
...
...
@@ -440,9 +434,7 @@ impl<'a, T> BufferMap<'a, T> {
impl
<
'a
>
BufferMap
<
'a
,
Writable
>
{
pub
fn
as_mut_slice
(
&
mut
self
)
->
&
mut
[
u8
]
{
unsafe
{
slice
::
from_raw_parts_mut
(
self
.map_info.data
as
*
mut
u8
,
self
.map_info.size
)
}
unsafe
{
slice
::
from_raw_parts_mut
(
self
.map_info.data
as
*
mut
u8
,
self
.map_info.size
)
}
}
}
...
...
@@ -521,9 +513,7 @@ impl<T> MappedBuffer<T> {
impl
MappedBuffer
<
Writable
>
{
pub
fn
as_mut_slice
(
&
mut
self
)
->
&
mut
[
u8
]
{
unsafe
{
slice
::
from_raw_parts_mut
(
self
.map_info.data
as
*
mut
u8
,
self
.map_info.size
)
}
unsafe
{
slice
::
from_raw_parts_mut
(
self
.map_info.data
as
*
mut
u8
,
self
.map_info.size
)
}
}
}
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment