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

Fix a couple of compiler/clippy warnings with --no-default-features

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1452>
This commit is contained in:
Sebastian Dröge 2024-02-08 13:02:37 +02:00
parent 76b9836e52
commit 92891a61e8
2 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
net/ndi/src/ndi_cc_meta.rs
View file

@ -10,9 +10,12 @@ use data_encoding::BASE64;
use smallvec::SmallVec; use smallvec::SmallVec;
use gst::glib::translate::IntoGlib; use gst::glib::translate::IntoGlib;
use gst_video::{VideoAncillary, VideoAncillaryDID16, VideoVBIEncoder, VideoVBIParser}; #[cfg(feature = "sink")]
use gst_video::VideoVBIEncoder;
use gst_video::{VideoAncillary, VideoAncillaryDID16, VideoVBIParser};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
#[cfg(feature = "sink")]
use std::ffi::CString; use std::ffi::CString;
static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| { static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
@ -29,9 +32,13 @@ const C608_TAG_BYTES: &[u8] = C608_TAG.as_bytes();
const C708_TAG: &str = "C708"; const C708_TAG: &str = "C708";
const C708_TAG_BYTES: &[u8] = C708_TAG.as_bytes(); const C708_TAG_BYTES: &[u8] = C708_TAG.as_bytes();
#[cfg(feature = "sink")]
const LINE_ATTR: &str = "line"; const LINE_ATTR: &str = "line";
#[cfg(feature = "sink")]
const DEFAULT_LINE: u8 = 21; const DEFAULT_LINE: u8 = 21;
#[cfg(feature = "sink")]
const DEFAULT_LINE_STR: &str = "21"; const DEFAULT_LINE_STR: &str = "21";
#[cfg(feature = "sink")]
const DEFAULT_LINE_C708_STR: &str = "10"; const DEFAULT_LINE_C708_STR: &str = "10";
// Video anc AFD content: // Video anc AFD content:
@ -50,6 +57,7 @@ const NDI_CC_CAPACITY: usize = NDI_CC_CONTENT_CAPACITY + 13 + 10;
#[derive(thiserror::Error, Debug, Eq, PartialEq)] #[derive(thiserror::Error, Debug, Eq, PartialEq)]
/// NDI Video Captions related Errors. /// NDI Video Captions related Errors.
pub enum NDICCError { pub enum NDICCError {
#[cfg(feature = "sink")]
#[error("Unsupported closed caption type {cc_type:?}")] #[error("Unsupported closed caption type {cc_type:?}")]
UnsupportedCC { UnsupportedCC {
cc_type: gst_video::VideoCaptionType, cc_type: gst_video::VideoCaptionType,
@ -71,6 +79,7 @@ impl NDICCError {
} }
} }
#[cfg(feature = "sink")]
/// NDI Closed Captions Meta encoder. /// NDI Closed Captions Meta encoder.
pub struct NDICCMetaEncoder { pub struct NDICCMetaEncoder {
v210_encoder: VideoVBIEncoder, v210_encoder: VideoVBIEncoder,
@ -78,6 +87,7 @@ pub struct NDICCMetaEncoder {
line_buf: Vec<u8>, line_buf: Vec<u8>,
} }
#[cfg(feature = "sink")]
impl NDICCMetaEncoder { impl NDICCMetaEncoder {
pub fn new(width: u32) -> Self { pub fn new(width: u32) -> Self {
let v210_encoder = VideoVBIEncoder::try_new(gst_video::VideoFormat::V210, width).unwrap(); let v210_encoder = VideoVBIEncoder::try_new(gst_video::VideoFormat::V210, width).unwrap();
@ -383,8 +393,10 @@ impl NDICCMetaDecoder {
mod tests { mod tests {
use super::*; use super::*;
#[cfg(feature = "sink")]
use gst_video::VideoCaptionType; use gst_video::VideoCaptionType;
#[cfg(feature = "sink")]
#[test] #[test]
fn encode_gst_meta_c608() { fn encode_gst_meta_c608() {
gst::init().unwrap(); gst::init().unwrap();
@ -406,6 +418,7 @@ mod tests {
); );
} }
#[cfg(feature = "sink")]
#[test] #[test]
fn encode_gst_meta_c708() { fn encode_gst_meta_c708() {
gst::init().unwrap(); gst::init().unwrap();
@ -435,6 +448,7 @@ mod tests {
); );
} }
#[cfg(feature = "sink")]
#[test] #[test]
fn encode_gst_meta_c608_and_c708() { fn encode_gst_meta_c608_and_c708() {
gst::init().unwrap(); gst::init().unwrap();
@ -469,6 +483,7 @@ mod tests {
); );
} }
#[cfg(feature = "sink")]
#[test] #[test]
fn encode_gst_meta_unsupported_cc() { fn encode_gst_meta_unsupported_cc() {
gst::init().unwrap(); gst::init().unwrap();
@ -488,6 +503,7 @@ mod tests {
assert!(ndi_cc_encoder.encode(&buf).is_none()); assert!(ndi_cc_encoder.encode(&buf).is_none());
} }
#[cfg(feature = "sink")]
#[test] #[test]
fn encode_gst_meta_none() { fn encode_gst_meta_none() {
gst::init().unwrap(); gst::init().unwrap();

21
utils/fallbackswitch/src/fallbackswitch/imp.rs
View file

@ -984,16 +984,23 @@ impl FallbackSwitch {
// be NONE by now // be NONE by now
let pts = buffer.pts().unwrap(); let pts = buffer.pts().unwrap();
let mut builder = gst::event::Gap::builder(pts) let out_gap_event = {
.duration(buffer.duration())
.seqnum(in_gap_event.seqnum());
#[cfg(feature = "v1_20")] #[cfg(feature = "v1_20")]
{ {
builder = builder.gap_flags(in_gap_event.gap_flags()); gst::event::Gap::builder(pts)
.duration(buffer.duration())
.seqnum(in_gap_event.seqnum())
.gap_flags(in_gap_event.gap_flags())
.build()
} }
#[cfg(not(feature = "v1_20"))]
let out_gap_event = builder.build(); {
gst::event::Gap::builder(pts)
.duration(buffer.duration())
.seqnum(in_gap_event.seqnum())
.build()
}
};
self.with_src_busy(|| { self.with_src_busy(|| {
self.src_pad.push_event(out_gap_event); self.src_pad.push_event(out_gap_event);