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

lint

This commit is contained in:
SteveR-PMP 2024-03-15 16:49:13 -07:00
parent 450a936783
commit 5bc2ba4a85
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packager/hls/base/master_playlist.cc
View File

@ -438,7 +438,8 @@ bool PlaylistOrderFn(const MediaPlaylist*& a, const MediaPlaylist*& b) {
} }
bool TagslistOrderFn(const MediaTagslist& a, const MediaTagslist& b) { bool TagslistOrderFn(const MediaTagslist& a, const MediaTagslist& b) {
return a.playlist->GetMediaInfo().index() < b.playlist->GetMediaInfo().index(); return a.playlist->GetMediaInfo().index() <
b.playlist->GetMediaInfo().index();
} }
void AppendPlaylists(const std::string& default_audio_language, void AppendPlaylists(const std::string& default_audio_language,
@ -446,8 +447,7 @@ void AppendPlaylists(const std::string& default_audio_language,
const std::string& base_url, const std::string& base_url,
const std::list<MediaPlaylist*>& playlists, const std::list<MediaPlaylist*>& playlists,
std::string* content) { std::string* content) {
std::map<std::string, std::list<const MediaPlaylist*>> std::map<std::string, std::list<const MediaPlaylist*>> audio_playlist_groups;
audio_playlist_groups;
std::map<std::string, std::list<const MediaPlaylist*>> std::map<std::string, std::list<const MediaPlaylist*>>
subtitle_playlist_groups; subtitle_playlist_groups;
std::list<const MediaPlaylist*> video_playlists; std::list<const MediaPlaylist*> video_playlists;
@ -485,25 +485,27 @@ void AppendPlaylists(const std::string& default_audio_language,
if (!audio_playlist_groups.empty()) { if (!audio_playlist_groups.empty()) {
content->append("\n"); content->append("\n");
std::list<MediaTagslist> audio_playlists = std::list<MediaTagslist> audio_playlists =
BuildMediaTags(audio_playlist_groups, default_audio_language, base_url); BuildMediaTags(audio_playlist_groups, default_audio_language, base_url);
if (has_index) { if (has_index) {
audio_playlists.sort(TagslistOrderFn); audio_playlists.sort(TagslistOrderFn);
} }
for (const auto& pl : audio_playlists) { for (const auto& pl : audio_playlists) {
BuildMediaTag(*pl.playlist, pl.group_id, pl.is_default, pl.is_autoselect, base_url, content); BuildMediaTag(*pl.playlist, pl.group_id, pl.is_default, pl.is_autoselect,
base_url, content);
} }
} }
if (!subtitle_playlist_groups.empty()) { if (!subtitle_playlist_groups.empty()) {
content->append("\n"); content->append("\n");
std::list<MediaTagslist> subtitle_playlists = std::list<MediaTagslist> subtitle_playlists = BuildMediaTags(
BuildMediaTags(subtitle_playlist_groups, default_text_language, base_url); subtitle_playlist_groups, default_text_language, base_url);
if (has_index) { if (has_index) {
subtitle_playlists.sort(TagslistOrderFn); subtitle_playlists.sort(TagslistOrderFn);
} }
for (const auto& pl : subtitle_playlists) { for (const auto& pl : subtitle_playlists) {
BuildMediaTag(*pl.playlist, pl.group_id, pl.is_default, pl.is_autoselect, base_url, content); BuildMediaTag(*pl.playlist, pl.group_id, pl.is_default, pl.is_autoselect,
base_url, content);
} }
} }

3
packager/media/formats/mp2t/es_parser_teletext.cc
View File

@ -278,7 +278,8 @@ bool EsParserTeletext::ParseDataBlock(const int64_t pts,
} }
void EsParserTeletext::UpdateCharset() { void EsParserTeletext::UpdateCharset() {
memcpy(current_charset_, TELETEXT_CHARSET_G0_LATIN, sizeof(TELETEXT_CHARSET_G0_LATIN)); memcpy(current_charset_, TELETEXT_CHARSET_G0_LATIN,
sizeof(TELETEXT_CHARSET_G0_LATIN));
if (charset_code_ > 7) { if (charset_code_ > 7) {
return; return;
} }