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-05-31 22:58:11 +00:00
Code Issues Projects Releases Wiki Activity

closedcaption: move 708 service writing to shared file

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1398>
This commit is contained in:
Matthew Waters 2023-11-03 15:04:06 +11:00
parent 4333e90220
commit fb9b511e15
4 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
video/closedcaption/src/cea608tocea708/imp.rs
View file

@ -13,8 +13,8 @@ use gst::subclass::prelude::*;
use atomic_refcell::AtomicRefCell; use atomic_refcell::AtomicRefCell;
use crate::cea608tocea708::fmt::Cea708ServiceWriter;
use crate::cea608utils::*; use crate::cea608utils::*;
use crate::cea708utils::Cea708ServiceWriter;
use gst::glib::once_cell::sync::Lazy; use gst::glib::once_cell::sync::Lazy;
@ -545,7 +545,7 @@ pub struct Cea608ToCea708 {
state: AtomicRefCell<State>, state: AtomicRefCell<State>,
} }
pub(crate) static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| { static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
gst::DebugCategory::new( gst::DebugCategory::new(
"cea608tocea708", "cea608tocea708",
gst::DebugColorFlags::empty(), gst::DebugColorFlags::empty(),

1
video/closedcaption/src/cea608tocea708/mod.rs
View file

@ -9,7 +9,6 @@
use gst::glib; use gst::glib;
use gst::prelude::*; use gst::prelude::*;
mod fmt;
mod imp; mod imp;
glib::wrapper! { glib::wrapper! {

32
video/closedcaption/src/cea608tocea708/fmt.rs → video/closedcaption/src/cea708utils.rs
View file

@ -8,6 +8,16 @@
use cea708_types::{tables::*, Service}; use cea708_types::{tables::*, Service};
use gst::glib::once_cell::sync::Lazy;
static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
gst::DebugCategory::new(
"cea708utils",
gst::DebugColorFlags::empty(),
Some("CEA-708 Utilities"),
)
});
#[derive(Debug)] #[derive(Debug)]
pub enum WriteError { pub enum WriteError {
// returns the number of characters/bytes written // returns the number of characters/bytes written
@ -42,7 +52,7 @@ impl Cea708ServiceWriter {
} }
pub fn popon_preamble(&mut self) -> Result<usize, WriteError> { pub fn popon_preamble(&mut self) -> Result<usize, WriteError> {
gst::trace!(super::imp::CAT, "popon_preamble"); gst::trace!(CAT, "popon_preamble");
let window = match self.hidden_window { let window = match self.hidden_window {
// switch up the newly defined window // switch up the newly defined window
WindowBits::ZERO => 0, WindowBits::ZERO => 0,
@ -64,7 +74,7 @@ impl Cea708ServiceWriter {
1, 1,
1, 1,
); );
gst::trace!(super::imp::CAT, "active window {:?}", self.active_window); gst::trace!(CAT, "active window {:?}", self.active_window);
let codes = [ let codes = [
Code::DeleteWindows(!self.active_window), Code::DeleteWindows(!self.active_window),
Code::DefineWindow(args), Code::DefineWindow(args),
@ -73,30 +83,26 @@ impl Cea708ServiceWriter {
} }
pub fn clear_current_window(&mut self) -> Result<usize, WriteError> { pub fn clear_current_window(&mut self) -> Result<usize, WriteError> {
gst::trace!( gst::trace!(CAT, "clear_current_window {:?}", self.active_window);
super::imp::CAT,
"clear_current_window {:?}",
self.active_window
);
self.push_codes(&[Code::ClearWindows(self.active_window)]) self.push_codes(&[Code::ClearWindows(self.active_window)])
} }
pub fn clear_hidden_window(&mut self) -> Result<usize, WriteError> { pub fn clear_hidden_window(&mut self) -> Result<usize, WriteError> {
gst::trace!(super::imp::CAT, "clear_hidden_window"); gst::trace!(CAT, "clear_hidden_window");
self.push_codes(&[Code::ClearWindows(self.hidden_window)]) self.push_codes(&[Code::ClearWindows(self.hidden_window)])
} }
pub fn end_of_caption(&mut self) -> Result<usize, WriteError> { pub fn end_of_caption(&mut self) -> Result<usize, WriteError> {
gst::trace!(super::imp::CAT, "end_of_caption"); gst::trace!(CAT, "end_of_caption");
let ret = let ret =
self.push_codes(&[Code::ToggleWindows(self.active_window | self.hidden_window)])?; self.push_codes(&[Code::ToggleWindows(self.active_window | self.hidden_window)])?;
std::mem::swap(&mut self.active_window, &mut self.hidden_window); std::mem::swap(&mut self.active_window, &mut self.hidden_window);
gst::trace!(super::imp::CAT, "active window {:?}", self.active_window); gst::trace!(CAT, "active window {:?}", self.active_window);
Ok(ret) Ok(ret)
} }
pub fn paint_on_preamble(&mut self) -> Result<usize, WriteError> { pub fn paint_on_preamble(&mut self) -> Result<usize, WriteError> {
gst::trace!(super::imp::CAT, "paint_on_preamble"); gst::trace!(CAT, "paint_on_preamble");
let window = match self.active_window { let window = match self.active_window {
WindowBits::ZERO => 0, WindowBits::ZERO => 0,
WindowBits::ONE => 1, WindowBits::ONE => 1,
@ -126,7 +132,7 @@ impl Cea708ServiceWriter {
let base_row = std::cmp::max(rollup_count, base_row); let base_row = std::cmp::max(rollup_count, base_row);
let anchor_vertical = (base_row as u32 * 100 / 15) as u8; let anchor_vertical = (base_row as u32 * 100 / 15) as u8;
gst::trace!( gst::trace!(
super::imp::CAT, CAT,
"rollup_preamble base {base_row} count {rollup_count}, anchor-v {anchor_vertical}" "rollup_preamble base {base_row} count {rollup_count}, anchor-v {anchor_vertical}"
); );
let codes = [ let codes = [
@ -170,7 +176,7 @@ impl Cea708ServiceWriter {
} }
for code in codes.iter() { for code in codes.iter() {
gst::trace!( gst::trace!(
super::imp::CAT, CAT,
"pushing for service:{} code: {code:?}", "pushing for service:{} code: {code:?}",
service.number() service.number()
); );

1
video/closedcaption/src/lib.rs
View file

@ -30,6 +30,7 @@ mod cea608tocea708;
mod cea608tojson; mod cea608tojson;
mod cea608tott; mod cea608tott;
mod cea608utils; mod cea608utils;
mod cea708utils;
mod jsontovtt; mod jsontovtt;
mod line_reader; mod line_reader;
mod mcc_enc; mod mcc_enc;