diff --git a/video/closedcaption/src/tttocea608/imp.rs b/video/closedcaption/src/tttocea608/imp.rs index 469f1d63..18a8d293 100644 --- a/video/closedcaption/src/tttocea608/imp.rs +++ b/video/closedcaption/src/tttocea608/imp.rs @@ -15,25 +15,13 @@ use gst::glib::once_cell::sync::Lazy; use crate::ffi; use std::sync::Mutex; -use crate::cea608utils::{Cea608Mode, TextStyle}; +use crate::cea608utils::{is_basicna, is_specialna, is_westeu, Cea608Mode, TextStyle}; use crate::ttutils::{Chunk, Line, Lines}; fn is_punctuation(word: &str) -> bool { word == "." || word == "," || word == "?" || word == "!" || word == ";" || word == ":" } -fn is_basicna(cc_data: u16) -> bool { - 0x0000 != (0x6000 & cc_data) -} - -fn is_westeu(cc_data: u16) -> bool { - 0x1220 == (0x7660 & cc_data) -} - -fn is_specialna(cc_data: u16) -> bool { - 0x1130 == (0x7770 & cc_data) -} - #[allow(clippy::trivially_copy_pass_by_ref)] fn eia608_from_utf8_1(c: &[u8; 5]) -> u16 { assert!(c[4] == 0);