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-29 15:01:07 +00:00
Code Issues Projects Releases Wiki Activity

tttojson: fix row computation

Browse source 
I hadn't really tested the element with pop-on mode, and the row
for each line in the input text was hardcoded to 13, which was
clearly wrong.

Switch to incrementing it properly.
This commit is contained in:
Mathieu Duponchelle 2021-11-13 00:16:51 +01:00 committed by Sebastian Dröge
parent e3fbf2078d
commit b738d5933d
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
video/closedcaption/src/tttojson/imp.rs
View file

@ -22,6 +22,7 @@ use gst::subclass::prelude::*;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use std::cmp::min;
use std::sync::Mutex; use std::sync::Mutex;
use crate::ttutils::{Cea608Mode, Chunk, Line, Lines, TextStyle}; use crate::ttutils::{Cea608Mode, Chunk, Line, Lines, TextStyle};
@ -91,11 +92,13 @@ impl TtToJson {
clear: Some(false), clear: Some(false),
}; };
let mut row = min(15usize.saturating_sub(text.lines().count()), 13usize) as u32;
for phrase in text.lines() { for phrase in text.lines() {
lines.lines.push(Line { lines.lines.push(Line {
carriage_return: Some(true), carriage_return: Some(true),
column: Some(0), column: Some(0),
row: Some(13), row: Some(row),
chunks: vec![Chunk { chunks: vec![Chunk {
// Default CEA 608 styling // Default CEA 608 styling
style: TextStyle::White, style: TextStyle::White,
@ -103,6 +106,8 @@ impl TtToJson {
text: phrase.to_string(), text: phrase.to_string(),
}], }],
}); });
row = min(14u32, row + 1);
} }
let json = serde_json::to_string(&lines).map_err(|err| { let json = serde_json::to_string(&lines).map_err(|err| {