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-06-09 17:59:23 +00:00
Code Issues Projects Releases Wiki Activity

scc_enc: Don't assert if we're trying to write a line without anything buffered

Browse source 
This can happen at EOS if everything was fully written out before
already, for example.
This commit is contained in:
Sebastian Dröge 2019-02-12 14:35:22 +02:00
parent aebbe8c39b
commit 09d7555653
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst-plugin-closedcaption/src/scc_enc.rs
View file

@ -117,13 +117,15 @@ impl State {
// flush the previous line into the buffer, and push
// the new packet to the, now empty, internal buffer
if Some(&timecode) != self.expected_timecode.as_ref() {
let res = self.write_line(element);
let outbuf = self.write_line(element)?;
assert!(self.internal_buffer.is_empty());
self.internal_buffer.push(buffer);
timecode.increment_frame();
self.expected_timecode = Some(timecode);
return res;
return Ok(outbuf);
} else if let Some(ref mut timecode) = self.expected_timecode {
timecode.increment_frame();
}
@ -145,7 +147,9 @@ impl State {
let mut outbuf = Vec::new();
let mut line_start = true;
assert!(!self.internal_buffer.is_empty());
if self.internal_buffer.is_empty() {
return Ok(None);
}
if self.need_headers {
self.generate_headers(&mut outbuf);
@ -311,8 +315,8 @@ impl SccEnc {
gst_error!(CAT, obj: pad, "Failed to push buffer to the pad");
return false;
}
} else {
gst_error!(CAT, obj: pad, "Failed to write a line after EOS");
} else if let Err(err) = outbuf {
gst_error!(CAT, obj: pad, "Failed to write a line after EOS: {:?}", err);
return false;
}
pad.event_default(element, event)