Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: escape media URLs in MPD #1395

Merged
merged 3 commits into from
May 11, 2024
Merged

Conversation

cosmin
Copy link
Contributor

@cosmin cosmin commented May 7, 2024

Currently media_info.media_file_url() is not escaped when placed into MPD for things like BaseURL. This for example breaks when trying to us a file name that contains special characters like &. Since these are supposed to be URLs let's URL encode them.

Fixes #1107

@cosmin cosmin requested a review from joeyparrish May 7, 2024 01:42
@cosmin cosmin added this to the v3.2 milestone May 7, 2024
packager/mpd/base/xml/xml_node.cc Outdated Show resolved Hide resolved
@cosmin cosmin merged commit 98b44d0 into shaka-project:main May 11, 2024
35 checks passed
@cosmin cosmin deleted the url-escape-mpd-urls branch May 11, 2024 00:27
cosmin pushed a commit that referenced this pull request May 12, 2024
🤖 I have created a release *beep* *boop*
---


##
[3.2.0](v3.1.0...v3.2.0)
(2024-05-11)


### Features

* support Dolby Vision profile 8.x (HEVC) and 10.x (AV1) in HLS and DASH
([#1396](#1396))
([a99cfe0](a99cfe0))


### Bug Fixes

* adaptation set IDs were referenced by lowest representation ID
([#1394](#1394))
([94db9c9](94db9c9)),
closes
[#1393](#1393)
* escape media URLs in MPD
([#1395](#1395))
([98b44d0](98b44d0))
* set yuv full range flag to 1 for VP9 with sRGB
([#1398](#1398))
([f6f60e5](f6f60e5))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
@unext-wendong
Copy link

unext-wendong commented Jun 18, 2024

Was it intentional to use URL encode instead of XML encode?

Actually for XML/HTML, only the following 5 characters need to be escaped

> < & ' "

URL encoding does much more than this. Characters like forward slashes are also encoded.

@github-actions github-actions bot added the status: archived Archived and locked; will not be updated label Jul 10, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
status: archived Archived and locked; will not be updated
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Packaging to DASH does not work when output filename contains an ampersand (unterminated entity reference)
3 participants