diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 589d569113..7550687d73 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -123,7 +123,7 @@ jobs: - name: Setup gclient shell: bash run: | - gclient config https://github.com/google/shaka-packager.git --name=src --unmanaged + gclient config https://github.com/shaka-project/shaka-packager.git --name=src --unmanaged # NOTE: the docker tests will do gclient runhooks, so skip hooks here. gclient sync --nohooks diff --git a/.github/workflows/custom-actions/build-packager/action.yaml b/.github/workflows/custom-actions/build-packager/action.yaml index f39ca248cd..6c20a74344 100644 --- a/.github/workflows/custom-actions/build-packager/action.yaml +++ b/.github/workflows/custom-actions/build-packager/action.yaml @@ -86,7 +86,7 @@ runs: shell: bash run: | echo "::group::Configure gclient" - gclient config https://github.com/google/shaka-packager.git --name=src --unmanaged + gclient config https://github.com/shaka-project/shaka-packager.git --name=src --unmanaged echo "::endgroup::" - name: Sync gclient diff --git a/.github/workflows/github_release.yaml b/.github/workflows/github_release.yaml index 976ac13a78..05faa4267e 100644 --- a/.github/workflows/github_release.yaml +++ b/.github/workflows/github_release.yaml @@ -206,7 +206,7 @@ jobs: - name: Setup gclient shell: bash run: | - gclient config https://github.com/google/shaka-packager.git --name=src --unmanaged + gclient config https://github.com/shaka-project/shaka-packager.git --name=src --unmanaged # NOTE: the docker tests will do gclient runhooks, so skip hooks here. gclient sync --nohooks diff --git a/CHANGELOG.md b/CHANGELOG.md index e68d0c10e0..7af92af1d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -615,32 +615,32 @@ First public release. - Added mpd_generator driver program to generate mpd file from packager generated intermediate files. -[2.6.1]: https://github.com/google/shaka-packager/compare/v2.6.0...v2.6.1 -[2.6.0]: https://github.com/google/shaka-packager/compare/v2.5.1...v2.6.0 -[2.5.1]: https://github.com/google/shaka-packager/compare/v2.5.0...v2.5.1 -[2.5.0]: https://github.com/google/shaka-packager/compare/v2.4.3...v2.5.0 -[2.4.3]: https://github.com/google/shaka-packager/compare/v2.4.2...v2.4.3 -[2.4.2]: https://github.com/google/shaka-packager/compare/v2.4.1...v2.4.2 -[2.4.1]: https://github.com/google/shaka-packager/compare/v2.4.0...v2.4.1 -[2.4.0]: https://github.com/google/shaka-packager/compare/v2.3.0...v2.4.0 -[2.3.0]: https://github.com/google/shaka-packager/compare/v2.2.1...v2.3.0 -[2.2.1]: https://github.com/google/shaka-packager/compare/v2.2.0...v2.2.1 -[2.2.0]: https://github.com/google/shaka-packager/compare/v2.1.1...v2.2.0 -[2.1.1]: https://github.com/google/shaka-packager/compare/v2.1.0...v2.1.1 -[2.1.0]: https://github.com/google/shaka-packager/compare/v2.0.3...v2.1.0 -[2.0.3]: https://github.com/google/shaka-packager/compare/v2.0.2...v2.0.3 -[2.0.2]: https://github.com/google/shaka-packager/compare/v2.0.1...v2.0.2 -[2.0.1]: https://github.com/google/shaka-packager/compare/v2.0.0...v2.0.1 -[2.0.0]: https://github.com/google/shaka-packager/compare/v1.6.2...v2.0.0 -[1.6.2]: https://github.com/google/shaka-packager/compare/v1.6.1...v1.6.2 -[1.6.1]: https://github.com/google/shaka-packager/compare/v1.6.0...v1.6.1 -[1.6.0]: https://github.com/google/shaka-packager/compare/v1.5.1...v1.6.0 -[1.5.1]: https://github.com/google/shaka-packager/compare/v1.5.0...v1.5.1 -[1.5.0]: https://github.com/google/shaka-packager/compare/v1.4.0...v1.5.0 -[1.4.1]: https://github.com/google/shaka-packager/compare/v1.4.0...v1.4.1 -[1.4.0]: https://github.com/google/shaka-packager/compare/v1.3.1...v1.4.0 -[1.3.1]: https://github.com/google/shaka-packager/compare/v1.3.0...v1.3.1 -[1.3.0]: https://github.com/google/shaka-packager/compare/v1.2.0...v1.3.0 -[1.2.1]: https://github.com/google/shaka-packager/compare/v1.2.0...v1.2.1 -[1.2.0]: https://github.com/google/shaka-packager/compare/v1.1...v1.2.0 -[1.1.0]: https://github.com/google/shaka-packager/compare/v1.0...v1.1 +[2.6.1]: https://github.com/shaka-project/shaka-packager/compare/v2.6.0...v2.6.1 +[2.6.0]: https://github.com/shaka-project/shaka-packager/compare/v2.5.1...v2.6.0 +[2.5.1]: https://github.com/shaka-project/shaka-packager/compare/v2.5.0...v2.5.1 +[2.5.0]: https://github.com/shaka-project/shaka-packager/compare/v2.4.3...v2.5.0 +[2.4.3]: https://github.com/shaka-project/shaka-packager/compare/v2.4.2...v2.4.3 +[2.4.2]: https://github.com/shaka-project/shaka-packager/compare/v2.4.1...v2.4.2 +[2.4.1]: https://github.com/shaka-project/shaka-packager/compare/v2.4.0...v2.4.1 +[2.4.0]: https://github.com/shaka-project/shaka-packager/compare/v2.3.0...v2.4.0 +[2.3.0]: https://github.com/shaka-project/shaka-packager/compare/v2.2.1...v2.3.0 +[2.2.1]: https://github.com/shaka-project/shaka-packager/compare/v2.2.0...v2.2.1 +[2.2.0]: https://github.com/shaka-project/shaka-packager/compare/v2.1.1...v2.2.0 +[2.1.1]: https://github.com/shaka-project/shaka-packager/compare/v2.1.0...v2.1.1 +[2.1.0]: https://github.com/shaka-project/shaka-packager/compare/v2.0.3...v2.1.0 +[2.0.3]: https://github.com/shaka-project/shaka-packager/compare/v2.0.2...v2.0.3 +[2.0.2]: https://github.com/shaka-project/shaka-packager/compare/v2.0.1...v2.0.2 +[2.0.1]: https://github.com/shaka-project/shaka-packager/compare/v2.0.0...v2.0.1 +[2.0.0]: https://github.com/shaka-project/shaka-packager/compare/v1.6.2...v2.0.0 +[1.6.2]: https://github.com/shaka-project/shaka-packager/compare/v1.6.1...v1.6.2 +[1.6.1]: https://github.com/shaka-project/shaka-packager/compare/v1.6.0...v1.6.1 +[1.6.0]: https://github.com/shaka-project/shaka-packager/compare/v1.5.1...v1.6.0 +[1.5.1]: https://github.com/shaka-project/shaka-packager/compare/v1.5.0...v1.5.1 +[1.5.0]: https://github.com/shaka-project/shaka-packager/compare/v1.4.0...v1.5.0 +[1.4.1]: https://github.com/shaka-project/shaka-packager/compare/v1.4.0...v1.4.1 +[1.4.0]: https://github.com/shaka-project/shaka-packager/compare/v1.3.1...v1.4.0 +[1.3.1]: https://github.com/shaka-project/shaka-packager/compare/v1.3.0...v1.3.1 +[1.3.0]: https://github.com/shaka-project/shaka-packager/compare/v1.2.0...v1.3.0 +[1.2.1]: https://github.com/shaka-project/shaka-packager/compare/v1.2.0...v1.2.1 +[1.2.0]: https://github.com/shaka-project/shaka-packager/compare/v1.1...v1.2.0 +[1.1.0]: https://github.com/shaka-project/shaka-packager/compare/v1.0...v1.1 diff --git a/Dockerfile b/Dockerfile index 75a4a0d8da..59be6b0e5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ ENV VPYTHON_BYPASS="manually managed python not supported by chrome operations" # Build shaka-packager from the current directory, rather than what has been # merged. WORKDIR shaka_packager -RUN gclient config https://github.com/google/shaka-packager.git --name=src --unmanaged +RUN gclient config https://github.com/shaka-project/shaka-packager.git --name=src --unmanaged COPY . src RUN gclient sync --force RUN ninja -C src/out/Release diff --git a/README.md b/README.md index 2ebf3e4c36..ae10c923c5 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,10 @@ [comment]: # (These links in cloned repositories will point back to the main ) [comment]: # (repository and if it is an issue, we suggest updating the links ) [comment]: # (in the cloned repository. ) -[comment]: # (See https://github.com/google/shaka-packager/issues/408 for the ) +[comment]: # (See https://github.com/shaka-project/shaka-packager/issues/408 for the ) [comment]: # (full background. ) -![Shaka Packager](https://raw.githubusercontent.com/google/shaka-packager/master/docs/shaka-packager.png) - -[![Build Status](https://travis-ci.org/google/shaka-packager.svg?branch=master)](https://travis-ci.org/google/shaka-packager) -[![Build status](https://ci.appveyor.com/api/projects/status/3t8iu603rp25sa74?svg=true)](https://ci.appveyor.com/project/shaka/shaka-packager) +![Shaka Packager](https://raw.githubusercontent.com/shaka-project/shaka-packager/main/docs/shaka-packager.png) Shaka Packager is a tool and a media packaging SDK for [DASH](http://dashif.org/) and [HLS](https://developer.apple.com/streaming/) @@ -68,9 +65,9 @@ Shaka Packager supports: - ⁴: TTML input is only supported with TTML output (pass-through, DASH only), see also [#584][]. -[#272]: https://github.com/google/shaka-packager/issues/272 -[#405]: https://github.com/google/shaka-packager/issues/405 -[#584]: https://github.com/google/shaka-packager/issues/584 +[#272]: https://github.com/shaka-project/shaka-packager/issues/272 +[#405]: https://github.com/shaka-project/shaka-packager/issues/405 +[#584]: https://github.com/shaka-project/shaka-packager/issues/584 - Platforms - Linux @@ -86,21 +83,21 @@ There are several ways you can get Shaka Packager. - Using [Docker](https://www.docker.com/whatisdocker). Instructions are available - [here](https://github.com/google/shaka-packager/blob/master/docs/source/docker_instructions.md). + [here](https://github.com/shaka-project/shaka-packager/blob/main/docs/source/docker_instructions.md). - Get prebuilt binaries from - [release](https://github.com/google/shaka-packager/releases). + [release](https://github.com/shaka-project/shaka-packager/releases). - Built from source, see - [Build Instructions](https://github.com/google/shaka-packager/blob/master/docs/source/build_instructions.md) + [Build Instructions](https://github.com/shaka-project/shaka-packager/blob/main/docs/source/build_instructions.md) for details. # Useful Links - [Announcement List](https://groups.google.com/forum/#!forum/shaka-packager-users) (join for release announcements and surveys) -- [Documentation](https://google.github.io/shaka-packager/html/) -- [Tutorials](https://google.github.io/shaka-packager/html/tutorials/tutorials.html) +- [Documentation](https://shaka-project.github.io/shaka-packager/html/) +- [Tutorials](https://shaka-project.github.io/shaka-packager/html/tutorials/tutorials.html) - Several open source players: - - [DASH and HLS on Web: Shaka Player](https://github.com/google/shaka-player) + - [DASH and HLS on Web: Shaka Player](https://github.com/shaka-project/shaka-player) - [DASH on Web: dash.js](https://github.com/Dash-Industry-Forum/dash.js) - [HLS on Web: hls.js](https://github.com/video-dev/hls.js) - [DASH and HLS on Android: ExoPlayer](https://github.com/google/ExoPlayer) @@ -108,5 +105,5 @@ There are several ways you can get Shaka Packager. # Contributing If you have improvements or fixes, we would love to have your contributions. -See https://github.com/google/shaka-packager/blob/master/CONTRIBUTING.md for +See https://github.com/shaka-project/shaka-packager/blob/main/CONTRIBUTING.md for details. diff --git a/docs/source/build_instructions.md b/docs/source/build_instructions.md index cca855113a..340a668a05 100644 --- a/docs/source/build_instructions.md +++ b/docs/source/build_instructions.md @@ -31,7 +31,7 @@ Note that `Git` must be v1.7.5 or above. * Note that there is a known problem with 10.15 SDK or later right now. You can workaround it by using 10.14 SDK. See - [#660](https://github.com/google/shaka-packager/issues/660#issuecomment-552576341) + [#660](https://github.com/shaka-project/shaka-packager/issues/660#issuecomment-552576341) for details. ## Windows system requirements @@ -121,7 +121,7 @@ Run the `gclient` tool from `depot_tools` to check out the code and its dependencies. ```shell -gclient config https://www.github.com/google/shaka-packager.git --name=src --unmanaged +gclient config https://github.com/shaka-project/shaka-packager.git --name=src --unmanaged gclient sync ``` @@ -195,7 +195,7 @@ After a successful build, you can find build artifacts including the main `packager` binary in build output directory (`out/Release` or `out/Release_x64` for release build). -See [Shaka Packager Documentation](https://google.github.io/shaka-packager/html/) +See [Shaka Packager Documentation](https://shaka-project.github.io/shaka-packager/html/) on how to use `Shaka Packager`. ### Update your checkout @@ -203,12 +203,12 @@ on how to use `Shaka Packager`. To update an existing checkout, you can run ```shell -git pull origin master --rebase +git pull origin main --rebase gclient sync ``` The first command updates the primary Packager source repository and rebases on -top of tip-of-tree (aka the Git branch `origin/master`). You can also use other +top of tip-of-tree (aka the Git branch `origin/main`). You can also use other common Git commands to update the repo. The second command syncs dependencies to the appropriate versions and re-runs @@ -366,7 +366,7 @@ GYP_GENERATORS=msvs_test gclient runhooks ## Contributing If you have improvements or fixes, we would love to have your contributions. -See https://github.com/google/shaka-packager/blob/master/CONTRIBUTING.md for +See https://github.com/shaka-project/shaka-packager/blob/main/CONTRIBUTING.md for details. We have continue integration tests setup on pull requests. You can also verify diff --git a/docs/source/documentation.rst b/docs/source/documentation.rst index a0d06b8ffa..7af6c9de84 100644 --- a/docs/source/documentation.rst +++ b/docs/source/documentation.rst @@ -26,7 +26,7 @@ There are several ways you can get Shaka Packager. - Using `Docker `_. Instructions are available at :doc:`docker_instructions`. - Get prebuilt binaries from - `release `_. + `release `_. - Built from source, see :doc:`build_instructions` for details. Synopsis diff --git a/docs/source/index.rst b/docs/source/index.rst index f2cdb5f20e..098590870e 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -6,7 +6,7 @@ Welcome to Shaka Packager's documentation! ========================================== -source code repository: https://github.com/google/shaka-packager +source code repository: https://github.com/shaka-project/shaka-packager .. toctree:: :maxdepth: 2 diff --git a/docs/source/library.rst b/docs/source/library.rst index f9d1598d97..2f40a6ecd4 100644 --- a/docs/source/library.rst +++ b/docs/source/library.rst @@ -2,7 +2,7 @@ Shaka Packager Library ====================== Documentation for the top level Shaka packager library. See -`Internal API `_ +`Internal API `_ for documentation on internal APIs. .. doxygenclass:: shaka::Packager diff --git a/docs/source/options/hls_options.rst b/docs/source/options/hls_options.rst index 8ec27f368d..c03e39e751 100644 --- a/docs/source/options/hls_options.rst +++ b/docs/source/options/hls_options.rst @@ -71,7 +71,7 @@ HLS options number from previous packager run. For more information about the reasoning of this, please see issue - `#691 `_. + `#691 `_. The EXT-X-MEDIA-SEQUENCE documentation can be read here: https://tools.ietf.org/html/rfc8216#section-4.3.3.2. diff --git a/docs/source/options/segment_template_formatting.rst b/docs/source/options/segment_template_formatting.rst index 0f05c2efb1..5915260010 100644 --- a/docs/source/options/segment_template_formatting.rst +++ b/docs/source/options/segment_template_formatting.rst @@ -30,7 +30,7 @@ described in ISO/IEC 23009-1:2014. Identifiers $RepresentationID$ and $Bandwidth$ are not supported in this version. Please file an `issue - `_ if you want it to be + `_ if you want it to be supported. In each URL, the identifiers shall be replaced by the substitution parameter diff --git a/docs/source/tutorials/http_upload.rst b/docs/source/tutorials/http_upload.rst index 0061b35db7..e770326a6e 100644 --- a/docs/source/tutorials/http_upload.rst +++ b/docs/source/tutorials/http_upload.rst @@ -9,7 +9,7 @@ contributions are always welcome. The discussion about this feature currently happens at - `Add HTTP PUT output #149 `_. + `Add HTTP PUT output #149 `_. ########### HTTP upload diff --git a/docs/source/tutorials/low_latency.rst b/docs/source/tutorials/low_latency.rst index 2380ae12b4..12d60d4aa2 100644 --- a/docs/source/tutorials/low_latency.rst +++ b/docs/source/tutorials/low_latency.rst @@ -98,6 +98,6 @@ The player should also recognize the the throughput estimation and ABR challenge Examples of supporting players: -* `Shaka Player `_ +* `Shaka Player `_ * `dash.js `_ -* `Streamline Low Latency DASH preview `_ \ No newline at end of file +* `Streamline Low Latency DASH preview `_ diff --git a/docs/source/tutorials/raw_key.rst b/docs/source/tutorials/raw_key.rst index fd3e015b5e..5bd8c7992e 100644 --- a/docs/source/tutorials/raw_key.rst +++ b/docs/source/tutorials/raw_key.rst @@ -131,7 +131,7 @@ Test vectors used in this tutorial :Widevine PSSH: The PSSH 00000031707373... is generated using - `pssh-box script `_:: + `pssh-box script `_:: $ pssh-box.py --widevine-system-id \ --content-id 7465737420636f6e74656e74206964 --hex @@ -146,4 +146,4 @@ Configuration options pssh-box (Utility to generate PSSH boxes) ----------------------------------------- -https://github.com/google/shaka-packager/tree/master/packager/tools/pssh +https://github.com/shaka-project/shaka-packager/tree/main/packager/tools/pssh diff --git a/npm/package.json b/npm/package.json index b8a90332b6..15711fc160 100644 --- a/npm/package.json +++ b/npm/package.json @@ -2,7 +2,7 @@ "name": "", "description": "A media packaging tool and SDK.", "version": "", - "homepage": "https://github.com/google/shaka-packager", + "homepage": "https://github.com/shaka-project/shaka-packager", "author": "Google", "maintainers": [ { @@ -13,10 +13,10 @@ "main": "index.js", "repository": { "type": "git", - "url": "https://github.com/google/shaka-packager.git" + "url": "https://github.com/shaka-project/shaka-packager.git" }, "bugs": { - "url": "https://github.com/google/shaka-packager/issues" + "url": "https://github.com/shaka-project/shaka-packager/issues" }, "license": "See LICENSE", "scripts": { diff --git a/npm/prepublish.js b/npm/prepublish.js index fdafc5fff0..dc758e4be0 100755 --- a/npm/prepublish.js +++ b/npm/prepublish.js @@ -19,7 +19,7 @@ console.log('Preparing Shaka Packager v' + package.version); // Calculate the repo name. In GitHub Actions context, this will pull binaries // correctly from a fork. When run by hand, it will default to the official // repo. -var repo = process.env.GITHUB_REPOSITORY || 'google/shaka-packager'; +var repo = process.env.GITHUB_REPOSITORY || 'shaka-project/shaka-packager'; // For fetching binaries from GitHub: var urlBase = 'https://github.com/' + repo + '/releases/download/v' + diff --git a/packager/app/mpd_flags.cc b/packager/app/mpd_flags.cc index 50c2b9eead..bf441471fd 100644 --- a/packager/app/mpd_flags.cc +++ b/packager/app/mpd_flags.cc @@ -81,5 +81,7 @@ DEFINE_bool( "If enabled, LL-DASH streaming will be used, " "reducing overall latency by decoupling latency from segment duration. " "Please see " - "https://google.github.io/shaka-packager/html/tutorials/low_latency.html " + // clang-format off + "https://shaka-project.github.io/shaka-packager/html/tutorials/low_latency.html " + // clang-format on "for more information."); diff --git a/packager/app/test/testdata/acc-he/bear-640x360-aac_he-silent_right-audio.mp4 b/packager/app/test/testdata/acc-he/bear-640x360-aac_he-silent_right-audio.mp4 index 863fff41ee..df5e5cdd93 100644 Binary files a/packager/app/test/testdata/acc-he/bear-640x360-aac_he-silent_right-audio.mp4 and b/packager/app/test/testdata/acc-he/bear-640x360-aac_he-silent_right-audio.mp4 differ diff --git a/packager/app/test/testdata/acc-he/output.mpd b/packager/app/test/testdata/acc-he/output.mpd index 9da35fae0d..47df48cf4d 100644 --- a/packager/app/test/testdata/acc-he/output.mpd +++ b/packager/app/test/testdata/acc-he/output.mpd @@ -1,13 +1,13 @@ - + bear-640x360-aac_he-silent_right-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-audio.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-audio.mp4 and b/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-video.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/output.mpd b/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/output.mpd index 958ec27b1d..ab3a50484d 100644 --- a/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/output.mpd +++ b/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/output.mpd @@ -1,12 +1,12 @@ - + bear-640x360-video.mp4 - - + + @@ -16,8 +16,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video-trick_play_factor_1.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video-trick_play_factor_1.mp4 index 4dcea28bd0..d0fefe1640 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video-trick_play_factor_1.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video-trick_play_factor_1.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video.mp4 index aca7e1cfd5..93af41a0e7 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-audio.mp4 index 6a196f333d..4d8e733e07 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-audio.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-hevc-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-hevc-video.mp4 index eb98dd0f7f..51cc01616f 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-hevc-video.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-hevc-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-video.mp4 index 506a9d66ee..dd872a0330 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/output.mpd b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/output.mpd index e9c2a74c72..05a57e7092 100644 --- a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/output.mpd +++ b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/output.mpd @@ -1,5 +1,5 @@ - + @@ -11,14 +11,14 @@ bear-1280x720-video.mp4 - - + + bear-640x360-video.mp4 - - + + @@ -30,8 +30,8 @@ bear-1280x720-video-trick_play_factor_1.mp4 - - + + @@ -44,8 +44,8 @@ bear-640x360-hevc-video.mp4 - - + + @@ -57,8 +57,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-codec-switching/bear-1280x720-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching/bear-1280x720-video.mp4 index d7a8e3d411..eb0e007054 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching/bear-1280x720-video.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching/bear-1280x720-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-audio.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-audio.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-hevc-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-hevc-video.mp4 index 77a649e6ad..9efb29c9f2 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-hevc-video.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-hevc-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-video.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching/output.mpd b/packager/app/test/testdata/audio-video-with-codec-switching/output.mpd index f399d13106..2b04331b47 100644 --- a/packager/app/test/testdata/audio-video-with-codec-switching/output.mpd +++ b/packager/app/test/testdata/audio-video-with-codec-switching/output.mpd @@ -1,5 +1,5 @@ - + @@ -7,14 +7,14 @@ bear-1280x720-video.mp4 - - + + bear-640x360-video.mp4 - - + + @@ -23,8 +23,8 @@ bear-640x360-hevc-video.mp4 - - + + @@ -32,8 +32,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.m3u8 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.m3u8 index 4e60022727..7789ba4de7 100644 --- a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.m3u8 @@ -1,11 +1,11 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="797@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="804@0" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@865 +#EXT-X-BYTERANGE:17028@872 bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16285 diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.mp4 index fff6904d27..c0d2fd9ac3 100644 Binary files a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.mp4 and b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video-iframe.m3u8 index 909ce88747..8f4f16e028 100644 --- a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video-iframe.m3u8 @@ -1,17 +1,17 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="870@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@931 +#EXT-X-BYTERANGE:15581@938 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@100244 +#EXT-X-BYTERANGE:18221@100251 bear-640x360-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@222051 +#EXT-X-BYTERANGE:19663@222058 bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.m3u8 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.m3u8 index 4e8bdb5f7f..302a169a10 100644 --- a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.m3u8 @@ -1,11 +1,11 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="870@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@931 +#EXT-X-BYTERANGE:99313@938 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.m3u8 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.m3u8 index 9fa5f81fe5..4019bde7a0 100644 --- a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.mpd b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.mpd index f43fd6be8f..84354aa26a 100644 --- a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.mpd +++ b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.mpd @@ -1,12 +1,12 @@ - + bear-640x360-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.m3u8 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.m3u8 index 4e60022727..7789ba4de7 100644 --- a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.m3u8 @@ -1,11 +1,11 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="797@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="804@0" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@865 +#EXT-X-BYTERANGE:17028@872 bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16285 diff --git a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.mp4 index fff6904d27..c0d2fd9ac3 100644 Binary files a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.mp4 and b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video-iframe.m3u8 index 909ce88747..8f4f16e028 100644 --- a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video-iframe.m3u8 @@ -1,17 +1,17 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="870@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@931 +#EXT-X-BYTERANGE:15581@938 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@100244 +#EXT-X-BYTERANGE:18221@100251 bear-640x360-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@222051 +#EXT-X-BYTERANGE:19663@222058 bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.m3u8 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.m3u8 index 4e8bdb5f7f..302a169a10 100644 --- a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.m3u8 @@ -1,11 +1,11 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="870@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@931 +#EXT-X-BYTERANGE:99313@938 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-language-override/output.m3u8 b/packager/app/test/testdata/audio-video-with-language-override/output.m3u8 index e1334254ae..8873a8df53 100644 --- a/packager/app/test/testdata/audio-video-with-language-override/output.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/audio-video-with-language-override/output.mpd b/packager/app/test/testdata/audio-video-with-language-override/output.mpd index 7bbc836fb5..e32fae08d6 100644 --- a/packager/app/test/testdata/audio-video-with-language-override/output.mpd +++ b/packager/app/test/testdata/audio-video-with-language-override/output.mpd @@ -1,12 +1,12 @@ - + bear-640x360-video.mp4 - - + + @@ -15,8 +15,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-audio.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-audio.mp4 and b/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video-trick_play_factor_1.mp4 b/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video-trick_play_factor_1.mp4 index 1d11aed2c8..1559c58bc6 100644 Binary files a/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video-trick_play_factor_1.mp4 and b/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video-trick_play_factor_1.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-trick-play/output.mpd b/packager/app/test/testdata/audio-video-with-trick-play/output.mpd index 2a39ee37ae..1c4090e785 100644 --- a/packager/app/test/testdata/audio-video-with-trick-play/output.mpd +++ b/packager/app/test/testdata/audio-video-with-trick-play/output.mpd @@ -1,12 +1,12 @@ - + bear-640x360-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + @@ -23,8 +23,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-audio.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-audio.mp4 and b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video-trick_play_factor_1.mp4 b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video-trick_play_factor_1.mp4 index 1d11aed2c8..1559c58bc6 100644 Binary files a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video-trick_play_factor_1.mp4 and b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video-trick_play_factor_1.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video-trick_play_factor_2.mp4 b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video-trick_play_factor_2.mp4 index bb9cd19492..c2fb4d9cfa 100644 Binary files a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video-trick_play_factor_2.mp4 and b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video-trick_play_factor_2.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd b/packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd index cd17866f43..1a1f6e252a 100644 --- a/packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd +++ b/packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd @@ -1,12 +1,12 @@ - + bear-640x360-video.mp4 - - + + @@ -14,14 +14,14 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + bear-640x360-video-trick_play_factor_2.mp4 - - + + @@ -29,8 +29,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video/bear-640x360-audio.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/audio-video/bear-640x360-audio.mp4 and b/packager/app/test/testdata/audio-video/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/audio-video/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video/bear-640x360-video.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/audio-video/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video/output.mpd b/packager/app/test/testdata/audio-video/output.mpd index 06db2544ae..f2a0118302 100644 --- a/packager/app/test/testdata/audio-video/output.mpd +++ b/packager/app/test/testdata/audio-video/output.mpd @@ -1,12 +1,12 @@ - + bear-640x360-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/av1-mp4-to-webm/bear-av1-video.webm b/packager/app/test/testdata/av1-mp4-to-webm/bear-av1-video.webm index a945902fb0..516d346448 100644 Binary files a/packager/app/test/testdata/av1-mp4-to-webm/bear-av1-video.webm and b/packager/app/test/testdata/av1-mp4-to-webm/bear-av1-video.webm differ diff --git a/packager/app/test/testdata/av1-mp4-to-webm/output.m3u8 b/packager/app/test/testdata/av1-mp4-to-webm/output.m3u8 index cee0e8a7be..dcb2e93242 100644 --- a/packager/app/test/testdata/av1-mp4-to-webm/output.m3u8 +++ b/packager/app/test/testdata/av1-mp4-to-webm/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/av1-mp4-to-webm/output.mpd b/packager/app/test/testdata/av1-mp4-to-webm/output.mpd index 85644a0f2c..ac1a512117 100644 --- a/packager/app/test/testdata/av1-mp4-to-webm/output.mpd +++ b/packager/app/test/testdata/av1-mp4-to-webm/output.mpd @@ -1,12 +1,12 @@ - + bear-av1-video.webm - - + + diff --git a/packager/app/test/testdata/av1-mp4-to-webm/stream_0.m3u8 b/packager/app/test/testdata/av1-mp4-to-webm/stream_0.m3u8 index 75a85d62a7..41bd3beaae 100644 --- a/packager/app/test/testdata/av1-mp4-to-webm/stream_0.m3u8 +++ b/packager/app/test/testdata/av1-mp4-to-webm/stream_0.m3u8 @@ -1,10 +1,10 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-av1-video.webm",BYTERANGE="314@0" +#EXT-X-MAP:URI="bear-av1-video.webm",BYTERANGE="321@0" #EXTINF:2.736, -#EXT-X-BYTERANGE:23653@333 +#EXT-X-BYTERANGE:23653@340 bear-av1-video.webm #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/av1-mp4-with-encryption/bear-av1-video.mp4 b/packager/app/test/testdata/av1-mp4-with-encryption/bear-av1-video.mp4 index 4c0f523b85..0f57af5fab 100644 Binary files a/packager/app/test/testdata/av1-mp4-with-encryption/bear-av1-video.mp4 and b/packager/app/test/testdata/av1-mp4-with-encryption/bear-av1-video.mp4 differ diff --git a/packager/app/test/testdata/av1-mp4-with-encryption/decrypted-bear-av1-video-0.mp4 b/packager/app/test/testdata/av1-mp4-with-encryption/decrypted-bear-av1-video-0.mp4 index 8b4a89fbe4..4e4ad2ba90 100644 Binary files a/packager/app/test/testdata/av1-mp4-with-encryption/decrypted-bear-av1-video-0.mp4 and b/packager/app/test/testdata/av1-mp4-with-encryption/decrypted-bear-av1-video-0.mp4 differ diff --git a/packager/app/test/testdata/av1-mp4-with-encryption/output.m3u8 b/packager/app/test/testdata/av1-mp4-with-encryption/output.m3u8 index fad79d4cc6..5758056206 100644 --- a/packager/app/test/testdata/av1-mp4-with-encryption/output.m3u8 +++ b/packager/app/test/testdata/av1-mp4-with-encryption/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/av1-mp4-with-encryption/output.mpd b/packager/app/test/testdata/av1-mp4-with-encryption/output.mpd index 3ee349b51c..1645e8b8f7 100644 --- a/packager/app/test/testdata/av1-mp4-with-encryption/output.mpd +++ b/packager/app/test/testdata/av1-mp4-with-encryption/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-av1-video.mp4 - - + + diff --git a/packager/app/test/testdata/av1-mp4-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/av1-mp4-with-encryption/stream_0.m3u8 index 5e6e140d8a..ad6e1f4578 100644 --- a/packager/app/test/testdata/av1-mp4-with-encryption/stream_0.m3u8 +++ b/packager/app/test/testdata/av1-mp4-with-encryption/stream_0.m3u8 @@ -1,10 +1,10 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="1045@0" +#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="1052@0" #EXTINF:2.736, -#EXT-X-BYTERANGE:23864@1089 +#EXT-X-BYTERANGE:23864@1096 bear-av1-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/av1-mp4/bear-av1-video.mp4 b/packager/app/test/testdata/av1-mp4/bear-av1-video.mp4 index 8b4a89fbe4..4e4ad2ba90 100644 Binary files a/packager/app/test/testdata/av1-mp4/bear-av1-video.mp4 and b/packager/app/test/testdata/av1-mp4/bear-av1-video.mp4 differ diff --git a/packager/app/test/testdata/av1-mp4/output.m3u8 b/packager/app/test/testdata/av1-mp4/output.m3u8 index fad79d4cc6..5758056206 100644 --- a/packager/app/test/testdata/av1-mp4/output.m3u8 +++ b/packager/app/test/testdata/av1-mp4/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/av1-mp4/output.mpd b/packager/app/test/testdata/av1-mp4/output.mpd index 87e0a3e155..4dae182162 100644 --- a/packager/app/test/testdata/av1-mp4/output.mpd +++ b/packager/app/test/testdata/av1-mp4/output.mpd @@ -1,12 +1,12 @@ - + bear-av1-video.mp4 - - + + diff --git a/packager/app/test/testdata/av1-mp4/stream_0.m3u8 b/packager/app/test/testdata/av1-mp4/stream_0.m3u8 index d148632a19..dd4b894719 100644 --- a/packager/app/test/testdata/av1-mp4/stream_0.m3u8 +++ b/packager/app/test/testdata/av1-mp4/stream_0.m3u8 @@ -1,10 +1,10 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="802@0" +#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="809@0" #EXTINF:2.736, -#EXT-X-BYTERANGE:23864@846 +#EXT-X-BYTERANGE:23864@853 bear-av1-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/av1-webm-with-encryption/bear-av1-video.webm b/packager/app/test/testdata/av1-webm-with-encryption/bear-av1-video.webm index 670eb6c143..71de3b4da3 100644 Binary files a/packager/app/test/testdata/av1-webm-with-encryption/bear-av1-video.webm and b/packager/app/test/testdata/av1-webm-with-encryption/bear-av1-video.webm differ diff --git a/packager/app/test/testdata/av1-webm-with-encryption/decrypted-bear-av1-video-0.webm b/packager/app/test/testdata/av1-webm-with-encryption/decrypted-bear-av1-video-0.webm index c4bdeb58c1..f03d3d08ef 100644 Binary files a/packager/app/test/testdata/av1-webm-with-encryption/decrypted-bear-av1-video-0.webm and b/packager/app/test/testdata/av1-webm-with-encryption/decrypted-bear-av1-video-0.webm differ diff --git a/packager/app/test/testdata/av1-webm-with-encryption/output.m3u8 b/packager/app/test/testdata/av1-webm-with-encryption/output.m3u8 index 35126b3407..887dc09c23 100644 --- a/packager/app/test/testdata/av1-webm-with-encryption/output.m3u8 +++ b/packager/app/test/testdata/av1-webm-with-encryption/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/av1-webm-with-encryption/output.mpd b/packager/app/test/testdata/av1-webm-with-encryption/output.mpd index 7293bb07c4..55e9281e08 100644 --- a/packager/app/test/testdata/av1-webm-with-encryption/output.mpd +++ b/packager/app/test/testdata/av1-webm-with-encryption/output.mpd @@ -1,5 +1,5 @@ - + @@ -8,8 +8,8 @@ bear-av1-video.webm - - + + diff --git a/packager/app/test/testdata/av1-webm-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/av1-webm-with-encryption/stream_0.m3u8 index 4e96051ceb..3f9e59f0ce 100644 --- a/packager/app/test/testdata/av1-webm-with-encryption/stream_0.m3u8 +++ b/packager/app/test/testdata/av1-webm-with-encryption/stream_0.m3u8 @@ -1,10 +1,10 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-av1-video.webm",BYTERANGE="358@0" +#EXT-X-MAP:URI="bear-av1-video.webm",BYTERANGE="365@0" #EXTINF:2.735, -#EXT-X-BYTERANGE:23735@377 +#EXT-X-BYTERANGE:23735@384 bear-av1-video.webm #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/av1-webm/bear-av1-video.mp4 b/packager/app/test/testdata/av1-webm/bear-av1-video.mp4 index 668913c9c1..c671249c5c 100644 Binary files a/packager/app/test/testdata/av1-webm/bear-av1-video.mp4 and b/packager/app/test/testdata/av1-webm/bear-av1-video.mp4 differ diff --git a/packager/app/test/testdata/av1-webm/output.m3u8 b/packager/app/test/testdata/av1-webm/output.m3u8 index 01c9989181..cac8bea042 100644 --- a/packager/app/test/testdata/av1-webm/output.m3u8 +++ b/packager/app/test/testdata/av1-webm/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/av1-webm/output.mpd b/packager/app/test/testdata/av1-webm/output.mpd index f1b4a0396b..d1fbb07374 100644 --- a/packager/app/test/testdata/av1-webm/output.mpd +++ b/packager/app/test/testdata/av1-webm/output.mpd @@ -1,12 +1,12 @@ - + bear-av1-video.mp4 - - + + diff --git a/packager/app/test/testdata/av1-webm/stream_0.m3u8 b/packager/app/test/testdata/av1-webm/stream_0.m3u8 index 056a78d067..a4833c1990 100644 --- a/packager/app/test/testdata/av1-webm/stream_0.m3u8 +++ b/packager/app/test/testdata/av1-webm/stream_0.m3u8 @@ -1,10 +1,10 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="802@0" +#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="809@0" #EXTINF:2.735, -#EXT-X-BYTERANGE:24188@846 +#EXT-X-BYTERANGE:24188@853 bear-av1-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-aac-ts-language/bear-640x360-audio.m3u8 b/packager/app/test/testdata/avc-aac-ts-language/bear-640x360-audio.m3u8 index 0b1621db75..42742a3070 100644 --- a/packager/app/test/testdata/avc-aac-ts-language/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/avc-aac-ts-language/bear-640x360-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:0.975, diff --git a/packager/app/test/testdata/avc-aac-ts-language/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/avc-aac-ts-language/bear-640x360-video-iframe.m3u8 index 3631df8dd3..40bf49049b 100644 --- a/packager/app/test/testdata/avc-aac-ts-language/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/avc-aac-ts-language/bear-640x360-video-iframe.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY diff --git a/packager/app/test/testdata/avc-aac-ts-language/bear-640x360-video.m3u8 b/packager/app/test/testdata/avc-aac-ts-language/bear-640x360-video.m3u8 index 51a3eafba0..4ca1aa1207 100644 --- a/packager/app/test/testdata/avc-aac-ts-language/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/avc-aac-ts-language/bear-640x360-video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.001, diff --git a/packager/app/test/testdata/avc-aac-ts-language/output.m3u8 b/packager/app/test/testdata/avc-aac-ts-language/output.m3u8 index 8e9e9c86b7..fa0e0e1dce 100644 --- a/packager/app/test/testdata/avc-aac-ts-language/output.m3u8 +++ b/packager/app/test/testdata/avc-aac-ts-language/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",LANGUAGE="pt",NAME="stream_0",DEFAULT=YES,AUTOSELECT=YES,CHANNELS="2" diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio.m3u8 b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio.m3u8 index 0b1621db75..42742a3070 100644 --- a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:0.975, diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-iframe.m3u8 index 3631df8dd3..40bf49049b 100644 --- a/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-iframe.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-video.m3u8 b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video.m3u8 index 51a3eafba0..4ca1aa1207 100644 --- a/packager/app/test/testdata/avc-aac-ts/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.001, diff --git a/packager/app/test/testdata/avc-aac-ts/output.m3u8 b/packager/app/test/testdata/avc-aac-ts/output.m3u8 index 2d28a0efdc..9345f1c4c1 100644 --- a/packager/app/test/testdata/avc-aac-ts/output.m3u8 +++ b/packager/app/test/testdata/avc-aac-ts/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/avc-aac-ts/output.mpd b/packager/app/test/testdata/avc-aac-ts/output.mpd index be4aca3840..268efb85f1 100644 --- a/packager/app/test/testdata/avc-aac-ts/output.mpd +++ b/packager/app/test/testdata/avc-aac-ts/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.m3u8 index 1d2ea45c1d..ccdaae26cf 100644 --- a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.m3u8 @@ -1,11 +1,11 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-ac3-audio.mp4",BYTERANGE="730@0" +#EXT-X-MAP:URI="bear-640x360-ac3-audio.mp4",BYTERANGE="737@0" #EXTINF:0.975, -#EXT-X-BYTERANGE:23728@798 +#EXT-X-BYTERANGE:23728@805 bear-640x360-ac3-audio.mp4 #EXTINF:1.010, #EXT-X-BYTERANGE:24574 diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 index 34679eab6d..f872c6979d 100644 Binary files a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 and b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 differ diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video-iframe.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video-iframe.m3u8 index 41d333f8f4..e0afbfeeaf 100644 --- a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video-iframe.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video-iframe.m3u8 @@ -1,17 +1,17 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="867@0" +#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="874@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@935 +#EXT-X-BYTERANGE:15581@942 bear-640x360-ac3-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@100248 +#EXT-X-BYTERANGE:18221@100255 bear-640x360-ac3-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@222055 +#EXT-X-BYTERANGE:19663@222062 bear-640x360-ac3-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.m3u8 index 03f8e904c4..dc52123784 100644 --- a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.m3u8 @@ -1,11 +1,11 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="867@0" +#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="874@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@935 +#EXT-X-BYTERANGE:99313@942 bear-640x360-ac3-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.mp4 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.mp4 index d96c841815..e6512e3038 100644 Binary files a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.mp4 and b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.mp4 differ diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/output.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/output.m3u8 index 2b198eaa3e..5d0edce3c9 100644 --- a/packager/app/test/testdata/avc-ac3-ts-to-mp4/output.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-to-mp4/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio.m3u8 b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio.m3u8 index 7f573a25c4..fe5a5bebee 100644 --- a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:0.975, diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-iframe.m3u8 b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-iframe.m3u8 index 13e431e839..00cf994284 100644 --- a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-iframe.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-iframe.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video.m3u8 b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video.m3u8 index 9c07bb27ba..d32a04d202 100644 --- a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.001, diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/output.m3u8 b/packager/app/test/testdata/avc-ac3-ts-with-encryption/output.m3u8 index 25e925819b..4ef87deb79 100644 --- a/packager/app/test/testdata/avc-ac3-ts-with-encryption/output.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-with-encryption/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio.m3u8 b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio.m3u8 index b5dd344068..44f8411852 100644 --- a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:0.975, diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-iframe.m3u8 b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-iframe.m3u8 index d835f0ec2b..4858dcd244 100644 --- a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-iframe.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-iframe.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video.m3u8 b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video.m3u8 index 452dd22367..4b6459b430 100644 --- a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.001, diff --git a/packager/app/test/testdata/avc-ac3-ts/output.m3u8 b/packager/app/test/testdata/avc-ac3-ts/output.m3u8 index 25e925819b..4ef87deb79 100644 --- a/packager/app/test/testdata/avc-ac3-ts/output.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-audio.m3u8 b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-audio.m3u8 index 945e049cfa..8e1a5fcaa1 100644 --- a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:0.975, diff --git a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-iframe.m3u8 index b42972a650..339bdbd00f 100644 --- a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-iframe.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY diff --git a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video.m3u8 b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video.m3u8 index 2c0fa89542..00beef4817 100644 --- a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.001, diff --git a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/output.m3u8 b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/output.m3u8 index 7d38bb4cf7..484c3b0d79 100644 --- a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/output.m3u8 +++ b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-audio.m3u8 b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-audio.m3u8 index 1a87fcd62a..020a8686d4 100644 --- a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-audio.m3u8 +++ b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:0.975, diff --git a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-iframe.m3u8 b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-iframe.m3u8 index 13e431e839..00cf994284 100644 --- a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-iframe.m3u8 +++ b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-iframe.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY diff --git a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video.m3u8 b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video.m3u8 index 9c07bb27ba..d32a04d202 100644 --- a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video.m3u8 +++ b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.001, diff --git a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/output.m3u8 b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/output.m3u8 index ad2c4aa942..0f3a8f7bbb 100644 --- a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/output.m3u8 +++ b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/avc-ts-dash-dynamic-with-segment-deletion/output.mpd b/packager/app/test/testdata/avc-ts-dash-dynamic-with-segment-deletion/output.mpd index 2d335c1f64..3a3a3f2194 100644 --- a/packager/app/test/testdata/avc-ts-dash-dynamic-with-segment-deletion/output.mpd +++ b/packager/app/test/testdata/avc-ts-dash-dynamic-with-segment-deletion/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio.m3u8 b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio.m3u8 index c02d72e102..780b6a87d7 100644 --- a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:EVENT #EXTINF:0.975, diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-iframe.m3u8 index c4e42ac0dd..e32376e7bf 100644 --- a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-iframe.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:EVENT #EXT-X-I-FRAMES-ONLY diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video.m3u8 b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video.m3u8 index bab23cb800..cf1bfdab47 100644 --- a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:EVENT #EXTINF:1.001, diff --git a/packager/app/test/testdata/avc-ts-event-playlist/output.m3u8 b/packager/app/test/testdata/avc-ts-event-playlist/output.m3u8 index 2d28a0efdc..9345f1c4c1 100644 --- a/packager/app/test/testdata/avc-ts-event-playlist/output.m3u8 +++ b/packager/app/test/testdata/avc-ts-event-playlist/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-init.mp4 index e187b71434..9d84d7b899 100644 Binary files a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio.m3u8 index eb4795a7d7..a70615244f 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:1 #EXT-X-MEDIA-SEQUENCE:3 #EXT-X-MAP:URI="bear-640x360-audio-init.mp4" diff --git a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.m3u8 index a89de60397..e5678b089f 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.mpd b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.mpd index ed0ce2a00b..6a17a94f21 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.mpd +++ b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio.m3u8 index 1f64386d2d..1d0b0cc851 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-MEDIA-SEQUENCE:1 #EXT-X-DISCONTINUITY-SEQUENCE:1 diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-iframe.m3u8 index 4ac7ff79c6..95b05a0e5e 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-iframe.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-MEDIA-SEQUENCE:1 #EXT-X-DISCONTINUITY-SEQUENCE:1 diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video.m3u8 index 9bd3611d1b..403dee1696 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-MEDIA-SEQUENCE:1 #EXT-X-DISCONTINUITY-SEQUENCE:1 diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output.m3u8 index 2d28a0efdc..9345f1c4c1 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-segment-deletion/bear-640x360-audio.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-with-segment-deletion/bear-640x360-audio.m3u8 index eb4795a7d7..a70615244f 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist-with-segment-deletion/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist-with-segment-deletion/bear-640x360-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:1 #EXT-X-MEDIA-SEQUENCE:3 #EXT-X-MAP:URI="bear-640x360-audio-init.mp4" diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-segment-deletion/output.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-with-segment-deletion/output.m3u8 index 070810b3cc..6761ed1464 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist-with-segment-deletion/output.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist-with-segment-deletion/output.m3u8 @@ -1,4 +1,4 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2" diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio.m3u8 index c9ee5d92d4..8f26ce1c8d 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-MEDIA-SEQUENCE:1 #EXTINF:0.998, diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-iframe.m3u8 index b6e5aadaf3..425e35da8a 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-iframe.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-MEDIA-SEQUENCE:1 #EXT-X-I-FRAMES-ONLY diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video.m3u8 index b705e1c01c..c4b525d154 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-MEDIA-SEQUENCE:1 #EXTINF:1.001, diff --git a/packager/app/test/testdata/avc-ts-live-playlist/output.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist/output.m3u8 index 2d28a0efdc..9345f1c4c1 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist/output.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio.m3u8 index 44f7315d7c..66066a3796 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:0.975, diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-iframe.m3u8 index 39d7af87eb..7676f4585c 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-iframe.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video.m3u8 index 2918a57460..3e62ff7ab3 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.001, diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output.m3u8 index 2d28a0efdc..9345f1c4c1 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output.m3u8 index 966632c026..c399e2cd8a 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-iframe.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-iframe.m3u8 index 1faf9001fe..051b041eba 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-iframe.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-iframe.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video.m3u8 index 005069d849..2b7d14b379 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.000, diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio.m3u8 index a06dae9e2d..dbdb10d123 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:0.975, diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-iframe.m3u8 index b42972a650..339bdbd00f 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-iframe.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video.m3u8 index 2c0fa89542..00beef4817 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.001, diff --git a/packager/app/test/testdata/avc-ts-with-encryption/output.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption/output.m3u8 index 2d28a0efdc..9345f1c4c1 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption/output.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.m3u8 b/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.m3u8 index 4e60022727..7789ba4de7 100644 --- a/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.m3u8 @@ -1,11 +1,11 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="797@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="804@0" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@865 +#EXT-X-BYTERANGE:17028@872 bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16285 diff --git a/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.mp4 b/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.mp4 and b/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/bandwidth-override/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/bandwidth-override/bear-640x360-video-iframe.m3u8 index 909ce88747..8f4f16e028 100644 --- a/packager/app/test/testdata/bandwidth-override/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/bandwidth-override/bear-640x360-video-iframe.m3u8 @@ -1,17 +1,17 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="870@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@931 +#EXT-X-BYTERANGE:15581@938 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@100244 +#EXT-X-BYTERANGE:18221@100251 bear-640x360-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@222051 +#EXT-X-BYTERANGE:19663@222058 bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/bandwidth-override/bear-640x360-video.m3u8 b/packager/app/test/testdata/bandwidth-override/bear-640x360-video.m3u8 index 4e8bdb5f7f..302a169a10 100644 --- a/packager/app/test/testdata/bandwidth-override/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/bandwidth-override/bear-640x360-video.m3u8 @@ -1,11 +1,11 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="870@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@931 +#EXT-X-BYTERANGE:99313@938 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/bandwidth-override/bear-640x360-video.mp4 b/packager/app/test/testdata/bandwidth-override/bear-640x360-video.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/bandwidth-override/bear-640x360-video.mp4 and b/packager/app/test/testdata/bandwidth-override/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/bandwidth-override/output.m3u8 b/packager/app/test/testdata/bandwidth-override/output.m3u8 index c0b2f69a1f..077ed885ed 100644 --- a/packager/app/test/testdata/bandwidth-override/output.m3u8 +++ b/packager/app/test/testdata/bandwidth-override/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/bandwidth-override/output.mpd b/packager/app/test/testdata/bandwidth-override/output.mpd index 395a7bb785..1bdaf75b54 100644 --- a/packager/app/test/testdata/bandwidth-override/output.mpd +++ b/packager/app/test/testdata/bandwidth-override/output.mpd @@ -1,12 +1,12 @@ - + bear-640x360-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd index 5fbc0ace45..2003c00239 100644 --- a/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/dash-with-bandwidth-override/output.mpd b/packager/app/test/testdata/dash-with-bandwidth-override/output.mpd index 17eef65808..db3c0e3d32 100644 --- a/packager/app/test/testdata/dash-with-bandwidth-override/output.mpd +++ b/packager/app/test/testdata/dash-with-bandwidth-override/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.m3u8 b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.m3u8 index b409f55b46..2f82e6c436 100644 --- a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.m3u8 +++ b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd index 378a7e7f05..ff9e4854aa 100644 --- a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd +++ b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ sparks_dovi_5-video.mp4 - - + + diff --git a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/sparks_dovi_5-video.mp4 b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/sparks_dovi_5-video.mp4 index 6d41a95a68..e9cec02667 100644 Binary files a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/sparks_dovi_5-video.mp4 and b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/sparks_dovi_5-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/stream_0.m3u8 index d0721b487e..bb712552eb 100644 --- a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/stream_0.m3u8 +++ b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/stream_0.m3u8 @@ -1,12 +1,12 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="sparks_dovi_5-video.mp4",BYTERANGE="1359@0" +#EXT-X-MAP:URI="sparks_dovi_5-video.mp4",BYTERANGE="1366@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:2.002, -#EXT-X-BYTERANGE:185521@1439 +#EXT-X-BYTERANGE:185521@1446 sparks_dovi_5-video.mp4 #EXTINF:2.002, #EXT-X-BYTERANGE:197565 diff --git a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.m3u8 b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.m3u8 index 06e926e09f..904a3c0341 100644 --- a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.m3u8 +++ b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.mpd b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.mpd index 6b80ab5e99..9f3adeabd8 100644 --- a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.mpd +++ b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ sparks_dovi_8-video.mp4 - - + + @@ -21,8 +21,8 @@ sparks_dovi_8-video.mp4 - - + + diff --git a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/sparks_dovi_8-video.mp4 b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/sparks_dovi_8-video.mp4 index 3d195949a2..f1cf2372be 100644 Binary files a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/sparks_dovi_8-video.mp4 and b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/sparks_dovi_8-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/stream_0.m3u8 index bd6fd0465e..7adec71977 100644 --- a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/stream_0.m3u8 +++ b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/stream_0.m3u8 @@ -1,12 +1,12 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="sparks_dovi_8-video.mp4",BYTERANGE="1359@0" +#EXT-X-MAP:URI="sparks_dovi_8-video.mp4",BYTERANGE="1366@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:2.002, -#EXT-X-BYTERANGE:172013@1439 +#EXT-X-BYTERANGE:172013@1446 sparks_dovi_8-video.mp4 #EXTINF:2.002, #EXT-X-BYTERANGE:189474 diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.m3u8 index a5933ef15e..c07fa870da 100644 --- a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.m3u8 +++ b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.m3u8 @@ -1,12 +1,12 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-ec3-audio.mp4",BYTERANGE="949@0" +#EXT-X-MAP:URI="bear-640x360-ec3-audio.mp4",BYTERANGE="956@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.004, -#EXT-X-BYTERANGE:24460@1017 +#EXT-X-BYTERANGE:24460@1024 bear-640x360-ec3-audio.mp4 #EXTINF:1.010, #EXT-X-BYTERANGE:24747 diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.mp4 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.mp4 index 1a90fee88b..5288ad5575 100644 Binary files a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.mp4 and b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.mp4 differ diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video-iframe.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video-iframe.m3u8 index aad4039d74..6d63c1f264 100644 --- a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video-iframe.m3u8 +++ b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video-iframe.m3u8 @@ -1,18 +1,18 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1131@0" +#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1138@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:15665@1199 +#EXT-X-BYTERANGE:15665@1206 bear-640x360-ec3-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18754@95004 +#EXT-X-BYTERANGE:18754@95011 bear-640x360-ec3-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:20068@217344 +#EXT-X-BYTERANGE:20068@217351 bear-640x360-ec3-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.m3u8 index 8996c60cb2..ae39f91313 100644 --- a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.m3u8 +++ b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.m3u8 @@ -1,12 +1,12 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1131@0" +#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1138@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:93805@1199 +#EXT-X-BYTERANGE:93805@1206 bear-640x360-ec3-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.mp4 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.mp4 index e8d6c342da..10de789394 100644 Binary files a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.mp4 and b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.mp4 differ diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8 index f728c15d40..568dae01b1 100644 --- a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8 +++ b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-audio.m3u8 b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-audio.m3u8 index 511099a6cc..24222bbd76 100644 --- a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-audio.m3u8 +++ b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.010, diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-iframe.m3u8 b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-iframe.m3u8 index 8e17f3d41b..0d89c8fcda 100644 --- a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-iframe.m3u8 +++ b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-iframe.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video.m3u8 b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video.m3u8 index 41cd010295..41666e6b76 100644 --- a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video.m3u8 +++ b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.001, diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/output.m3u8 b/packager/app/test/testdata/ec3-packed-audio-encrypted/output.m3u8 index 20b89a7ee2..130c27c23e 100644 --- a/packager/app/test/testdata/ec3-packed-audio-encrypted/output.m3u8 +++ b/packager/app/test/testdata/ec3-packed-audio-encrypted/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-audio.mp4 index 80dde0beea..560941350f 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video-trick_play_factor_1.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video-trick_play_factor_1.mp4 index 702b955b01..935b374b47 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video-trick_play_factor_1.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video-trick_play_factor_1.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video.mp4 index 506a9d66ee..dd872a0330 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/output.mpd b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/output.mpd index bab2e5ac5f..fee260794e 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/output.mpd +++ b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/output.mpd @@ -1,5 +1,5 @@ - + @@ -10,8 +10,8 @@ bear-640x360-audio.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-video.mp4 - - + + @@ -35,8 +35,8 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + @@ -50,8 +50,8 @@ bear-640x360-audio.mp4 - - + + @@ -62,8 +62,8 @@ bear-640x360-video.mp4 - - + + @@ -75,8 +75,8 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio.m3u8 index cc27914413..5fd32b875b 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio.m3u8 @@ -1,12 +1,12 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio1.mp4",BYTERANGE="1007@0" +#EXT-X-MAP:URI="bear-640x360-audio1.mp4",BYTERANGE="1014@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@1063 +#EXT-X-BYTERANGE:17028@1070 bear-640x360-audio1.mp4 #EXTINF:0.975, #EXT-X-BYTERANGE:16269 @@ -14,6 +14,6 @@ bear-640x360-audio1.mp4 #EXT-X-PLACEMENT-OPPORTUNITY #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:0.743, -#EXT-X-BYTERANGE:10272@1051 +#EXT-X-BYTERANGE:10272@1058 bear-640x360-audio2.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio1.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio1.mp4 index 0af2d95343..26dfdab8df 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio1.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio1.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio2.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio2.mp4 index 66ef12945d..ab3c8a3039 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio2.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio2.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video-iframe.m3u8 index 85cd30bce6..4d2a4dc361 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video-iframe.m3u8 @@ -1,20 +1,20 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1131@0" +#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1138@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@1187 +#EXT-X-BYTERANGE:15581@1194 bear-640x360-video1.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18754@100500 +#EXT-X-BYTERANGE:18754@100507 bear-640x360-video1.mp4 #EXT-X-PLACEMENT-OPPORTUNITY #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:0.734, -#EXT-X-BYTERANGE:20068@1175 +#EXT-X-BYTERANGE:20068@1182 bear-640x360-video2.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video.m3u8 index eccf901cbe..24aed3a3f7 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video.m3u8 @@ -1,12 +1,12 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1131@0" +#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1138@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@1187 +#EXT-X-BYTERANGE:99313@1194 bear-640x360-video1.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 @@ -14,6 +14,6 @@ bear-640x360-video1.mp4 #EXT-X-PLACEMENT-OPPORTUNITY #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:0.734, -#EXT-X-BYTERANGE:80067@1175 +#EXT-X-BYTERANGE:80067@1182 bear-640x360-video2.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video1.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video1.mp4 index 74dc52d9d8..f6b2544b22 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video1.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video1.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video2.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video2.mp4 index f53ce18c45..664e148ac1 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video2.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video2.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.m3u8 index f41c7f4c44..fd021d6aae 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.mpd b/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.mpd index da61e47ec0..0b0a577c87 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.mpd +++ b/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video1.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio1.mp4 - - + + @@ -36,8 +36,8 @@ bear-640x360-video2.mp4 - - + + @@ -49,8 +49,8 @@ bear-640x360-audio2.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.m3u8 index 06f545169f..740e2c79b3 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.m3u8 @@ -1,12 +1,12 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1007@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1014@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@1075 +#EXT-X-BYTERANGE:17028@1082 bear-640x360-audio.mp4 #EXTINF:0.975, #EXT-X-BYTERANGE:16269 diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.mp4 index 80dde0beea..560941350f 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video-iframe.m3u8 index f6f3053452..67572063f5 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video-iframe.m3u8 @@ -1,19 +1,19 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1131@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1138@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@1199 +#EXT-X-BYTERANGE:15581@1206 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18754@100512 +#EXT-X-BYTERANGE:18754@100519 bear-640x360-video.mp4 #EXT-X-PLACEMENT-OPPORTUNITY #EXTINF:0.734, -#EXT-X-BYTERANGE:20068@222852 +#EXT-X-BYTERANGE:20068@222859 bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.m3u8 index 5e01d87116..220a70d853 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.m3u8 @@ -1,12 +1,12 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1131@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1138@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@1199 +#EXT-X-BYTERANGE:99313@1206 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4 index 506a9d66ee..dd872a0330 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues/output.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues/output.m3u8 index f41c7f4c44..fd021d6aae 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues/output.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/encryption-and-ad-cues/output.mpd b/packager/app/test/testdata/encryption-and-ad-cues/output.mpd index 757464e1c5..04d51ffce2 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues/output.mpd +++ b/packager/app/test/testdata/encryption-and-ad-cues/output.mpd @@ -1,5 +1,5 @@ - + @@ -10,8 +10,8 @@ bear-640x360-audio.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-video.mp4 - - + + @@ -37,8 +37,8 @@ bear-640x360-audio.mp4 - - + + @@ -49,8 +49,8 @@ bear-640x360-video.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-audio.mp4 index 5fd86d115a..11ed69976b 100644 Binary files a/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-video.mp4 index 66c33fca7f..364e4aba1d 100644 Binary files a/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-no-clear-lead/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption-and-no-clear-lead/decrypted-bear-640x360-audio-0.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/encryption-and-no-clear-lead/decrypted-bear-640x360-audio-0.mp4 and b/packager/app/test/testdata/encryption-and-no-clear-lead/decrypted-bear-640x360-audio-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-no-clear-lead/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-and-no-clear-lead/decrypted-bear-640x360-video-0.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/encryption-and-no-clear-lead/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption-and-no-clear-lead/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-no-clear-lead/output.mpd b/packager/app/test/testdata/encryption-and-no-clear-lead/output.mpd index 976fb95e33..5df9fff731 100644 --- a/packager/app/test/testdata/encryption-and-no-clear-lead/output.mpd +++ b/packager/app/test/testdata/encryption-and-no-clear-lead/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-audio.mp4 index c9e6e3a824..44da9d0e42 100644 Binary files a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-video.mp4 index 638172c5ba..7fa3ade7a2 100644 Binary files a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd index 33c32168a8..d65a05a8cc 100644 --- a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd +++ b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-audio.mp4 index 6a196f333d..4d8e733e07 100644 Binary files a/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-video.mp4 index 506a9d66ee..dd872a0330 100644 Binary files a/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-non-dash-if-iop/output.mpd b/packager/app/test/testdata/encryption-and-non-dash-if-iop/output.mpd index 2418f1e46d..59a9a506cd 100644 --- a/packager/app/test/testdata/encryption-and-non-dash-if-iop/output.mpd +++ b/packager/app/test/testdata/encryption-and-non-dash-if-iop/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info-segmentlist/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info-segmentlist/bear-640x360-audio.mp4 index 81d1a3dc56..41597d66ce 100644 Binary files a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info-segmentlist/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info-segmentlist/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info-segmentlist/bear-640x360-audio.mp4.media_info b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info-segmentlist/bear-640x360-audio.mp4.media_info index 1aa25b4e6f..2f973b1d05 100644 --- a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info-segmentlist/bear-640x360-audio.mp4.media_info +++ b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info-segmentlist/bear-640x360-audio.mp4.media_info @@ -8,11 +8,11 @@ audio_info { } init_range { begin: 0 - end: 1006 + end: 1013 } index_range { - begin: 1007 - end: 1006 + begin: 1014 + end: 1013 } media_file_name: "bear-640x360-audio.mp4" media_duration_seconds: 2.76317453 @@ -27,14 +27,14 @@ protected_content { protection_scheme: "cenc" } subsegment_ranges { - begin: 1007 - end: 18034 + begin: 1014 + end: 18041 } subsegment_ranges { - begin: 18035 - end: 34716 + begin: 18042 + end: 34723 } subsegment_ranges { - begin: 34717 - end: 44575 + begin: 34724 + end: 44582 } diff --git a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info-segmentlist/output.mpd b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info-segmentlist/output.mpd index 866f0cb8b8..10b8be623f 100644 --- a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info-segmentlist/output.mpd +++ b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info-segmentlist/output.mpd @@ -1,5 +1,5 @@ - + @@ -11,10 +11,10 @@ bear-640x360-audio.mp4 - - - - + + + + diff --git a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4 index 506a9d66ee..dd872a0330 100644 Binary files a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4.media_info b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4.media_info index b851ffc019..f13a0e9fa8 100644 --- a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4.media_info +++ b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4.media_info @@ -11,11 +11,11 @@ video_info { } init_range { begin: 0 - end: 1130 + end: 1137 } index_range { - begin: 1131 - end: 1198 + begin: 1138 + end: 1205 } media_file_name: "bear-640x360-video.mp4" media_duration_seconds: 2.73606658 diff --git a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd index a02fccd37a..f0acf21b9e 100644 --- a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd +++ b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4 index 6a196f333d..4d8e733e07 100644 Binary files a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4.media_info b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4.media_info index 0e86bf54c6..48dcf20c12 100644 --- a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4.media_info +++ b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4.media_info @@ -8,11 +8,11 @@ audio_info { } init_range { begin: 0 - end: 1006 + end: 1013 } index_range { - begin: 1007 - end: 1074 + begin: 1014 + end: 1081 } media_file_name: "bear-640x360-audio.mp4" media_duration_seconds: 2.76317453 diff --git a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4 index 506a9d66ee..dd872a0330 100644 Binary files a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4.media_info b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4.media_info index b851ffc019..f13a0e9fa8 100644 --- a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4.media_info +++ b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4.media_info @@ -11,11 +11,11 @@ video_info { } init_range { begin: 0 - end: 1130 + end: 1137 } index_range { - begin: 1131 - end: 1198 + begin: 1138 + end: 1205 } media_file_name: "bear-640x360-video.mp4" media_duration_seconds: 2.73606658 diff --git a/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-audio.mp4 index 6a196f333d..4d8e733e07 100644 Binary files a/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video-trick_play_factor_1.mp4 b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video-trick_play_factor_1.mp4 index 702b955b01..935b374b47 100644 Binary files a/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video-trick_play_factor_1.mp4 and b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video-trick_play_factor_1.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video.mp4 index 506a9d66ee..dd872a0330 100644 Binary files a/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-audio-0.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-audio-0.mp4 and b/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-audio-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-video-0.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-video-trick_play_factor_1-0.mp4 b/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-video-trick_play_factor_1-0.mp4 index 1d11aed2c8..1559c58bc6 100644 Binary files a/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-video-trick_play_factor_1-0.mp4 and b/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-video-trick_play_factor_1-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-trick-play/output.mpd b/packager/app/test/testdata/encryption-and-trick-play/output.mpd index 70e30abd3f..0c89c0ffff 100644 --- a/packager/app/test/testdata/encryption-and-trick-play/output.mpd +++ b/packager/app/test/testdata/encryption-and-trick-play/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + @@ -35,8 +35,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-audio.mp4 index 6a196f333d..4d8e733e07 100644 Binary files a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_1.mp4 b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_1.mp4 index 702b955b01..935b374b47 100644 Binary files a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_1.mp4 and b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_1.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_2.mp4 b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_2.mp4 index 490e0acc6d..17e05df2e6 100644 Binary files a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_2.mp4 and b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_2.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video.mp4 index 506a9d66ee..dd872a0330 100644 Binary files a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/output.mpd b/packager/app/test/testdata/encryption-and-two-trick-plays/output.mpd index 3f6098f3a0..7af4b85e32 100644 --- a/packager/app/test/testdata/encryption-and-two-trick-plays/output.mpd +++ b/packager/app/test/testdata/encryption-and-two-trick-plays/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,14 +22,14 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + bear-640x360-video-trick_play_factor_2.mp4 - - + + @@ -41,8 +41,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-cbc-1/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-cbc-1/bear-640x360-audio.mp4 index d8305188bd..f4d7210614 100644 Binary files a/packager/app/test/testdata/encryption-cbc-1/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-cbc-1/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbc-1/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-cbc-1/bear-640x360-video.mp4 index ad9b58594f..4bbd401130 100644 Binary files a/packager/app/test/testdata/encryption-cbc-1/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-cbc-1/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbc-1/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption-cbc-1/decrypted-bear-640x360-audio-0.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/encryption-cbc-1/decrypted-bear-640x360-audio-0.mp4 and b/packager/app/test/testdata/encryption-cbc-1/decrypted-bear-640x360-audio-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbc-1/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-cbc-1/decrypted-bear-640x360-video-0.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/encryption-cbc-1/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption-cbc-1/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbc-1/output.mpd b/packager/app/test/testdata/encryption-cbc-1/output.mpd index abd042145b..102dea9666 100644 --- a/packager/app/test/testdata/encryption-cbc-1/output.mpd +++ b/packager/app/test/testdata/encryption-cbc-1/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-audio.mp4 index 2b54a78601..b5392b69af 100644 Binary files a/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-video.mp4 index bbaf346e16..eec3fbb60a 100644 Binary files a/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-audio-0.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-audio-0.mp4 and b/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-audio-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-video-0.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbcs-with-full-protection/output.mpd b/packager/app/test/testdata/encryption-cbcs-with-full-protection/output.mpd index 5e31c48d69..c66e339053 100644 --- a/packager/app/test/testdata/encryption-cbcs-with-full-protection/output.mpd +++ b/packager/app/test/testdata/encryption-cbcs-with-full-protection/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-cbcs/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-cbcs/bear-640x360-audio.mp4 index 2b54a78601..b5392b69af 100644 Binary files a/packager/app/test/testdata/encryption-cbcs/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-cbcs/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbcs/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-cbcs/bear-640x360-video.mp4 index 235d502cd9..0dbf432a50 100644 Binary files a/packager/app/test/testdata/encryption-cbcs/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-cbcs/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbcs/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption-cbcs/decrypted-bear-640x360-audio-0.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/encryption-cbcs/decrypted-bear-640x360-audio-0.mp4 and b/packager/app/test/testdata/encryption-cbcs/decrypted-bear-640x360-audio-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbcs/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-cbcs/decrypted-bear-640x360-video-0.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/encryption-cbcs/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption-cbcs/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbcs/output.mpd b/packager/app/test/testdata/encryption-cbcs/output.mpd index 5e31c48d69..c66e339053 100644 --- a/packager/app/test/testdata/encryption-cbcs/output.mpd +++ b/packager/app/test/testdata/encryption-cbcs/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-cens/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-cens/bear-640x360-audio.mp4 index d2ffeb9300..2cc76621e0 100644 Binary files a/packager/app/test/testdata/encryption-cens/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-cens/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-cens/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-cens/bear-640x360-video.mp4 index 50ed6b390c..ace92ba257 100644 Binary files a/packager/app/test/testdata/encryption-cens/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-cens/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-cens/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption-cens/decrypted-bear-640x360-audio-0.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/encryption-cens/decrypted-bear-640x360-audio-0.mp4 and b/packager/app/test/testdata/encryption-cens/decrypted-bear-640x360-audio-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-cens/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-cens/decrypted-bear-640x360-video-0.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/encryption-cens/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption-cens/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-cens/output.mpd b/packager/app/test/testdata/encryption-cens/output.mpd index 68951f7a6b..ec298fdb9a 100644 --- a/packager/app/test/testdata/encryption-cens/output.mpd +++ b/packager/app/test/testdata/encryption-cens/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-audio.mp4 index 455d58aadd..46716ce17e 100644 Binary files a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-video.mp4 index 94910f98d5..f16d46bca6 100644 Binary files a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd index b8a44039bb..2d75e36fd3 100644 --- a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd +++ b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-multi-keys/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-multi-keys/bear-640x360-audio.mp4 index 6fa418a5f8..0f5462d361 100644 Binary files a/packager/app/test/testdata/encryption-multi-keys/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-multi-keys/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-multi-keys/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-multi-keys/bear-640x360-video.mp4 index c0fde80c34..430e9d76f6 100644 Binary files a/packager/app/test/testdata/encryption-multi-keys/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-multi-keys/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-multi-keys/output.mpd b/packager/app/test/testdata/encryption-multi-keys/output.mpd index b4d6699274..f198fdf1c2 100644 --- a/packager/app/test/testdata/encryption-multi-keys/output.mpd +++ b/packager/app/test/testdata/encryption-multi-keys/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-audio-skip_encryption.mp4 b/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-audio-skip_encryption.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-audio-skip_encryption.mp4 and b/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-audio-skip_encryption.mp4 differ diff --git a/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-video.mp4 index 506a9d66ee..dd872a0330 100644 Binary files a/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-of-only-video-stream/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-of-only-video-stream/decrypted-bear-640x360-video-0.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/encryption-of-only-video-stream/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption-of-only-video-stream/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-of-only-video-stream/output.mpd b/packager/app/test/testdata/encryption-of-only-video-stream/output.mpd index 8eed506b95..a979523d64 100644 --- a/packager/app/test/testdata/encryption-of-only-video-stream/output.mpd +++ b/packager/app/test/testdata/encryption-of-only-video-stream/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -18,8 +18,8 @@ bear-640x360-audio-skip_encryption.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-audio.mp4 index b0e44b946e..591f016e9d 100644 Binary files a/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-video.mp4 index f2f948fee0..16944297b5 100644 Binary files a/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-using-explicit-pssh/output.mpd b/packager/app/test/testdata/encryption-using-explicit-pssh/output.mpd index 690ddb9221..fcc323a89a 100644 --- a/packager/app/test/testdata/encryption-using-explicit-pssh/output.mpd +++ b/packager/app/test/testdata/encryption-using-explicit-pssh/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-audio.mp4 index 6a196f333d..4d8e733e07 100644 Binary files a/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-video.mp4 index 506a9d66ee..dd872a0330 100644 Binary files a/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-using-fixed-key/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption-using-fixed-key/decrypted-bear-640x360-audio-0.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/encryption-using-fixed-key/decrypted-bear-640x360-audio-0.mp4 and b/packager/app/test/testdata/encryption-using-fixed-key/decrypted-bear-640x360-audio-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-using-fixed-key/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-using-fixed-key/decrypted-bear-640x360-video-0.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/encryption-using-fixed-key/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption-using-fixed-key/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-using-fixed-key/output.mpd b/packager/app/test/testdata/encryption-using-fixed-key/output.mpd index bdfad75bbf..04aa865d88 100644 --- a/packager/app/test/testdata/encryption-using-fixed-key/output.mpd +++ b/packager/app/test/testdata/encryption-using-fixed-key/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-audio.mp4 index 061b8eac78..9853a4da20 100644 Binary files a/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-video.mp4 index 709850a7d0..ed6825cce2 100644 Binary files a/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-with-multi-drms/output.m3u8 b/packager/app/test/testdata/encryption-with-multi-drms/output.m3u8 index 2c5886e59f..e453da6f3a 100644 --- a/packager/app/test/testdata/encryption-with-multi-drms/output.m3u8 +++ b/packager/app/test/testdata/encryption-with-multi-drms/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/encryption-with-multi-drms/output.mpd b/packager/app/test/testdata/encryption-with-multi-drms/output.mpd index e95d01930a..c9e0362357 100644 --- a/packager/app/test/testdata/encryption-with-multi-drms/output.mpd +++ b/packager/app/test/testdata/encryption-with-multi-drms/output.mpd @@ -1,5 +1,5 @@ - + @@ -18,8 +18,8 @@ bear-640x360-video.mp4 - - + + @@ -40,8 +40,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-with-multi-drms/stream_0.m3u8 b/packager/app/test/testdata/encryption-with-multi-drms/stream_0.m3u8 index e1d9506695..1eecba5c11 100644 --- a/packager/app/test/testdata/encryption-with-multi-drms/stream_0.m3u8 +++ b/packager/app/test/testdata/encryption-with-multi-drms/stream_0.m3u8 @@ -1,13 +1,13 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1561@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1568@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,AAAAOHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABgSEDEyMzQ1Njc4OTAxMjM0NTZI49yVmwY=",KEYID=0x31323334353637383930313233343536,KEYFORMATVERSIONS="1",KEYFORMAT="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="skd://www.license.com/getkey?KeyId=31323334-3536-3738-3930-313233343536",KEYFORMATVERSIONS="1",KEYFORMAT="com.apple.streamingkeydelivery" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@1629 +#EXT-X-BYTERANGE:17028@1636 bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16682 diff --git a/packager/app/test/testdata/encryption-with-multi-drms/stream_1.m3u8 b/packager/app/test/testdata/encryption-with-multi-drms/stream_1.m3u8 index f6bf6c83c1..6b261d7f39 100644 --- a/packager/app/test/testdata/encryption-with-multi-drms/stream_1.m3u8 +++ b/packager/app/test/testdata/encryption-with-multi-drms/stream_1.m3u8 @@ -1,13 +1,13 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1685@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1692@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,AAAAOHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABgSEDEyMzQ1Njc4OTAxMjM0NTZI49yVmwY=",KEYID=0x31323334353637383930313233343536,KEYFORMATVERSIONS="1",KEYFORMAT="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="skd://www.license.com/getkey?KeyId=31323334-3536-3738-3930-313233343536",KEYFORMATVERSIONS="1",KEYFORMAT="com.apple.streamingkeydelivery" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@1753 +#EXT-X-BYTERANGE:99313@1760 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 diff --git a/packager/app/test/testdata/encryption/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption/bear-640x360-audio.mp4 index 6a196f333d..4d8e733e07 100644 Binary files a/packager/app/test/testdata/encryption/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption/bear-640x360-video.mp4 index 506a9d66ee..dd872a0330 100644 Binary files a/packager/app/test/testdata/encryption/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption/decrypted-bear-640x360-audio-0.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/encryption/decrypted-bear-640x360-audio-0.mp4 and b/packager/app/test/testdata/encryption/decrypted-bear-640x360-audio-0.mp4 differ diff --git a/packager/app/test/testdata/encryption/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption/decrypted-bear-640x360-video-0.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/encryption/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption/output.mpd b/packager/app/test/testdata/encryption/output.mpd index bdfad75bbf..04aa865d88 100644 --- a/packager/app/test/testdata/encryption/output.mpd +++ b/packager/app/test/testdata/encryption/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/first-stream/bear-640x360-0.mp4 b/packager/app/test/testdata/first-stream/bear-640x360-0.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/first-stream/bear-640x360-0.mp4 and b/packager/app/test/testdata/first-stream/bear-640x360-0.mp4 differ diff --git a/packager/app/test/testdata/first-stream/output.mpd b/packager/app/test/testdata/first-stream/output.mpd index cde5a8f34d..403ab3a007 100644 --- a/packager/app/test/testdata/first-stream/output.mpd +++ b/packager/app/test/testdata/first-stream/output.mpd @@ -1,12 +1,12 @@ - + bear-640x360-0.mp4 - - + + diff --git a/packager/app/test/testdata/flac-with-encryption/bear-flac-audio.mp4 b/packager/app/test/testdata/flac-with-encryption/bear-flac-audio.mp4 index 4b092ae0bd..04d9415945 100644 Binary files a/packager/app/test/testdata/flac-with-encryption/bear-flac-audio.mp4 and b/packager/app/test/testdata/flac-with-encryption/bear-flac-audio.mp4 differ diff --git a/packager/app/test/testdata/flac-with-encryption/decrypted-bear-flac-audio-0.mp4 b/packager/app/test/testdata/flac-with-encryption/decrypted-bear-flac-audio-0.mp4 index 114f3a8cd6..59654a81f0 100644 Binary files a/packager/app/test/testdata/flac-with-encryption/decrypted-bear-flac-audio-0.mp4 and b/packager/app/test/testdata/flac-with-encryption/decrypted-bear-flac-audio-0.mp4 differ diff --git a/packager/app/test/testdata/flac-with-encryption/output.m3u8 b/packager/app/test/testdata/flac-with-encryption/output.m3u8 index 5577ce4588..0d8dd55cc1 100644 --- a/packager/app/test/testdata/flac-with-encryption/output.m3u8 +++ b/packager/app/test/testdata/flac-with-encryption/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/flac-with-encryption/output.mpd b/packager/app/test/testdata/flac-with-encryption/output.mpd index ae290944cf..dc59de5862 100644 --- a/packager/app/test/testdata/flac-with-encryption/output.mpd +++ b/packager/app/test/testdata/flac-with-encryption/output.mpd @@ -1,5 +1,5 @@ - + @@ -10,8 +10,8 @@ bear-flac-audio.mp4 - - + + diff --git a/packager/app/test/testdata/flac-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/flac-with-encryption/stream_0.m3u8 index 1479d23b4e..4247de3582 100644 --- a/packager/app/test/testdata/flac-with-encryption/stream_0.m3u8 +++ b/packager/app/test/testdata/flac-with-encryption/stream_0.m3u8 @@ -1,12 +1,12 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-flac-audio.mp4",BYTERANGE="987@0" +#EXT-X-MAP:URI="bear-flac-audio.mp4",BYTERANGE="994@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.045, -#EXT-X-BYTERANGE:85277@1055 +#EXT-X-BYTERANGE:85277@1062 bear-flac-audio.mp4 #EXTINF:1.045, #EXT-X-BYTERANGE:87892 diff --git a/packager/app/test/testdata/hdr10-with-encryption/bear-640x360-hevc-hdr10-video.mp4 b/packager/app/test/testdata/hdr10-with-encryption/bear-640x360-hevc-hdr10-video.mp4 index 2cda9b6d6f..1db4a60cb8 100644 Binary files a/packager/app/test/testdata/hdr10-with-encryption/bear-640x360-hevc-hdr10-video.mp4 and b/packager/app/test/testdata/hdr10-with-encryption/bear-640x360-hevc-hdr10-video.mp4 differ diff --git a/packager/app/test/testdata/hdr10-with-encryption/output.m3u8 b/packager/app/test/testdata/hdr10-with-encryption/output.m3u8 index c76f1fef84..a9bb855701 100644 --- a/packager/app/test/testdata/hdr10-with-encryption/output.m3u8 +++ b/packager/app/test/testdata/hdr10-with-encryption/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/hdr10-with-encryption/output.mpd b/packager/app/test/testdata/hdr10-with-encryption/output.mpd index 0c6cc1a3cb..9fd7a8654a 100644 --- a/packager/app/test/testdata/hdr10-with-encryption/output.mpd +++ b/packager/app/test/testdata/hdr10-with-encryption/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-hevc-hdr10-video.mp4 - - + + diff --git a/packager/app/test/testdata/hdr10-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/hdr10-with-encryption/stream_0.m3u8 index 328432ec8c..7b850f3d8e 100644 --- a/packager/app/test/testdata/hdr10-with-encryption/stream_0.m3u8 +++ b/packager/app/test/testdata/hdr10-with-encryption/stream_0.m3u8 @@ -1,10 +1,10 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-hevc-hdr10-video.mp4",BYTERANGE="5231@0" +#EXT-X-MAP:URI="bear-640x360-hevc-hdr10-video.mp4",BYTERANGE="5238@0" #EXTINF:2.803, -#EXT-X-BYTERANGE:111139@5275 +#EXT-X-BYTERANGE:111139@5282 bear-640x360-hevc-hdr10-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hevc-with-encryption/bear-640x360-hevc-video.mp4 b/packager/app/test/testdata/hevc-with-encryption/bear-640x360-hevc-video.mp4 index eb98dd0f7f..51cc01616f 100644 Binary files a/packager/app/test/testdata/hevc-with-encryption/bear-640x360-hevc-video.mp4 and b/packager/app/test/testdata/hevc-with-encryption/bear-640x360-hevc-video.mp4 differ diff --git a/packager/app/test/testdata/hevc-with-encryption/decrypted-bear-640x360-hevc-video-0.mp4 b/packager/app/test/testdata/hevc-with-encryption/decrypted-bear-640x360-hevc-video-0.mp4 index 77a649e6ad..9efb29c9f2 100644 Binary files a/packager/app/test/testdata/hevc-with-encryption/decrypted-bear-640x360-hevc-video-0.mp4 and b/packager/app/test/testdata/hevc-with-encryption/decrypted-bear-640x360-hevc-video-0.mp4 differ diff --git a/packager/app/test/testdata/hevc-with-encryption/output.mpd b/packager/app/test/testdata/hevc-with-encryption/output.mpd index 0fad79e843..2f638e04d5 100644 --- a/packager/app/test/testdata/hevc-with-encryption/output.mpd +++ b/packager/app/test/testdata/hevc-with-encryption/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-hevc-video.mp4 - - + + diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-init.mp4 index 2b143225fa..3176a92d7f 100644 Binary files a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio.m3u8 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio.m3u8 index 9959ee79c7..594e569373 100644 --- a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-audio-init.mp4" diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-iframe.m3u8 index e3961bbcaf..050cceb530 100644 --- a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-iframe.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-init.mp4 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-init.mp4 index c9553addb5..874b16341f 100644 Binary files a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video.m3u8 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video.m3u8 index 2942fee317..cd5dba1c23 100644 --- a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-video-init.mp4" diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-english-text.m3u8 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-english-text.m3u8 index 47979d80f8..c0bc71e5fd 100644 --- a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-english-text.m3u8 +++ b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-english-text.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.000, diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/output.m3u8 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/output.m3u8 index bb84ee58f8..c39e94749a 100644 --- a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/output.m3u8 +++ b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-init.mp4 b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-init.mp4 index 2b143225fa..3176a92d7f 100644 Binary files a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-init.mp4 and b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-init.mp4 differ diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio.m3u8 b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio.m3u8 index 8c0bbb4276..4222e29879 100644 --- a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio.m3u8 +++ b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="audio-init.mp4" diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/output.m3u8 b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/output.m3u8 index 20e8880134..74abafa996 100644 --- a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/output.m3u8 +++ b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-init.mp4 b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-init.mp4 index c9553addb5..874b16341f 100644 Binary files a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-init.mp4 and b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-init.mp4 differ diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video.m3u8 b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video.m3u8 index 0f3fbe7f5a..0950263f45 100644 --- a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video.m3u8 +++ b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="video-init.mp4" diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-init.mp4 index 2b143225fa..3176a92d7f 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-init.mp4 b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-init.mp4 index c9553addb5..874b16341f 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-init.mp4 b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-init.mp4 index 1ae945d7fb..9bbf0a4e3f 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-init.mp4 and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-init.mp4 differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/output.m3u8 b/packager/app/test/testdata/hls-only-dash-only-captions/output.m3u8 index e67d906cb0..de0f8c364b 100644 --- a/packager/app/test/testdata/hls-only-dash-only-captions/output.m3u8 +++ b/packager/app/test/testdata/hls-only-dash-only-captions/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/output.mpd b/packager/app/test/testdata/hls-only-dash-only-captions/output.mpd index 2efb24609d..03a5990310 100644 --- a/packager/app/test/testdata/hls-only-dash-only-captions/output.mpd +++ b/packager/app/test/testdata/hls-only-dash-only-captions/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/stream_0.m3u8 b/packager/app/test/testdata/hls-only-dash-only-captions/stream_0.m3u8 index a717606102..437d39fa3d 100644 --- a/packager/app/test/testdata/hls-only-dash-only-captions/stream_0.m3u8 +++ b/packager/app/test/testdata/hls-only-dash-only-captions/stream_0.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-audio-init.mp4" diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/stream_1.m3u8 b/packager/app/test/testdata/hls-only-dash-only-captions/stream_1.m3u8 index 19e29dda02..dc49a3592a 100644 --- a/packager/app/test/testdata/hls-only-dash-only-captions/stream_1.m3u8 +++ b/packager/app/test/testdata/hls-only-dash-only-captions/stream_1.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-video-init.mp4" diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/stream_3.m3u8 b/packager/app/test/testdata/hls-only-dash-only-captions/stream_3.m3u8 index bca9f92321..fe78099cda 100644 --- a/packager/app/test/testdata/hls-only-dash-only-captions/stream_3.m3u8 +++ b/packager/app/test/testdata/hls-only-dash-only-captions/stream_3.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.000, diff --git a/packager/app/test/testdata/hls-only-dash-only/bear-640x360-audio.mp4 b/packager/app/test/testdata/hls-only-dash-only/bear-640x360-audio.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only/bear-640x360-audio.mp4 and b/packager/app/test/testdata/hls-only-dash-only/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/hls-only-dash-only/bear-640x360-video.mp4 b/packager/app/test/testdata/hls-only-dash-only/bear-640x360-video.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only/bear-640x360-video.mp4 and b/packager/app/test/testdata/hls-only-dash-only/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/hls-only-dash-only/output.m3u8 b/packager/app/test/testdata/hls-only-dash-only/output.m3u8 index db63073b78..bbbcdd3eef 100644 --- a/packager/app/test/testdata/hls-only-dash-only/output.m3u8 +++ b/packager/app/test/testdata/hls-only-dash-only/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/hls-only-dash-only/output.mpd b/packager/app/test/testdata/hls-only-dash-only/output.mpd index 34698a3cd2..5ec891d03c 100644 --- a/packager/app/test/testdata/hls-only-dash-only/output.mpd +++ b/packager/app/test/testdata/hls-only-dash-only/output.mpd @@ -1,13 +1,13 @@ - + bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/hls-only-dash-only/stream_1.m3u8 b/packager/app/test/testdata/hls-only-dash-only/stream_1.m3u8 index 4e8bdb5f7f..302a169a10 100644 --- a/packager/app/test/testdata/hls-only-dash-only/stream_1.m3u8 +++ b/packager/app/test/testdata/hls-only-dash-only/stream_1.m3u8 @@ -1,11 +1,11 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="870@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@931 +#EXT-X-BYTERANGE:99313@938 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/hls-segmented-webvtt/output.m3u8 b/packager/app/test/testdata/hls-segmented-webvtt/output.m3u8 index 56bc3f6121..2b17374e40 100644 --- a/packager/app/test/testdata/hls-segmented-webvtt/output.m3u8 +++ b/packager/app/test/testdata/hls-segmented-webvtt/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/hls-segmented-webvtt/stream_0.m3u8 b/packager/app/test/testdata/hls-segmented-webvtt/stream_0.m3u8 index e0ddf92e18..f5935bbb32 100644 --- a/packager/app/test/testdata/hls-segmented-webvtt/stream_0.m3u8 +++ b/packager/app/test/testdata/hls-segmented-webvtt/stream_0.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.045, diff --git a/packager/app/test/testdata/hls-segmented-webvtt/stream_1.m3u8 b/packager/app/test/testdata/hls-segmented-webvtt/stream_1.m3u8 index 51a3eafba0..4ca1aa1207 100644 --- a/packager/app/test/testdata/hls-segmented-webvtt/stream_1.m3u8 +++ b/packager/app/test/testdata/hls-segmented-webvtt/stream_1.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.001, diff --git a/packager/app/test/testdata/hls-segmented-webvtt/stream_2.m3u8 b/packager/app/test/testdata/hls-segmented-webvtt/stream_2.m3u8 index bca9f92321..fe78099cda 100644 --- a/packager/app/test/testdata/hls-segmented-webvtt/stream_2.m3u8 +++ b/packager/app/test/testdata/hls-segmented-webvtt/stream_2.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.000, diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-audio.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-audio.m3u8 index 074f9ef39a..a7ca583c96 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1003@0" diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video-iframe.m3u8 index 365f9a2166..185877a676 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video-iframe.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video.m3u8 index ee532489b3..9d71c72c4a 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0" diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8 index 9bf414f3f9..c34929fccb 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2" diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.m3u8 index 1714a25c7a..b436503045 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.m3u8 @@ -1,12 +1,12 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1007@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1014@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@1075 +#EXT-X-BYTERANGE:17028@1082 bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16682 diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.mp4 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.mp4 index 6a196f333d..4d8e733e07 100644 Binary files a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.mp4 and b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video-iframe.m3u8 index c0c92aecc6..9690ab3c10 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video-iframe.m3u8 @@ -1,18 +1,18 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1131@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1138@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@1199 +#EXT-X-BYTERANGE:15581@1206 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18754@100512 +#EXT-X-BYTERANGE:18754@100519 bear-640x360-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:20068@222852 +#EXT-X-BYTERANGE:20068@222859 bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.m3u8 index 0d032347c1..7e4f3fcace 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.m3u8 @@ -1,12 +1,12 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1131@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1138@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@1199 +#EXT-X-BYTERANGE:99313@1206 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.mp4 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.mp4 index 506a9d66ee..dd872a0330 100644 Binary files a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.mp4 and b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output.m3u8 index 5f6bac97d2..bc4f0bdb3b 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/hls-with-bandwidth-override/output.m3u8 b/packager/app/test/testdata/hls-with-bandwidth-override/output.m3u8 index 68edc4cb1b..5cd3530db0 100644 --- a/packager/app/test/testdata/hls-with-bandwidth-override/output.m3u8 +++ b/packager/app/test/testdata/hls-with-bandwidth-override/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-MEDIA:TYPE=AUDIO,URI="stream_0.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2" diff --git a/packager/app/test/testdata/hls-with-bandwidth-override/stream_0.m3u8 b/packager/app/test/testdata/hls-with-bandwidth-override/stream_0.m3u8 index a717606102..437d39fa3d 100644 --- a/packager/app/test/testdata/hls-with-bandwidth-override/stream_0.m3u8 +++ b/packager/app/test/testdata/hls-with-bandwidth-override/stream_0.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-audio-init.mp4" diff --git a/packager/app/test/testdata/hls-with-bandwidth-override/stream_1.m3u8 b/packager/app/test/testdata/hls-with-bandwidth-override/stream_1.m3u8 index 19e29dda02..dc49a3592a 100644 --- a/packager/app/test/testdata/hls-with-bandwidth-override/stream_1.m3u8 +++ b/packager/app/test/testdata/hls-with-bandwidth-override/stream_1.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-video-init.mp4" diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-init.mp4 index 41a0f5d53a..f14da470c3 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-init.mp4 index 7dc02ef574..251d51f860 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-init.mp4 index 76353f8f95..10fbd4d3e9 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-init.mp4 index f708ee9357..140f689d64 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-init.mp4 index 41a0f5d53a..f14da470c3 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-init.mp4 index 1cdecbbb48..e792f917e8 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/output.mpd b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/output.mpd index c0180e6e66..b2fd725df9 100644 --- a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/output.mpd +++ b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-init.mp4 index 41a0f5d53a..f14da470c3 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-init.mp4 index 1cdecbbb48..e792f917e8 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd index 2dbe4ccd2b..121193085c 100644 --- a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd +++ b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-init.mp4 index 41a0f5d53a..f14da470c3 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-init.mp4 index 1cdecbbb48..e792f917e8 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption/output.mpd b/packager/app/test/testdata/live-profile-and-encryption/output.mpd index 2c92b7dd6a..b660ce33d6 100644 --- a/packager/app/test/testdata/live-profile-and-encryption/output.mpd +++ b/packager/app/test/testdata/live-profile-and-encryption/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-init.mp4 index 68d3e3c978..a69e408480 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-init.mp4 index 5476e932c7..ff4f0b72fa 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd index 13dfe0bf32..9ebc81dfe1 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-init.mp4 index 68d3e3c978..a69e408480 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-init.mp4 index 5476e932c7..ff4f0b72fa 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd index 240a4247f3..77ba7447ea 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-init.mp4 index 9989085206..ab128b0bf9 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-init.mp4 index 0009d91335..f3b19ad81d 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/output.mpd index d66effc16e..4b51a0e35f 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-init.mp4 index 68d3e3c978..a69e408480 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-init.mp4 index 5476e932c7..ff4f0b72fa 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd index c8cf36ad11..861518a1f7 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/live-profile-with-webm/bear-640x360-audio-init.webm b/packager/app/test/testdata/live-profile-with-webm/bear-640x360-audio-init.webm index 0476414efd..1e827299e4 100644 Binary files a/packager/app/test/testdata/live-profile-with-webm/bear-640x360-audio-init.webm and b/packager/app/test/testdata/live-profile-with-webm/bear-640x360-audio-init.webm differ diff --git a/packager/app/test/testdata/live-profile-with-webm/bear-640x360-video-init.webm b/packager/app/test/testdata/live-profile-with-webm/bear-640x360-video-init.webm index f343639b9a..5f9e729b37 100644 Binary files a/packager/app/test/testdata/live-profile-with-webm/bear-640x360-video-init.webm and b/packager/app/test/testdata/live-profile-with-webm/bear-640x360-video-init.webm differ diff --git a/packager/app/test/testdata/live-profile-with-webm/output.m3u8 b/packager/app/test/testdata/live-profile-with-webm/output.m3u8 index a9dae3c60d..7f855c39d6 100644 --- a/packager/app/test/testdata/live-profile-with-webm/output.m3u8 +++ b/packager/app/test/testdata/live-profile-with-webm/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/live-profile-with-webm/output.mpd b/packager/app/test/testdata/live-profile-with-webm/output.mpd index acfdd31f70..c41814ca15 100644 --- a/packager/app/test/testdata/live-profile-with-webm/output.mpd +++ b/packager/app/test/testdata/live-profile-with-webm/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/live-profile-with-webm/stream_0.m3u8 b/packager/app/test/testdata/live-profile-with-webm/stream_0.m3u8 index 6ba28f87c0..2368cf0595 100644 --- a/packager/app/test/testdata/live-profile-with-webm/stream_0.m3u8 +++ b/packager/app/test/testdata/live-profile-with-webm/stream_0.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-audio-init.webm" diff --git a/packager/app/test/testdata/live-profile-with-webm/stream_1.m3u8 b/packager/app/test/testdata/live-profile-with-webm/stream_1.m3u8 index 94c245b18b..69a9e588e3 100644 --- a/packager/app/test/testdata/live-profile-with-webm/stream_1.m3u8 +++ b/packager/app/test/testdata/live-profile-with-webm/stream_1.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-video-init.webm" diff --git a/packager/app/test/testdata/live-profile/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile/bear-640x360-audio-init.mp4 index 2b143225fa..3176a92d7f 100644 Binary files a/packager/app/test/testdata/live-profile/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-profile/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile/bear-640x360-video-init.mp4 index c9553addb5..874b16341f 100644 Binary files a/packager/app/test/testdata/live-profile/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-profile/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile/output.mpd b/packager/app/test/testdata/live-profile/output.mpd index a972a41fa3..8f3cbde818 100644 --- a/packager/app/test/testdata/live-profile/output.mpd +++ b/packager/app/test/testdata/live-profile/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/output.mpd b/packager/app/test/testdata/live-static-profile-and-ad-cues/output.mpd index 5a712d2b1c..a0f13f5c9c 100644 --- a/packager/app/test/testdata/live-static-profile-and-ad-cues/output.mpd +++ b/packager/app/test/testdata/live-static-profile-and-ad-cues/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-init.mp4 index 2b143225fa..3176a92d7f 100644 Binary files a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-init.mp4 index c9553addb5..874b16341f 100644 Binary files a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/output.mpd b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/output.mpd index 4090157956..5983d6f9b5 100644 --- a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/output.mpd +++ b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/live-static-profile/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-static-profile/bear-640x360-audio-init.mp4 index 2b143225fa..3176a92d7f 100644 Binary files a/packager/app/test/testdata/live-static-profile/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-static-profile/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-static-profile/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-static-profile/bear-640x360-video-init.mp4 index c9553addb5..874b16341f 100644 Binary files a/packager/app/test/testdata/live-static-profile/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-static-profile/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-static-profile/output.mpd b/packager/app/test/testdata/live-static-profile/output.mpd index 606f454b33..b851f0164c 100644 --- a/packager/app/test/testdata/live-static-profile/output.mpd +++ b/packager/app/test/testdata/live-static-profile/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-audio.mp4 b/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-audio.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-audio.mp4 and b/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-audio.mp4 differ diff --git a/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-video.mp4 b/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-video.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-video.mp4 and b/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-video.mp4 differ diff --git a/packager/app/test/testdata/mp4-trailing-moov/output.m3u8 b/packager/app/test/testdata/mp4-trailing-moov/output.m3u8 index c9008bfae3..2712e9c7e7 100644 --- a/packager/app/test/testdata/mp4-trailing-moov/output.m3u8 +++ b/packager/app/test/testdata/mp4-trailing-moov/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/mp4-trailing-moov/output.mpd b/packager/app/test/testdata/mp4-trailing-moov/output.mpd index ee1f06bab2..8a2dd9e959 100644 --- a/packager/app/test/testdata/mp4-trailing-moov/output.mpd +++ b/packager/app/test/testdata/mp4-trailing-moov/output.mpd @@ -1,12 +1,12 @@ - + bear-640x360-trailing-moov-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-trailing-moov-audio.mp4 - - + + diff --git a/packager/app/test/testdata/mp4-trailing-moov/stream_0.m3u8 b/packager/app/test/testdata/mp4-trailing-moov/stream_0.m3u8 index b09c6ea13a..2dc26114ee 100644 --- a/packager/app/test/testdata/mp4-trailing-moov/stream_0.m3u8 +++ b/packager/app/test/testdata/mp4-trailing-moov/stream_0.m3u8 @@ -1,11 +1,11 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-trailing-moov-audio.mp4",BYTERANGE="797@0" +#EXT-X-MAP:URI="bear-640x360-trailing-moov-audio.mp4",BYTERANGE="804@0" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@865 +#EXT-X-BYTERANGE:17028@872 bear-640x360-trailing-moov-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16285 diff --git a/packager/app/test/testdata/mp4-trailing-moov/stream_1.m3u8 b/packager/app/test/testdata/mp4-trailing-moov/stream_1.m3u8 index d86af4e3c4..2de6db6c1c 100644 --- a/packager/app/test/testdata/mp4-trailing-moov/stream_1.m3u8 +++ b/packager/app/test/testdata/mp4-trailing-moov/stream_1.m3u8 @@ -1,11 +1,11 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-trailing-moov-video.mp4",BYTERANGE="863@0" +#EXT-X-MAP:URI="bear-640x360-trailing-moov-video.mp4",BYTERANGE="870@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@931 +#EXT-X-BYTERANGE:99313@938 bear-640x360-trailing-moov-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-audio.mp4 b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-audio.mp4 index c5c3748137..03c55886fe 100644 Binary files a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-audio.mp4 and b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-audio.mp4 differ diff --git a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-video.mp4 b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-video.mp4 index ea0447f779..aeaa099b56 100644 Binary files a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-video.mp4 and b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-video.mp4 differ diff --git a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-audio-0.mp4 b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-audio-0.mp4 index 92eb026049..053807ce37 100644 Binary files a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-audio-0.mp4 and b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-audio-0.mp4 differ diff --git a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-video-0.mp4 b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-video-0.mp4 index ce95f11641..9b0539a7ad 100644 Binary files a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-video-0.mp4 and b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-video-0.mp4 differ diff --git a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd index 53e657b9b4..c274e66ccd 100644 --- a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd +++ b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd @@ -1,5 +1,5 @@ - + @@ -10,8 +10,8 @@ bear-320x240-vp9-opus-audio.mp4 - - + + @@ -22,8 +22,8 @@ bear-320x240-vp9-opus-video.mp4 - - + + diff --git a/packager/app/test/testdata/segmented-ttml-mp4/bear-english-text-init.mp4 b/packager/app/test/testdata/segmented-ttml-mp4/bear-english-text-init.mp4 index 464efde3eb..0ef372cb83 100644 Binary files a/packager/app/test/testdata/segmented-ttml-mp4/bear-english-text-init.mp4 and b/packager/app/test/testdata/segmented-ttml-mp4/bear-english-text-init.mp4 differ diff --git a/packager/app/test/testdata/segmented-ttml-mp4/output.m3u8 b/packager/app/test/testdata/segmented-ttml-mp4/output.m3u8 index ad00c97c90..ecf7a821e3 100644 --- a/packager/app/test/testdata/segmented-ttml-mp4/output.m3u8 +++ b/packager/app/test/testdata/segmented-ttml-mp4/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/segmented-ttml-mp4/output.mpd b/packager/app/test/testdata/segmented-ttml-mp4/output.mpd index 1455948e9a..10019a55be 100644 --- a/packager/app/test/testdata/segmented-ttml-mp4/output.mpd +++ b/packager/app/test/testdata/segmented-ttml-mp4/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/segmented-ttml-mp4/stream_0.m3u8 b/packager/app/test/testdata/segmented-ttml-mp4/stream_0.m3u8 index a6990bdc74..7411f9f610 100644 --- a/packager/app/test/testdata/segmented-ttml-mp4/stream_0.m3u8 +++ b/packager/app/test/testdata/segmented-ttml-mp4/stream_0.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:1 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-english-text-init.mp4" diff --git a/packager/app/test/testdata/segmented-ttml-text/output.m3u8 b/packager/app/test/testdata/segmented-ttml-text/output.m3u8 index ad00c97c90..ecf7a821e3 100644 --- a/packager/app/test/testdata/segmented-ttml-text/output.m3u8 +++ b/packager/app/test/testdata/segmented-ttml-text/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/segmented-ttml-text/output.mpd b/packager/app/test/testdata/segmented-ttml-text/output.mpd index 372f266d5e..8b506062bf 100644 --- a/packager/app/test/testdata/segmented-ttml-text/output.mpd +++ b/packager/app/test/testdata/segmented-ttml-text/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/segmented-ttml-text/stream_0.m3u8 b/packager/app/test/testdata/segmented-ttml-text/stream_0.m3u8 index 9da28a3887..a374408b43 100644 --- a/packager/app/test/testdata/segmented-ttml-text/stream_0.m3u8 +++ b/packager/app/test/testdata/segmented-ttml-text/stream_0.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:1 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.000, diff --git a/packager/app/test/testdata/segmented-webvtt-mp4/bear-english-text-init.mp4 b/packager/app/test/testdata/segmented-webvtt-mp4/bear-english-text-init.mp4 index 1ae945d7fb..9bbf0a4e3f 100644 Binary files a/packager/app/test/testdata/segmented-webvtt-mp4/bear-english-text-init.mp4 and b/packager/app/test/testdata/segmented-webvtt-mp4/bear-english-text-init.mp4 differ diff --git a/packager/app/test/testdata/segmented-webvtt-mp4/output.m3u8 b/packager/app/test/testdata/segmented-webvtt-mp4/output.m3u8 index ad00c97c90..ecf7a821e3 100644 --- a/packager/app/test/testdata/segmented-webvtt-mp4/output.m3u8 +++ b/packager/app/test/testdata/segmented-webvtt-mp4/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/segmented-webvtt-mp4/output.mpd b/packager/app/test/testdata/segmented-webvtt-mp4/output.mpd index 947a122468..58302c9779 100644 --- a/packager/app/test/testdata/segmented-webvtt-mp4/output.mpd +++ b/packager/app/test/testdata/segmented-webvtt-mp4/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/segmented-webvtt-mp4/stream_0.m3u8 b/packager/app/test/testdata/segmented-webvtt-mp4/stream_0.m3u8 index a6990bdc74..7411f9f610 100644 --- a/packager/app/test/testdata/segmented-webvtt-mp4/stream_0.m3u8 +++ b/packager/app/test/testdata/segmented-webvtt-mp4/stream_0.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:1 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-english-text-init.mp4" diff --git a/packager/app/test/testdata/segmented-webvtt-text/output.m3u8 b/packager/app/test/testdata/segmented-webvtt-text/output.m3u8 index ad00c97c90..ecf7a821e3 100644 --- a/packager/app/test/testdata/segmented-webvtt-text/output.m3u8 +++ b/packager/app/test/testdata/segmented-webvtt-text/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/segmented-webvtt-text/output.mpd b/packager/app/test/testdata/segmented-webvtt-text/output.mpd index dd4aa441d3..29c9eb2f15 100644 --- a/packager/app/test/testdata/segmented-webvtt-text/output.mpd +++ b/packager/app/test/testdata/segmented-webvtt-text/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/segmented-webvtt-text/stream_0.m3u8 b/packager/app/test/testdata/segmented-webvtt-text/stream_0.m3u8 index d3112ce3f9..071b814f15 100644 --- a/packager/app/test/testdata/segmented-webvtt-text/stream_0.m3u8 +++ b/packager/app/test/testdata/segmented-webvtt-text/stream_0.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:1 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.000, diff --git a/packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-init.mp4 b/packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-init.mp4 index 4cf90547bc..a3d4dd21a3 100644 Binary files a/packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-init.mp4 and b/packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-init.mp4 differ diff --git a/packager/app/test/testdata/segmented-webvtt-with-language-override/output.m3u8 b/packager/app/test/testdata/segmented-webvtt-with-language-override/output.m3u8 index 77399f9ada..1566d6c65b 100644 --- a/packager/app/test/testdata/segmented-webvtt-with-language-override/output.m3u8 +++ b/packager/app/test/testdata/segmented-webvtt-with-language-override/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/segmented-webvtt-with-language-override/output.mpd b/packager/app/test/testdata/segmented-webvtt-with-language-override/output.mpd index 18e6002594..9dd7770eac 100644 --- a/packager/app/test/testdata/segmented-webvtt-with-language-override/output.mpd +++ b/packager/app/test/testdata/segmented-webvtt-with-language-override/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/segmented-webvtt-with-language-override/stream_1.m3u8 b/packager/app/test/testdata/segmented-webvtt-with-language-override/stream_1.m3u8 index d3112ce3f9..071b814f15 100644 --- a/packager/app/test/testdata/segmented-webvtt-with-language-override/stream_1.m3u8 +++ b/packager/app/test/testdata/segmented-webvtt-with-language-override/stream_1.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:1 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.000, diff --git a/packager/app/test/testdata/single-file-webvtt-text/output.m3u8 b/packager/app/test/testdata/single-file-webvtt-text/output.m3u8 index ad00c97c90..ecf7a821e3 100644 --- a/packager/app/test/testdata/single-file-webvtt-text/output.m3u8 +++ b/packager/app/test/testdata/single-file-webvtt-text/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/single-file-webvtt-text/output.mpd b/packager/app/test/testdata/single-file-webvtt-text/output.mpd index 46291f3ef6..598d0f6b05 100644 --- a/packager/app/test/testdata/single-file-webvtt-text/output.mpd +++ b/packager/app/test/testdata/single-file-webvtt-text/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/single-file-webvtt-text/stream_0.m3u8 b/packager/app/test/testdata/single-file-webvtt-text/stream_0.m3u8 index d1587072ec..1ed204e274 100644 --- a/packager/app/test/testdata/single-file-webvtt-text/stream_0.m3u8 +++ b/packager/app/test/testdata/single-file-webvtt-text/stream_0.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:5 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:4.700, diff --git a/packager/app/test/testdata/text/output.mpd b/packager/app/test/testdata/text/output.mpd index 0e1c7cf2a5..22869fa082 100644 --- a/packager/app/test/testdata/text/output.mpd +++ b/packager/app/test/testdata/text/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/video-audio-text/output.mpd b/packager/app/test/testdata/video-audio-text/output.mpd index 828cc82da2..04ea40d3ac 100644 --- a/packager/app/test/testdata/video-audio-text/output.mpd +++ b/packager/app/test/testdata/video-audio-text/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/video-audio-ttml/bear-640x360-audio.mp4 b/packager/app/test/testdata/video-audio-ttml/bear-640x360-audio.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/video-audio-ttml/bear-640x360-audio.mp4 and b/packager/app/test/testdata/video-audio-ttml/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/video-audio-ttml/bear-640x360-video.mp4 b/packager/app/test/testdata/video-audio-ttml/bear-640x360-video.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/video-audio-ttml/bear-640x360-video.mp4 and b/packager/app/test/testdata/video-audio-ttml/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/video-audio-ttml/output.mpd b/packager/app/test/testdata/video-audio-ttml/output.mpd index 094090f62b..78ce66034a 100644 --- a/packager/app/test/testdata/video-audio-ttml/output.mpd +++ b/packager/app/test/testdata/video-audio-ttml/output.mpd @@ -1,5 +1,5 @@ - + @@ -10,8 +10,8 @@ bear-640x360-video.mp4 - - + + @@ -19,8 +19,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/video-audio-webvtt/bear-640x360-audio.mp4 b/packager/app/test/testdata/video-audio-webvtt/bear-640x360-audio.mp4 index a86c776cf5..10077f9af8 100644 Binary files a/packager/app/test/testdata/video-audio-webvtt/bear-640x360-audio.mp4 and b/packager/app/test/testdata/video-audio-webvtt/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/video-audio-webvtt/bear-640x360-video.mp4 b/packager/app/test/testdata/video-audio-webvtt/bear-640x360-video.mp4 index 04ed1816fe..de83807979 100644 Binary files a/packager/app/test/testdata/video-audio-webvtt/bear-640x360-video.mp4 and b/packager/app/test/testdata/video-audio-webvtt/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/video-audio-webvtt/output.mpd b/packager/app/test/testdata/video-audio-webvtt/output.mpd index d7ce2e3212..de1f653f3e 100644 --- a/packager/app/test/testdata/video-audio-webvtt/output.mpd +++ b/packager/app/test/testdata/video-audio-webvtt/output.mpd @@ -1,12 +1,12 @@ - + bear-640x360-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/video-no-edit-list/bear-640x360-no_edit_list-video.mp4 b/packager/app/test/testdata/video-no-edit-list/bear-640x360-no_edit_list-video.mp4 index 93a5b5ff88..e4b91741de 100644 Binary files a/packager/app/test/testdata/video-no-edit-list/bear-640x360-no_edit_list-video.mp4 and b/packager/app/test/testdata/video-no-edit-list/bear-640x360-no_edit_list-video.mp4 differ diff --git a/packager/app/test/testdata/video-no-edit-list/output.mpd b/packager/app/test/testdata/video-no-edit-list/output.mpd index 16cc109f7c..07e21ed643 100644 --- a/packager/app/test/testdata/video-no-edit-list/output.mpd +++ b/packager/app/test/testdata/video-no-edit-list/output.mpd @@ -1,12 +1,12 @@ - + bear-640x360-no_edit_list-video.mp4 - - + + diff --git a/packager/app/test/testdata/video-non-square-pixel/bear-640x360-non_square_pixel-with_pasp-video.mp4 b/packager/app/test/testdata/video-non-square-pixel/bear-640x360-non_square_pixel-with_pasp-video.mp4 index f739c96719..9fb0019f46 100644 Binary files a/packager/app/test/testdata/video-non-square-pixel/bear-640x360-non_square_pixel-with_pasp-video.mp4 and b/packager/app/test/testdata/video-non-square-pixel/bear-640x360-non_square_pixel-with_pasp-video.mp4 differ diff --git a/packager/app/test/testdata/video-non-square-pixel/output.m3u8 b/packager/app/test/testdata/video-non-square-pixel/output.m3u8 index 180bd52a29..310f538d2d 100644 --- a/packager/app/test/testdata/video-non-square-pixel/output.m3u8 +++ b/packager/app/test/testdata/video-non-square-pixel/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/video-non-square-pixel/output.mpd b/packager/app/test/testdata/video-non-square-pixel/output.mpd index 2d050479f8..b5bf03a14c 100644 --- a/packager/app/test/testdata/video-non-square-pixel/output.mpd +++ b/packager/app/test/testdata/video-non-square-pixel/output.mpd @@ -1,12 +1,12 @@ - + bear-640x360-non_square_pixel-with_pasp-video.mp4 - - + + diff --git a/packager/app/test/testdata/video-non-square-pixel/stream_0.m3u8 b/packager/app/test/testdata/video-non-square-pixel/stream_0.m3u8 index 322b0b6f0b..c4bd2fa423 100644 --- a/packager/app/test/testdata/video-non-square-pixel/stream_0.m3u8 +++ b/packager/app/test/testdata/video-non-square-pixel/stream_0.m3u8 @@ -1,10 +1,10 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-non_square_pixel-with_pasp-video.mp4",BYTERANGE="883@0" +#EXT-X-MAP:URI="bear-640x360-non_square_pixel-with_pasp-video.mp4",BYTERANGE="890@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:95246@927 +#EXT-X-BYTERANGE:95246@934 bear-640x360-non_square_pixel-with_pasp-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/vorbis-webm/bear-320x240-audio-only-audio.webm b/packager/app/test/testdata/vorbis-webm/bear-320x240-audio-only-audio.webm index dee18892f7..108993f61b 100644 Binary files a/packager/app/test/testdata/vorbis-webm/bear-320x240-audio-only-audio.webm and b/packager/app/test/testdata/vorbis-webm/bear-320x240-audio-only-audio.webm differ diff --git a/packager/app/test/testdata/vorbis-webm/output.mpd b/packager/app/test/testdata/vorbis-webm/output.mpd index d94b4a3d7a..407db1ba50 100644 --- a/packager/app/test/testdata/vorbis-webm/output.mpd +++ b/packager/app/test/testdata/vorbis-webm/output.mpd @@ -1,13 +1,13 @@ - + bear-320x240-audio-only-audio.webm - - + + diff --git a/packager/app/test/testdata/vp8-mp4-with-encryption/bear-640x360-video.mp4 b/packager/app/test/testdata/vp8-mp4-with-encryption/bear-640x360-video.mp4 index 6ee51d7436..5bda070238 100644 Binary files a/packager/app/test/testdata/vp8-mp4-with-encryption/bear-640x360-video.mp4 and b/packager/app/test/testdata/vp8-mp4-with-encryption/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/vp8-mp4-with-encryption/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/vp8-mp4-with-encryption/decrypted-bear-640x360-video-0.mp4 index 6083064548..5ba8ab5ce2 100644 Binary files a/packager/app/test/testdata/vp8-mp4-with-encryption/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/vp8-mp4-with-encryption/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd b/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd index 18c65a5d1a..5004c6925e 100644 --- a/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd +++ b/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + diff --git a/packager/app/test/testdata/vp8-webm/bear-640x360-video.webm b/packager/app/test/testdata/vp8-webm/bear-640x360-video.webm index 5fa81b7d88..34404d12bc 100644 Binary files a/packager/app/test/testdata/vp8-webm/bear-640x360-video.webm and b/packager/app/test/testdata/vp8-webm/bear-640x360-video.webm differ diff --git a/packager/app/test/testdata/vp8-webm/output.mpd b/packager/app/test/testdata/vp8-webm/output.mpd index 777ddf60cf..bc97ab36ff 100644 --- a/packager/app/test/testdata/vp8-webm/output.mpd +++ b/packager/app/test/testdata/vp8-webm/output.mpd @@ -1,12 +1,12 @@ - + bear-640x360-video.webm - - + + diff --git a/packager/app/test/testdata/vp9-webm-with-blockgroup/bear-vp9-blockgroup-video.webm b/packager/app/test/testdata/vp9-webm-with-blockgroup/bear-vp9-blockgroup-video.webm index 4371b71385..4bdba082ea 100644 Binary files a/packager/app/test/testdata/vp9-webm-with-blockgroup/bear-vp9-blockgroup-video.webm and b/packager/app/test/testdata/vp9-webm-with-blockgroup/bear-vp9-blockgroup-video.webm differ diff --git a/packager/app/test/testdata/vp9-webm-with-blockgroup/output.mpd b/packager/app/test/testdata/vp9-webm-with-blockgroup/output.mpd index cbd3526f73..eb9ad6a14e 100644 --- a/packager/app/test/testdata/vp9-webm-with-blockgroup/output.mpd +++ b/packager/app/test/testdata/vp9-webm-with-blockgroup/output.mpd @@ -1,12 +1,12 @@ - + bear-vp9-blockgroup-video.webm - - + + diff --git a/packager/app/test/testdata/vp9-webm/bear-320x240-vp9-opus-audio.webm b/packager/app/test/testdata/vp9-webm/bear-320x240-vp9-opus-audio.webm index ed155bc28b..c27b06eb72 100644 Binary files a/packager/app/test/testdata/vp9-webm/bear-320x240-vp9-opus-audio.webm and b/packager/app/test/testdata/vp9-webm/bear-320x240-vp9-opus-audio.webm differ diff --git a/packager/app/test/testdata/vp9-webm/bear-320x240-vp9-opus-video.webm b/packager/app/test/testdata/vp9-webm/bear-320x240-vp9-opus-video.webm index 74942ee6d2..d42a39076e 100644 Binary files a/packager/app/test/testdata/vp9-webm/bear-320x240-vp9-opus-video.webm and b/packager/app/test/testdata/vp9-webm/bear-320x240-vp9-opus-video.webm differ diff --git a/packager/app/test/testdata/vp9-webm/output.mpd b/packager/app/test/testdata/vp9-webm/output.mpd index 5cc8a6deda..bfc7ffb749 100644 --- a/packager/app/test/testdata/vp9-webm/output.mpd +++ b/packager/app/test/testdata/vp9-webm/output.mpd @@ -1,21 +1,21 @@ - + bear-320x240-vp9-opus-audio.webm - - + + bear-320x240-vp9-opus-video.webm - - + + diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-init.mp4 index 2b143225fa..3176a92d7f 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio.m3u8 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio.m3u8 index 9959ee79c7..594e569373 100644 --- a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-audio-init.mp4" diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-iframe.m3u8 index e3961bbcaf..050cceb530 100644 --- a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-iframe.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-init.mp4 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-init.mp4 index c9553addb5..874b16341f 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video.m3u8 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video.m3u8 index 2942fee317..cd5dba1c23 100644 --- a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-video-init.mp4" diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-init.mp4 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-init.mp4 index f0c01ecc4b..e33a645b53 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-init.mp4 and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-init.mp4 differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text.m3u8 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text.m3u8 index e73b7a7465..b14f9b1dbd 100644 --- a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text.m3u8 +++ b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text.m3u8 @@ -1,6 +1,6 @@ #EXTM3U #EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-english-text-init.mp4" diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.m3u8 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.m3u8 index bb84ee58f8..c39e94749a 100644 --- a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.m3u8 +++ b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.m3u8 @@ -1,5 +1,5 @@ #EXTM3U -## Generated with https://github.com/google/shaka-packager version -- +## Generated with https://github.com/shaka-project/shaka-packager version -- #EXT-X-INDEPENDENT-SEGMENTS diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.mpd b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.mpd index 180a492dbd..3ec08889a8 100644 --- a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.mpd +++ b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/webm-subsample-encryption/bear-320x180-vp9-altref-video.webm b/packager/app/test/testdata/webm-subsample-encryption/bear-320x180-vp9-altref-video.webm index b1bc299d75..f625d7037a 100644 Binary files a/packager/app/test/testdata/webm-subsample-encryption/bear-320x180-vp9-altref-video.webm and b/packager/app/test/testdata/webm-subsample-encryption/bear-320x180-vp9-altref-video.webm differ diff --git a/packager/app/test/testdata/webm-subsample-encryption/decrypted-bear-320x180-vp9-altref-video-0.webm b/packager/app/test/testdata/webm-subsample-encryption/decrypted-bear-320x180-vp9-altref-video-0.webm index 4de594691e..2c47cbe0c0 100644 Binary files a/packager/app/test/testdata/webm-subsample-encryption/decrypted-bear-320x180-vp9-altref-video-0.webm and b/packager/app/test/testdata/webm-subsample-encryption/decrypted-bear-320x180-vp9-altref-video-0.webm differ diff --git a/packager/app/test/testdata/webm-subsample-encryption/output.mpd b/packager/app/test/testdata/webm-subsample-encryption/output.mpd index 69140f2d58..f61ba9c2bc 100644 --- a/packager/app/test/testdata/webm-subsample-encryption/output.mpd +++ b/packager/app/test/testdata/webm-subsample-encryption/output.mpd @@ -1,5 +1,5 @@ - + @@ -8,8 +8,8 @@ bear-320x180-vp9-altref-video.webm - - + + diff --git a/packager/app/test/testdata/webm-vp9-full-sample-encryption/bear-320x180-vp9-altref-video.webm b/packager/app/test/testdata/webm-vp9-full-sample-encryption/bear-320x180-vp9-altref-video.webm index b1bc299d75..f625d7037a 100644 Binary files a/packager/app/test/testdata/webm-vp9-full-sample-encryption/bear-320x180-vp9-altref-video.webm and b/packager/app/test/testdata/webm-vp9-full-sample-encryption/bear-320x180-vp9-altref-video.webm differ diff --git a/packager/app/test/testdata/webm-vp9-full-sample-encryption/decrypted-bear-320x180-vp9-altref-video-0.webm b/packager/app/test/testdata/webm-vp9-full-sample-encryption/decrypted-bear-320x180-vp9-altref-video-0.webm index 4de594691e..2c47cbe0c0 100644 Binary files a/packager/app/test/testdata/webm-vp9-full-sample-encryption/decrypted-bear-320x180-vp9-altref-video-0.webm and b/packager/app/test/testdata/webm-vp9-full-sample-encryption/decrypted-bear-320x180-vp9-altref-video-0.webm differ diff --git a/packager/app/test/testdata/webm-vp9-full-sample-encryption/output.mpd b/packager/app/test/testdata/webm-vp9-full-sample-encryption/output.mpd index 69140f2d58..f61ba9c2bc 100644 --- a/packager/app/test/testdata/webm-vp9-full-sample-encryption/output.mpd +++ b/packager/app/test/testdata/webm-vp9-full-sample-encryption/output.mpd @@ -1,5 +1,5 @@ - + @@ -8,8 +8,8 @@ bear-320x180-vp9-altref-video.webm - - + + diff --git a/packager/app/test/testdata/webm-with-encryption/bear-640x360-video.webm b/packager/app/test/testdata/webm-with-encryption/bear-640x360-video.webm index 91d57aa5fd..87d129de1e 100644 Binary files a/packager/app/test/testdata/webm-with-encryption/bear-640x360-video.webm and b/packager/app/test/testdata/webm-with-encryption/bear-640x360-video.webm differ diff --git a/packager/app/test/testdata/webm-with-encryption/decrypted-bear-640x360-video-0.webm b/packager/app/test/testdata/webm-with-encryption/decrypted-bear-640x360-video-0.webm index 5fa81b7d88..34404d12bc 100644 Binary files a/packager/app/test/testdata/webm-with-encryption/decrypted-bear-640x360-video-0.webm and b/packager/app/test/testdata/webm-with-encryption/decrypted-bear-640x360-video-0.webm differ diff --git a/packager/app/test/testdata/webm-with-encryption/output.mpd b/packager/app/test/testdata/webm-with-encryption/output.mpd index c06555905b..7873d4485d 100644 --- a/packager/app/test/testdata/webm-with-encryption/output.mpd +++ b/packager/app/test/testdata/webm-with-encryption/output.mpd @@ -1,5 +1,5 @@ - + @@ -8,8 +8,8 @@ bear-640x360-video.webm - - + + diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-0.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-0.mp4 index d22aa64cbe..6d4480aa15 100644 Binary files a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-0.mp4 and b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-0.mp4 differ diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-1.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-1.mp4 index 50a7ff5d18..c9a67a4436 100644 Binary files a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-1.mp4 and b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-1.mp4 differ diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-2.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-2.mp4 index 5ef69733c1..49e18a55b2 100644 Binary files a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-2.mp4 and b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-2.mp4 differ diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-3.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-3.mp4 index b80f762b32..0bc8fee494 100644 Binary files a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-3.mp4 and b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-3.mp4 differ diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd index 71b96ec2a8..41c75f5979 100644 --- a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd +++ b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd @@ -1,18 +1,18 @@ - + bear-multi-configs-0.mp4 - - + + bear-multi-configs-2.mp4 - - + + @@ -20,15 +20,15 @@ bear-multi-configs-1.mp4 - - + + bear-multi-configs-3.mp4 - - + + diff --git a/packager/app/test/testdata/wvm-input/bear-multi-configs-0.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-0.mp4 index 75c89080ac..68a0522d02 100644 Binary files a/packager/app/test/testdata/wvm-input/bear-multi-configs-0.mp4 and b/packager/app/test/testdata/wvm-input/bear-multi-configs-0.mp4 differ diff --git a/packager/app/test/testdata/wvm-input/bear-multi-configs-1.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-1.mp4 index 50a7ff5d18..c9a67a4436 100644 Binary files a/packager/app/test/testdata/wvm-input/bear-multi-configs-1.mp4 and b/packager/app/test/testdata/wvm-input/bear-multi-configs-1.mp4 differ diff --git a/packager/app/test/testdata/wvm-input/bear-multi-configs-2.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-2.mp4 index 2cae9528a9..7426a8e050 100644 Binary files a/packager/app/test/testdata/wvm-input/bear-multi-configs-2.mp4 and b/packager/app/test/testdata/wvm-input/bear-multi-configs-2.mp4 differ diff --git a/packager/app/test/testdata/wvm-input/bear-multi-configs-3.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-3.mp4 index b80f762b32..0bc8fee494 100644 Binary files a/packager/app/test/testdata/wvm-input/bear-multi-configs-3.mp4 and b/packager/app/test/testdata/wvm-input/bear-multi-configs-3.mp4 differ diff --git a/packager/app/test/testdata/wvm-input/output.mpd b/packager/app/test/testdata/wvm-input/output.mpd index 3c2b7cc015..60b5f1c1f9 100644 --- a/packager/app/test/testdata/wvm-input/output.mpd +++ b/packager/app/test/testdata/wvm-input/output.mpd @@ -1,18 +1,18 @@ - + bear-multi-configs-0.mp4 - - + + bear-multi-configs-2.mp4 - - + + @@ -20,15 +20,15 @@ bear-multi-configs-1.mp4 - - + + bear-multi-configs-3.mp4 - - + + diff --git a/packager/file/http_file.h b/packager/file/http_file.h index 7351e0851d..e86131c0b0 100644 --- a/packager/file/http_file.h +++ b/packager/file/http_file.h @@ -33,8 +33,8 @@ enum class HttpMethod { /// /// About how to use this, please visit the corresponding documentation [1]. /// -/// [1] https://google.github.io/shaka-packager/html/tutorials/http_upload.html -/// +/// [1] +/// https://shaka-project.github.io/shaka-packager/html/tutorials/http_upload.html class HttpFile : public File { public: HttpFile(HttpMethod method, const std::string& url); diff --git a/packager/hls/base/master_playlist.cc b/packager/hls/base/master_playlist.cc index 27a8d2495f..c62f24f2d0 100644 --- a/packager/hls/base/master_playlist.cc +++ b/packager/hls/base/master_playlist.cc @@ -80,7 +80,7 @@ std::set GetGroupCodecString( // string. As per HLS guidelines, "wvtt" is optional. When it is included, it // can cause playback errors on some Apple produces. Excluding it allows // playback on all Apple products. See - // https://github.com/google/shaka-packager/issues/402 for all details. + // https://github.com/shaka-project/shaka-packager/issues/402 for all details. auto wvtt = codecs.find("wvtt"); if (wvtt != codecs.end()) { codecs.erase(wvtt); @@ -258,7 +258,7 @@ void BuildStreamInfTag(const MediaPlaylist& playlist, // supported as output, the HLS output should always indicate that there are // no captions. Explicitly signaling a lack of captions in HLS keeps Safari // from assuming captions and showing a text track that doesn't exist. - // https://github.com/google/shaka-packager/issues/922#issuecomment-804304019 + // https://github.com/shaka-project/shaka-packager/issues/922#issuecomment-804304019 tag.AddString("CLOSED-CAPTIONS", "NONE"); if (playlist.stream_type() == diff --git a/packager/hls/base/master_playlist_unittest.cc b/packager/hls/base/master_playlist_unittest.cc index 9a0d1eb59e..450583341c 100644 --- a/packager/hls/base/master_playlist_unittest.cc +++ b/packager/hls/base/master_playlist_unittest.cc @@ -170,8 +170,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistOneVideo) { const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n" "#EXT-X-STREAM-INF:BANDWIDTH=435889,AVERAGE-BANDWIDTH=235889," "CODECS=\"avc1\",RESOLUTION=800x600,CLOSED-CAPTIONS=NONE\n" @@ -204,8 +204,8 @@ TEST_F(MasterPlaylistTest, const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n#EXT-X-INDEPENDENT-SEGMENTS\n" "\n" "#EXT-X-STREAM-INF:BANDWIDTH=435889,AVERAGE-BANDWIDTH=235889," @@ -233,8 +233,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistOneVideoWithFrameRate) { const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n" "#EXT-X-STREAM-INF:BANDWIDTH=435889,AVERAGE-BANDWIDTH=235889," "CODECS=\"avc1\",RESOLUTION=800x600,FRAME-RATE=60.000," @@ -261,8 +261,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistOneIframePlaylist) { const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n" "#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=435889,AVERAGE-BANDWIDTH=235889," "CODECS=\"avc1\",RESOLUTION=800x600,CLOSED-CAPTIONS=NONE," @@ -316,8 +316,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistVideoAndAudio) { const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n" "#EXT-X-MEDIA:TYPE=AUDIO,URI=\"http://playlists.org/eng.m3u8\"," "GROUP-ID=\"audiogroup\",LANGUAGE=\"en\",NAME=\"english\"," @@ -376,8 +376,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistMultipleAudioGroups) { const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n" "#EXT-X-MEDIA:TYPE=AUDIO,URI=\"http://anydomain.com/eng_hi.m3u8\"," "GROUP-ID=\"audio_hi\",LANGUAGE=\"en\",NAME=\"english_hi\"," @@ -423,8 +423,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistSameAudioGroupSameLanguage) { const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n" "#EXT-X-MEDIA:TYPE=AUDIO,URI=\"http://anydomain.com/eng_lo.m3u8\"," "GROUP-ID=\"audio\",LANGUAGE=\"en\",NAME=\"english\"," @@ -467,8 +467,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistVideosAndTexts) { const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n" "#EXT-X-MEDIA:TYPE=SUBTITLES,URI=\"http://playlists.org/eng.m3u8\"," "GROUP-ID=\"textgroup\",LANGUAGE=\"en\",NAME=\"english\"," @@ -509,8 +509,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistVideoAndTextWithCharacteritics) { const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n" "#EXT-X-MEDIA:TYPE=SUBTITLES,URI=\"http://playlists.org/eng.m3u8\"," "GROUP-ID=\"textgroup\",LANGUAGE=\"en\",NAME=\"english\",AUTOSELECT=YES," @@ -551,8 +551,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistVideoAndDvsAudio) { const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n" "#EXT-X-MEDIA:TYPE=AUDIO,URI=\"http://playlists.org/dvs_eng.m3u8\"," "GROUP-ID=\"audiogroup\",LANGUAGE=\"en\",NAME=\"DVS english\"," @@ -593,8 +593,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistVideoAndTextGroups) { const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n" "#EXT-X-MEDIA:TYPE=SUBTITLES,URI=\"http://playlists.org/eng.m3u8\"," "GROUP-ID=\"en-text-group\",LANGUAGE=\"en\",NAME=\"english\"," @@ -639,8 +639,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistVideoAndAudioAndText) { const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n" "#EXT-X-MEDIA:TYPE=AUDIO,URI=\"http://playlists.org/eng.m3u8\"," "GROUP-ID=\"audiogroup\",LANGUAGE=\"en\",NAME=\"english\"," @@ -712,8 +712,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistMixedPlaylistsDifferentGroups) { const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n" "#EXT-X-MEDIA:TYPE=AUDIO,URI=\"http://playlists.org/audio-1.m3u8\"," "GROUP-ID=\"audio-group-1\",LANGUAGE=\"en\",NAME=\"audio 1\"," @@ -815,8 +815,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistAudioOnly) { const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n" "#EXT-X-MEDIA:TYPE=AUDIO,URI=\"http://playlists.org/audio-1.m3u8\"," "GROUP-ID=\"audio-group-1\",LANGUAGE=\"en\",NAME=\"audio 1\"," @@ -867,8 +867,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistAudioOnlyJOC) { const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n" "#EXT-X-MEDIA:TYPE=AUDIO,URI=\"http://playlists.org/audio-1.m3u8\"," "GROUP-ID=\"audio-group-1\",LANGUAGE=\"en\",NAME=\"audio 1\"," @@ -919,8 +919,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistAudioOnlyAC4IMS) { const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n" "#EXT-X-MEDIA:TYPE=AUDIO,URI=\"http://playlists.org/audio-1.m3u8\"," "GROUP-ID=\"audio-group-1\",LANGUAGE=\"en\",NAME=\"audio 1\"," @@ -972,8 +972,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistAudioOnlyAC4CBI) { const std::string expected = "#EXTM3U\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "\n" "#EXT-X-MEDIA:TYPE=AUDIO,URI=\"http://playlists.org/audio-1.m3u8\"," "GROUP-ID=\"audio-group-1\",LANGUAGE=\"en\",NAME=\"audio 1\"," diff --git a/packager/hls/base/media_playlist.cc b/packager/hls/base/media_playlist.cc index 04feb502a0..4016cdbcc7 100644 --- a/packager/hls/base/media_playlist.cc +++ b/packager/hls/base/media_playlist.cc @@ -42,7 +42,7 @@ std::string AdjustVideoCodec(const std::string& codec) { // samples. It also fails mediastreamvalidator checks and some Apple devices / // platforms refused to play. // See https://apple.co/30n90DC 1.10 and - // https://github.com/google/shaka-packager/issues/587#issuecomment-489182182. + // https://github.com/shaka-project/shaka-packager/issues/587#issuecomment-489182182. // Replaced with the corresponding formats with the parameter sets stored in // the sample descriptions instead. std::string adjusted_codec = codec; @@ -64,7 +64,7 @@ std::string AdjustVideoCodec(const std::string& codec) { // 1. MpdUtils header depends on libxml header, which is not in the deps here // 2. GetLanguage depends on MediaInfo from packager/mpd/ // 3. Moving GetLanguage to LanguageUtils would create a a media => mpd dep. -// TODO(https://github.com/google/shaka-packager/issues/373): Fix this +// TODO(https://github.com/shaka-project/shaka-packager/issues/373): Fix this // dependency situation and factor this out to a common location. std::string GetLanguage(const MediaInfo& media_info) { std::string lang; diff --git a/packager/hls/base/media_playlist_unittest.cc b/packager/hls/base/media_playlist_unittest.cc index 4ef815ebad..7abcd3045e 100644 --- a/packager/hls/base/media_playlist_unittest.cc +++ b/packager/hls/base/media_playlist_unittest.cc @@ -153,8 +153,8 @@ TEST_F(MediaPlaylistSingleSegmentTest, InitRange) { const std::string kExpectedOutput = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:0\n" "#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXT-X-MAP:URI=\"file.mp4\",BYTERANGE=\"501@0\"\n" @@ -173,8 +173,8 @@ TEST_F(MediaPlaylistSingleSegmentTest, InitRangeWithOffset) { const std::string kExpectedOutput = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:0\n" "#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXT-X-MAP:URI=\"file.mp4\",BYTERANGE=\"485@16\"\n" @@ -196,8 +196,8 @@ TEST_F(MediaPlaylistSingleSegmentTest, AddSegmentByteRange) { const std::string kExpectedOutput = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:10\n" "#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXT-X-MAP:URI=\"file.mp4\",BYTERANGE=\"501@0\"\n" @@ -236,8 +236,8 @@ TEST_F(MediaPlaylistMultiSegmentTest, WriteToFile) { const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:0\n" "#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXT-X-ENDLIST\n"; @@ -288,8 +288,8 @@ TEST_F(MediaPlaylistMultiSegmentTest, SetTargetDuration) { const std::string kExpectedOutput = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:20\n" "#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXT-X-ENDLIST\n"; @@ -310,8 +310,8 @@ TEST_F(MediaPlaylistMultiSegmentTest, WriteToFileWithSegments) { const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:30\n" "#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXTINF:10.000,\n" @@ -338,8 +338,8 @@ TEST_F(MediaPlaylistMultiSegmentTest, const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:30\n" "#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXTINF:10.000,\n" @@ -368,8 +368,8 @@ TEST_F(MediaPlaylistMultiSegmentTest, WriteToFileWithEncryptionInfo) { const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:30\n" "#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXT-X-KEY:METHOD=SAMPLE-AES," @@ -400,8 +400,8 @@ TEST_F(MediaPlaylistMultiSegmentTest, WriteToFileWithEncryptionInfoEmptyIv) { const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:30\n" "#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXT-X-KEY:METHOD=SAMPLE-AES," @@ -433,8 +433,8 @@ TEST_F(MediaPlaylistMultiSegmentTest, WriteToFileWithClearLead) { const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:30\n" "#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXTINF:10.000,\n" @@ -567,8 +567,8 @@ TEST_F(MediaPlaylistMultiSegmentTest, InitSegment) { const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:30\n" "#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXT-X-MAP:URI=\"init_segment.mp4\"\n" @@ -599,8 +599,8 @@ TEST_F(MediaPlaylistMultiSegmentTest, SampleAesCenc) { const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:30\n" "#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXT-X-KEY:METHOD=SAMPLE-AES-CTR," @@ -635,8 +635,8 @@ TEST_F(MediaPlaylistMultiSegmentTest, MultipleEncryptionInfo) { const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:30\n" "#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXT-X-KEY:METHOD=SAMPLE-AES," @@ -673,8 +673,8 @@ TEST_F(LiveMediaPlaylistTest, Basic) { const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:20\n" "#EXTINF:10.000,\n" "file1.ts\n" @@ -698,8 +698,8 @@ TEST_F(LiveMediaPlaylistTest, TimeShifted) { const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:20\n" "#EXT-X-MEDIA-SEQUENCE:1\n" "#EXTINF:20.000,\n" @@ -731,8 +731,8 @@ TEST_F(LiveMediaPlaylistTest, TimeShiftedWithEncryptionInfo) { const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:20\n" "#EXT-X-MEDIA-SEQUENCE:1\n" "#EXT-X-KEY:METHOD=SAMPLE-AES," @@ -790,8 +790,8 @@ TEST_F(LiveMediaPlaylistTest, TimeShiftedWithEncryptionInfoShifted) { const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:20\n" "#EXT-X-MEDIA-SEQUENCE:2\n" "#EXT-X-DISCONTINUITY-SEQUENCE:1\n" @@ -835,8 +835,8 @@ TEST_F(EventMediaPlaylistTest, Basic) { const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:20\n" "#EXT-X-PLAYLIST-TYPE:EVENT\n" "#EXTINF:10.000,\n" @@ -880,8 +880,8 @@ TEST_F(IFrameMediaPlaylistTest, SingleSegment) { const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:9\n" "#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXT-X-I-FRAMES-ONLY\n" @@ -922,8 +922,8 @@ TEST_F(IFrameMediaPlaylistTest, MultiSegment) { const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:25\n" "#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXT-X-I-FRAMES-ONLY\n" @@ -964,8 +964,8 @@ TEST_F(IFrameMediaPlaylistTest, MultiSegmentWithPlacementOpportunity) { const char kExpectedOutput[] = "#EXTM3U\n" "#EXT-X-VERSION:6\n" - "## Generated with https://github.com/google/shaka-packager version " - "test\n" + "## Generated with https://github.com/shaka-project/shaka-packager " + "version test\n" "#EXT-X-TARGETDURATION:25\n" "#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXT-X-I-FRAMES-ONLY\n" diff --git a/packager/media/codecs/es_descriptor_unittest.cc b/packager/media/codecs/es_descriptor_unittest.cc index 2458d121e1..4df6affb1a 100644 --- a/packager/media/codecs/es_descriptor_unittest.cc +++ b/packager/media/codecs/es_descriptor_unittest.cc @@ -148,7 +148,7 @@ TEST(ESDescriptorTest, NonAACWithoutDecoderSpecificInfoTagTest) { ElementsAre()); } -// https://github.com/google/shaka-packager/issues/536. +// https://github.com/shaka-project/shaka-packager/issues/536. TEST(ESDescriptorTest, Issue536) { // clang-format off const uint8_t kInput[] = { diff --git a/packager/media/codecs/h26x_bit_reader_unittest.cc b/packager/media/codecs/h26x_bit_reader_unittest.cc index 66f37830f7..fb2b84deec 100644 --- a/packager/media/codecs/h26x_bit_reader_unittest.cc +++ b/packager/media/codecs/h26x_bit_reader_unittest.cc @@ -45,7 +45,8 @@ TEST(H26xBitReaderTest, ReadStreamWithoutEscapeAndTrailingZeroBytes) { TEST(H26xBitReaderTest, ReadPpsWithTrailingZeroByte) { H26xBitReader reader; - // Data copied from https://github.com/google/shaka-packager/issues/418. + // Data copied from + // https://github.com/shaka-project/shaka-packager/issues/418. const unsigned char pps_rbsp[] = {0xee, 0x3c, 0x80, 0x00}; EXPECT_TRUE(reader.Initialize(pps_rbsp, sizeof(pps_rbsp))); diff --git a/packager/media/codecs/nal_unit_to_byte_stream_converter.cc b/packager/media/codecs/nal_unit_to_byte_stream_converter.cc index bf707658c0..18252b41dd 100644 --- a/packager/media/codecs/nal_unit_to_byte_stream_converter.cc +++ b/packager/media/codecs/nal_unit_to_byte_stream_converter.cc @@ -323,7 +323,7 @@ bool NalUnitToByteStreamConverter::ConvertUnitToByteStreamWithSubsamples( // configuration, which is already written. // // For more information see: - // - github.com/google/shaka-packager/issues/327 + // - github.com/shaka-project/shaka-packager/issues/327 // - ISO/IEC 14496-15 5.4.5 Sync Sample // // TODO(kqyang): Parse sample data to figure out which SPS/PPS the diff --git a/packager/media/codecs/vp_codec_configuration_record.cc b/packager/media/codecs/vp_codec_configuration_record.cc index c5c0c31714..831020995f 100644 --- a/packager/media/codecs/vp_codec_configuration_record.cc +++ b/packager/media/codecs/vp_codec_configuration_record.cc @@ -112,7 +112,7 @@ VP9Level LevelFromCharacteristics(uint64_t luma_sample_rate, // max_luma_picture_size are ignored to avoid the extra complexities of // computing those values. It may result in incorrect level being returned. // If this is a problem, please file a bug to - // https://github.com/google/shaka-packager/issues. + // https://github.com/shaka-project/shaka-packager/issues. if (luma_sample_rate <= def.characteristics.max_luma_sample_rate && luma_picture_size <= def.characteristics.max_luma_picture_size) { return def.level; @@ -235,7 +235,7 @@ void VPCodecConfigurationRecord::SetVP9Level(uint16_t width, // extra complexities. It may result in smaller luma_sample_rate may than the // actual luma_sample_rate, leading to incorrect level being returned. // If this is a problem, please file a bug to - // https://github.com/google/shaka-packager/issues. + // https://github.com/shaka-project/shaka-packager/issues. const double kUnknownSampleDuration = 0.0; // The decision is based on luma_picture_size only if duration is unknown. uint64_t luma_sample_rate = 0; diff --git a/packager/media/formats/mp2t/es_parser_h26x_unittest.cc b/packager/media/formats/mp2t/es_parser_h26x_unittest.cc index dd819aa395..a2b86d6abf 100644 --- a/packager/media/formats/mp2t/es_parser_h26x_unittest.cc +++ b/packager/media/formats/mp2t/es_parser_h26x_unittest.cc @@ -380,7 +380,7 @@ TEST_F(EsParserH26xTest, H264BasicSupport) { } // This is not compliant to H264 spec, but VLC generates streams like this. See -// https://github.com/google/shaka-packager/issues/526 for details. +// https://github.com/shaka-project/shaka-packager/issues/526 for details. TEST_F(EsParserH26xTest, H264AudInAccessUnit) { // clang-format off const H26xNaluType kData[] = { diff --git a/packager/media/formats/mp4/box_definitions.cc b/packager/media/formats/mp4/box_definitions.cc index 166727709b..b4c35714d3 100644 --- a/packager/media/formats/mp4/box_definitions.cc +++ b/packager/media/formats/mp4/box_definitions.cc @@ -2429,14 +2429,15 @@ bool Movie::ReadWriteInternal(BoxBuffer* buffer) { // The 'meta' box is not well formed in the video captured by Android's // default camera app: spec indicates that it is a FullBox but it is written // as a Box. This results in the box failed to be parsed. See - // https://github.com/google/shaka-packager/issues/319 for details. + // https://github.com/shaka-project/shaka-packager/issues/319 for details. // We do not care the content of metadata box in the source content, so just // skip reading the box. RCHECK(buffer->TryReadWriteChild(&metadata)); if (FLAGS_mvex_before_trak) { // |extends| has to be written before |tracks| to workaround Android // MediaExtractor bug which requires |mvex| to be placed before |trak|. - // See https://github.com/google/shaka-packager/issues/711 for details. + // See https://github.com/shaka-project/shaka-packager/issues/711 for + // details. RCHECK(buffer->TryReadWriteChild(&extends)); } for (uint32_t i = 0; i < tracks.size(); ++i) diff --git a/packager/media/formats/mp4/track_run_iterator.cc b/packager/media/formats/mp4/track_run_iterator.cc index 0e7d5485a1..2fd836168b 100644 --- a/packager/media/formats/mp4/track_run_iterator.cc +++ b/packager/media/formats/mp4/track_run_iterator.cc @@ -703,7 +703,7 @@ int64_t TrackRunIterator::GetTimestampAdjustment(const Movie& movie, LOG(WARNING) << "Adjusting timestamps by " << -composition_offset << ". Please file a bug to " - "https://github.com/google/shaka-packager/issues if you " + "https://github.com/shaka-project/shaka-packager/issues if you " "do not think it is right or if you are seeing any problems."; timestamp_adjustment = -composition_offset; } diff --git a/packager/media/formats/webm/encrypted_segmenter_unittest.cc b/packager/media/formats/webm/encrypted_segmenter_unittest.cc index 663b9261a6..3982b58b58 100644 --- a/packager/media/formats/webm/encrypted_segmenter_unittest.cc +++ b/packager/media/formats/webm/encrypted_segmenter_unittest.cc @@ -23,10 +23,11 @@ const uint8_t kKeyId[] = { const uint8_t kIv[] = { 0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x23, 0x45, }; +// clang-format off const uint8_t kBasicSupportData[] = { // ID: EBML Header omitted. - // ID: Segment, Payload Size: 432 - 0x18, 0x53, 0x80, 0x67, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xb0, + // ID: Segment, Payload Size: 439 + 0x18, 0x53, 0x80, 0x67, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xb7, // ID: SeekHead, Payload Size: 58 0x11, 0x4d, 0x9b, 0x74, 0xba, // ID: Seek, Payload Size: 11 @@ -39,26 +40,26 @@ const uint8_t kBasicSupportData[] = { 0x4d, 0xbb, 0x8b, // SeekID: binary(4) (Tracks) 0x53, 0xab, 0x84, 0x16, 0x54, 0xae, 0x6b, - // SeekPosition: 182 - 0x53, 0xac, 0x81, 0xb6, + // SeekPosition: 189 + 0x53, 0xac, 0x81, 0xbd, // ID: Seek, Payload Size: 12 0x4d, 0xbb, 0x8c, // SeekID: binary(4) (Cues) 0x53, 0xab, 0x84, 0x1c, 0x53, 0xbb, 0x6b, - // SeekPosition: 279 - 0x53, 0xac, 0x82, 0x01, 0x17, + // SeekPosition: 286 + 0x53, 0xac, 0x82, 0x01, 0x1e, // ID: Seek, Payload Size: 12 0x4d, 0xbb, 0x8c, // SeekID: binary(4) (Cluster) 0x53, 0xab, 0x84, 0x1f, 0x43, 0xb6, 0x75, - // SeekPosition: 313 - 0x53, 0xac, 0x82, 0x01, 0x39, + // SeekPosition: 320 + 0x53, 0xac, 0x82, 0x01, 0x40, // ID: Void, Payload Size: 24 0xec, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - // ID: Info, Payload Size: 88 - 0x15, 0x49, 0xa9, 0x66, 0xd8, + // ID: Info, Payload Size: 95 + 0x15, 0x49, 0xa9, 0x66, 0xdf, // TimecodeScale: 1000000 0x2a, 0xd7, 0xb1, 0x83, 0x0f, 0x42, 0x40, // Duration: float(5000) @@ -66,13 +67,13 @@ const uint8_t kBasicSupportData[] = { // MuxingApp: 'libwebm-0.2.1.0' 0x4d, 0x80, 0x8f, 0x6c, 0x69, 0x62, 0x77, 0x65, 0x62, 0x6d, 0x2d, 0x30, 0x2e, 0x32, 0x2e, 0x31, 0x2e, 0x30, - // WritingApp: 'https://github.com/google/shaka-packager version test' - 0x57, 0x41, 0xb5, + // WritingApp: 'https://github.com/shaka-project/shaka-packager version test' + 0x57, 0x41, 0xbc, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2f, 0x73, 0x68, 0x61, 0x6b, 0x61, 0x2d, 0x70, 0x61, 0x63, 0x6b, - 0x61, 0x67, 0x65, 0x72, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, - 0x20, 0x74, 0x65, 0x73, 0x74, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x68, 0x61, 0x6b, 0x61, + 0x2d, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x73, 0x68, 0x61, + 0x6b, 0x61, 0x2d, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x72, 0x20, + 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x65, 0x73, 0x74, // ID: Tracks, Payload Size: 92 0x16, 0x54, 0xae, 0x6b, 0xdc, // ID: Track, Payload Size: 90 @@ -129,8 +130,8 @@ const uint8_t kBasicSupportData[] = { 0xb7, 0x87, // CueTrack: 1 0xf7, 0x81, 0x01, - // CueClusterPosition: 313 - 0xf1, 0x82, 0x01, 0x39, + // CueClusterPosition: 320 + 0xf1, 0x82, 0x01, 0x40, // ID: CuePoint, Payload Size: 13 0xbb, 0x8d, // CueTime: 3000 @@ -139,8 +140,8 @@ const uint8_t kBasicSupportData[] = { 0xb7, 0x87, // CueTrack: 1 0xf7, 0x81, 0x01, - // CueClusterPosition: 370 - 0xf1, 0x82, 0x01, 0x72, + // CueClusterPosition: 377 + 0xf1, 0x82, 0x01, 0x79, // ID: Cluster, Payload Size: 45 0x1f, 0x43, 0xb6, 0x75, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2d, // Timecode: 0 @@ -192,6 +193,7 @@ const uint8_t kBasicSupportData[] = { // BlockDuration: 1000 0x9b, 0x82, 0x03, 0xe8, }; +// clang-format on } // namespace diff --git a/packager/media/formats/webm/multi_segment_segmenter_unittest.cc b/packager/media/formats/webm/multi_segment_segmenter_unittest.cc index 96d0673804..9acaab67bb 100644 --- a/packager/media/formats/webm/multi_segment_segmenter_unittest.cc +++ b/packager/media/formats/webm/multi_segment_segmenter_unittest.cc @@ -17,6 +17,7 @@ const int32_t kTimeScale = 1000000; const int64_t kDuration = 1000000; const bool kSubsegment = true; +// clang-format off const uint8_t kBasicSupportDataInit[] = { // ID: EBML Header omitted. // ID: Segment, Payload Size: Unknown @@ -30,20 +31,20 @@ const uint8_t kBasicSupportDataInit[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - // ID: Info, Payload Size: 81 - 0x15, 0x49, 0xa9, 0x66, 0xd1, + // ID: Info, Payload Size: 88 + 0x15, 0x49, 0xa9, 0x66, 0xd8, // TimecodeScale: 1000000 0x2a, 0xd7, 0xb1, 0x83, 0x0f, 0x42, 0x40, // MuxingApp: 'libwebm-0.2.1.0' 0x4d, 0x80, 0x8f, 0x6c, 0x69, 0x62, 0x77, 0x65, 0x62, 0x6d, 0x2d, 0x30, 0x2e, 0x32, 0x2e, 0x31, 0x2e, 0x30, - // WritingApp: 'https://github.com/google/shaka-packager version test' - 0x57, 0x41, 0xb5, + // WritingApp: 'https://github.com/shaka-project/shaka-packager version test' + 0x57, 0x41, 0xbc, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2f, 0x73, 0x68, 0x61, 0x6b, 0x61, 0x2d, 0x70, 0x61, 0x63, 0x6b, - 0x61, 0x67, 0x65, 0x72, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, - 0x20, 0x74, 0x65, 0x73, 0x74, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x68, 0x61, 0x6b, 0x61, + 0x2d, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x73, 0x68, 0x61, + 0x6b, 0x61, 0x2d, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x72, 0x20, + 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x65, 0x73, 0x74, // ID: Tracks, Payload Size: 41 0x16, 0x54, 0xae, 0x6b, 0xa9, // ID: Track, Payload Size: 39 @@ -89,6 +90,7 @@ const uint8_t kBasicSupportDataSegment[] = { // BlockDuration: 1000 0x9b, 0x82, 0x03, 0xe8 }; +// clang-format on } // namespace diff --git a/packager/media/formats/webm/single_segment_segmenter_unittest.cc b/packager/media/formats/webm/single_segment_segmenter_unittest.cc index 318cc6ccff..8074f9c8ab 100644 --- a/packager/media/formats/webm/single_segment_segmenter_unittest.cc +++ b/packager/media/formats/webm/single_segment_segmenter_unittest.cc @@ -18,10 +18,11 @@ const int64_t kSecondsToNs = 1000000000L; const int64_t kDuration = 1000000; const bool kSubsegment = true; +// clang-format off const uint8_t kBasicSupportData[] = { // ID: EBML Header omitted. - // ID: Segment, Payload Size: 343 - 0x18, 0x53, 0x80, 0x67, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x57, + // ID: Segment, Payload Size: 350 + 0x18, 0x53, 0x80, 0x67, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x5e, // ID: SeekHead, Payload Size: 57 0x11, 0x4d, 0x9b, 0x74, 0xb8, // ID: Seek, Payload Size: 11 @@ -34,26 +35,26 @@ const uint8_t kBasicSupportData[] = { 0x4d, 0xbb, 0x8b, // SeekID: binary(4) (Tracks) 0x53, 0xab, 0x84, 0x16, 0x54, 0xae, 0x6b, - // SeekPosition: 182 - 0x53, 0xac, 0x81, 0xb6, + // SeekPosition: 189 + 0x53, 0xac, 0x81, 0xbd, // ID: Seek, Payload Size: 12 0x4d, 0xbb, 0x8b, // SeekID: binary(4) (Cues) 0x53, 0xab, 0x84, 0x1c, 0x53, 0xbb, 0x6b, - // SeekPosition: 228 - 0x53, 0xac, 0x81, 0xe4, + // SeekPosition: 235 + 0x53, 0xac, 0x81, 0xeb, // ID: Seek, Payload Size: 11 0x4d, 0xbb, 0x8b, // SeekID: binary(4) (Cluster) 0x53, 0xab, 0x84, 0x1f, 0x43, 0xb6, 0x75, - // SeekPosition: 246 - 0x53, 0xac, 0x81, 0xf6, + // SeekPosition: 253 + 0x53, 0xac, 0x81, 0xfd, // ID: Void, Payload Size: 26 0xec, 0x9a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - // ID: Info, Payload Size: 88 - 0x15, 0x49, 0xa9, 0x66, 0xd8, + // ID: Info, Payload Size: 95 + 0x15, 0x49, 0xa9, 0x66, 0xdf, // TimecodeScale: 1000000 0x2a, 0xd7, 0xb1, 0x83, 0x0f, 0x42, 0x40, // Duration: float(5000) @@ -61,13 +62,13 @@ const uint8_t kBasicSupportData[] = { // MuxingApp: 'libwebm-0.2.1.0' 0x4d, 0x80, 0x8f, 0x6c, 0x69, 0x62, 0x77, 0x65, 0x62, 0x6d, 0x2d, 0x30, 0x2e, 0x32, 0x2e, 0x31, 0x2e, 0x30, - // WritingApp: 'https://github.com/google/shaka-packager version test' - 0x57, 0x41, 0xb5, + // WritingApp: 'https://github.com/shaka-project/shaka-packager version test' + 0x57, 0x41, 0xbc, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2f, 0x73, 0x68, 0x61, 0x6b, 0x61, 0x2d, 0x70, 0x61, 0x63, 0x6b, - 0x61, 0x67, 0x65, 0x72, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, - 0x20, 0x74, 0x65, 0x73, 0x74, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x68, 0x61, 0x6b, 0x61, + 0x2d, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x73, 0x68, 0x61, + 0x6b, 0x61, 0x2d, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x72, 0x20, + 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x65, 0x73, 0x74, // ID: Tracks, Payload Size: 41 0x16, 0x54, 0xae, 0x6b, 0xa9, // ID: Track, Payload Size: 39 @@ -102,8 +103,8 @@ const uint8_t kBasicSupportData[] = { 0xb7, 0x86, // CueTrack: 1 0xf7, 0x81, 0x01, - // CueClusterPosition: 246 - 0xf1, 0x81, 0xf6, + // CueClusterPosition: 253 + 0xf1, 0x81, 0xfd, // ID: Cluster, Payload Size: 85 0x1f, 0x43, 0xb6, 0x75, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, // Timecode: 0 @@ -133,6 +134,7 @@ const uint8_t kBasicSupportData[] = { // BlockDuration: 1000 0x9b, 0x82, 0x03, 0xe8, }; +// clang-format on } // namespace diff --git a/packager/media/formats/webvtt/webvtt_parser.cc b/packager/media/formats/webvtt/webvtt_parser.cc index 197a05bb72..32f2d529f7 100644 --- a/packager/media/formats/webvtt/webvtt_parser.cc +++ b/packager/media/formats/webvtt/webvtt_parser.cc @@ -418,8 +418,8 @@ bool WebVttParser::ParseCue(const std::string& id, // // For more context see: // - https://www.w3.org/TR/webvtt1/#webvtt-cue-timings - // - https://github.com/google/shaka-packager/issues/335 - // - https://github.com/google/shaka-packager/issues/425 + // - https://github.com/shaka-project/shaka-packager/issues/335 + // - https://github.com/shaka-project/shaka-packager/issues/425 // // Print a warning so that those packaging content can know that their // content is not spec compliant. diff --git a/packager/mpd/base/bandwidth_estimator.cc b/packager/mpd/base/bandwidth_estimator.cc index 8ecb3e5ba0..0f91c2e2ab 100644 --- a/packager/mpd/base/bandwidth_estimator.cc +++ b/packager/mpd/base/bandwidth_estimator.cc @@ -101,7 +101,8 @@ uint64_t BandwidthEstimator::GetBitrate(const Block& block, // We also apply the same exclusion to the bandwidth computation for DASH as // the bitrate for the short segment is not a good signal for peak // bandwidth. - // See https://github.com/google/shaka-packager/issues/498 for details. + // See https://github.com/shaka-project/shaka-packager/issues/498 for + // details. VLOG(1) << "Exclude short segment (duration " << block.duration << ", target_duration " << target_block_duration << ") in peak bandwidth computation."; diff --git a/packager/mpd/base/mpd_builder_unittest.cc b/packager/mpd/base/mpd_builder_unittest.cc index acd7ed1c8e..813164715d 100644 --- a/packager/mpd/base/mpd_builder_unittest.cc +++ b/packager/mpd/base/mpd_builder_unittest.cc @@ -264,7 +264,7 @@ TEST_F(LiveMpdBuilderTest, MultiplePeriodCheckXmlTest) { TEST_F(LiveMpdBuilderTest, DynamicCheckMpdAttributes) { static const char kExpectedOutput[] = "\n" - "\n" "\n" - "\n" "