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

fix: BaseURL missing when MPD base path is empty (#1380) 

The check for `!mpd_dir.empty()` is not needed because MakePathRelative
handles the case where the parent path is empty. As a result of this
check the base url, segment url, or segment template URLs were all
missing in cases where the mpd output was in the current working
directory.

Fixes #1378
This commit is contained in:
Cosmin Stejerean 2024-03-27 15:03:10 -04:00 committed by GitHub
parent b7dd8562cf
commit 90c3c3f9b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packager/mpd/base/mpd_builder.cc
View File

@ -417,19 +417,17 @@ void MpdBuilder::MakePathsRelativeToMpd(const std::string& mpd_path,
if (!mpd_file_path.empty()) { if (!mpd_file_path.empty()) {
const std::filesystem::path mpd_dir(mpd_file_path.parent_path()); const std::filesystem::path mpd_dir(mpd_file_path.parent_path());
if (!mpd_dir.empty()) { if (media_info->has_media_file_name()) {
if (media_info->has_media_file_name()) { media_info->set_media_file_url(
media_info->set_media_file_url( MakePathRelative(media_info->media_file_name(), mpd_dir));
MakePathRelative(media_info->media_file_name(), mpd_dir)); }
} if (media_info->has_init_segment_name()) {
if (media_info->has_init_segment_name()) { media_info->set_init_segment_url(
media_info->set_init_segment_url( MakePathRelative(media_info->init_segment_name(), mpd_dir));
MakePathRelative(media_info->init_segment_name(), mpd_dir)); }
} if (media_info->has_segment_template()) {
if (media_info->has_segment_template()) { media_info->set_segment_template_url(
media_info->set_segment_template_url( MakePathRelative(media_info->segment_template(), mpd_dir));
MakePathRelative(media_info->segment_template(), mpd_dir));
}
} }
} }
} }