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

Add better detection for text streams. 

Change-Id: I7f44026c223b868cd73f52bf700e29372bb9461e
This commit is contained in:
Jacob Trimble 2020-12-15 11:11:32 -08:00
parent c4ea028d11
commit 025e10de69
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packager/packager.cc
View File

@ -184,6 +184,19 @@ MediaContainerName GetTextOutputCodec(const StreamDescriptor& descriptor) {
} }
} }
bool IsTextStream(const StreamDescriptor& stream) {
if (stream.stream_selector == "text")
return true;
if (base::EqualsCaseInsensitiveASCII(stream.output_format, "vtt+mp4") ||
base::EqualsCaseInsensitiveASCII(stream.output_format, "webvtt+mp4") ||
base::EqualsCaseInsensitiveASCII(stream.output_format, "ttml+mp4")) {
return true;
}
auto output_format = GetOutputFormat(stream);
return output_format == CONTAINER_WEBVTT || output_format == CONTAINER_TTML;
}
Status ValidateStreamDescriptor(bool dump_stream_info, Status ValidateStreamDescriptor(bool dump_stream_info,
const StreamDescriptor& stream) { const StreamDescriptor& stream) {
if (stream.input.empty()) { if (stream.input.empty()) {
@ -616,8 +629,7 @@ Status CreateAudioVideoJobs(
const bool new_input_file = stream.input != previous_input; const bool new_input_file = stream.input != previous_input;
const bool new_stream = const bool new_stream =
new_input_file || previous_selector != stream.stream_selector; new_input_file || previous_selector != stream.stream_selector;
// TODO(modmaker): Use a better detector of text streams. const bool is_text = IsTextStream(stream);
const bool is_text = stream.stream_selector == "text";
previous_input = stream.input; previous_input = stream.input;
previous_selector = stream.stream_selector; previous_selector = stream.stream_selector;