Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't Output Empty Text Samples 

Only output text samples to webvtt text output when they have a payload.

Change-Id: I958d2b4f087209f540fa32cef002cd2cef37c65c
This commit is contained in:
Aaron Vaage 2018-04-02 16:20:14 -07:00
parent e1df680392
commit 113a7d123b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packager/app/test/testdata/hls-segmented-webvtt/bear-subtitle-english-text-1.vtt vendored
View File

@ -3,6 +3,3 @@ WEBVTT
00:00:00.000 --> 00:00:00.800 00:00:00.000 --> 00:00:00.800
Yup, that's a bear, eh. Yup, that's a bear, eh.
00:00:00.800 --> 00:00:01.000

8
packager/media/formats/webvtt/webvtt_output_handler.cc
View File

@ -18,6 +18,8 @@ void WebVttOutputHandler::WriteCue(const std::string& id,
uint64_t end_ms, uint64_t end_ms,
const std::string& settings, const std::string& settings,
const std::string& payload) { const std::string& payload) {
DCHECK_GT(payload.size(), 0u);
// Build a block of text that makes up the cue so that we can use a loop to // Build a block of text that makes up the cue so that we can use a loop to
// write all the lines. // write all the lines.
const std::string start = MsToWebVttTimestamp(start_ms); const std::string start = MsToWebVttTimestamp(start_ms);
@ -148,7 +150,11 @@ Status WebVttSegmentedOutputHandler::OnTextSample(const TextSample& sample) {
const std::string& settings = sample.settings(); const std::string& settings = sample.settings();
const std::string& payload = sample.payload(); const std::string& payload = sample.payload();
WriteCue(id, start_ms, end_ms, settings, payload); // Only write cues that have payloads. Cue without payloads won't present
// any information to the user.
if (payload.size()) {
WriteCue(id, start_ms, end_ms, settings, payload);
}
return Status::OK; return Status::OK;
} }