Skip to content

Commit

Permalink
chore: Update URLs after moving projects (#117)
Browse files Browse the repository at this point in the history
  • Loading branch information
joeyparrish authored Mar 3, 2022
1 parent 7a06537 commit 3634f0b
Show file tree
Hide file tree
Showing 13 changed files with 94 additions and 93 deletions.
120 changes: 60 additions & 60 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
## 0.5.1 (2021-10-14)

- Require Shaka Packager v2.6.1+, to fix segfault in Linux binaries
(https://github.com/google/shaka-packager/issues/996)
(https://github.com/shaka-project/shaka-packager/issues/996)


## 0.5.0 (2021-10-01)

- Command-line argument style changed (dashes instead of underscores)
- Multi period support for DASH
(https://github.com/google/shaka-streamer/issues/43)
(https://github.com/google/shaka-streamer/pull/78)
(https://github.com/google/shaka-streamer/pull/91)
(https://github.com/shaka-project/shaka-streamer/issues/43)
(https://github.com/shaka-project/shaka-streamer/pull/78)
(https://github.com/shaka-project/shaka-streamer/pull/91)
- Multi period support for HLS
(https://github.com/google/shaka-streamer/issues/43)
(https://github.com/google/shaka-streamer/pull/83)
(https://github.com/google/shaka-streamer/pull/91)
(https://github.com/shaka-project/shaka-streamer/issues/43)
(https://github.com/shaka-project/shaka-streamer/pull/83)
(https://github.com/shaka-project/shaka-streamer/pull/91)
- LL-DASH support
(https://github.com/google/shaka-streamer/pull/88)
(https://github.com/shaka-project/shaka-streamer/pull/88)
- Require Python 3.6+
- Require Shaka Packager v2.6+
- New shaka-streamer-binaries package for binary dependencies;
add argument --use-system-binaries to use your system-installed deps instead
(https://github.com/google/shaka-streamer/issues/60)
(https://github.com/google/shaka-streamer/pull/87)
(https://github.com/google/shaka-streamer/pull/92)
(https://github.com/shaka-project/shaka-streamer/issues/60)
(https://github.com/shaka-project/shaka-streamer/pull/87)
(https://github.com/shaka-project/shaka-streamer/pull/92)
- Fix framerate detection for mixed-framerate content
(https://github.com/google/shaka-streamer/issues/90)
(https://github.com/google/shaka-streamer/pull/93)
(https://github.com/shaka-project/shaka-streamer/issues/90)
(https://github.com/shaka-project/shaka-streamer/pull/93)
- Fix cloud upload errors for S3
(https://github.com/google/shaka-streamer/issues/67)
(https://github.com/shaka-project/shaka-streamer/issues/67)
- Report clear error if an input track does not exist
(https://github.com/google/shaka-streamer/issues/89)
(https://github.com/google/shaka-streamer/pull/94)
(https://github.com/shaka-project/shaka-streamer/issues/89)
(https://github.com/shaka-project/shaka-streamer/pull/94)
- Fix orphaned subprocesses using CTRL-C
(https://github.com/google/shaka-streamer/issues/46)
(https://github.com/google/shaka-streamer/pull/96)
(https://github.com/shaka-project/shaka-streamer/issues/46)
(https://github.com/shaka-project/shaka-streamer/pull/96)
- Add webcam and microphone support on Windows
(https://github.com/google/shaka-streamer/pull/95)
(https://github.com/shaka-project/shaka-streamer/pull/95)


## 0.4.0 (2021-08-26)
Expand All @@ -49,102 +49,102 @@
playback in Shaka Player
- Require Shaka Packager v2.5+
- Add AV1 support
(https://github.com/google/shaka-streamer/issues/10)
(https://github.com/shaka-project/shaka-streamer/issues/10)
- Drop `raw_images` input type
(https://github.com/google/shaka-streamer/issues/25)
(https://github.com/shaka-project/shaka-streamer/issues/25)
- Fix duplicate transcoder outputs with multiple audio languages
- Fix resolution autodetection boundary cases
- Add support for extracting text streams from multiplexed inputs
(https://github.com/google/shaka-streamer/issues/53)
(https://github.com/shaka-project/shaka-streamer/issues/53)
- Improved type-checking and type annotations
- Fix install commands in docs
(https://github.com/google/shaka-streamer/issues/56)
(https://github.com/shaka-project/shaka-streamer/issues/56)
- Fix various test failures and test-runner bugs
- Fix packaging failures with long-running content
(https://github.com/google/shaka-streamer/issues/64)
(https://github.com/shaka-project/shaka-streamer/issues/64)
- Add raw-key support
(https://github.com/google/shaka-streamer/issues/21)
(https://github.com/google/shaka-streamer/pull/63)
(https://github.com/shaka-project/shaka-streamer/issues/21)
(https://github.com/shaka-project/shaka-streamer/pull/63)
- Add support for ac3 and ec3
(https://github.com/google/shaka-streamer/issues/37)
(https://github.com/google/shaka-streamer/pull/69)
(https://github.com/shaka-project/shaka-streamer/issues/37)
(https://github.com/shaka-project/shaka-streamer/pull/69)
- Fix running tests from any directory
(https://github.com/google/shaka-streamer/issues/49)
(https://github.com/google/shaka-streamer/pull/71)
(https://github.com/shaka-project/shaka-streamer/issues/49)
(https://github.com/shaka-project/shaka-streamer/pull/71)
- Add config file with Apple's HLS recommendations
(https://github.com/google/shaka-streamer/issues/70)
(https://github.com/google/shaka-streamer/pull/72)
(https://github.com/shaka-project/shaka-streamer/issues/70)
(https://github.com/shaka-project/shaka-streamer/pull/72)
- Add support for HEVC video codec
(https://github.com/google/shaka-streamer/pull/74)
(https://github.com/shaka-project/shaka-streamer/pull/74)
- Restrict WebM formats to DASH, omit from HLS
(https://github.com/google/shaka-streamer/issues/18)
(https://github.com/google/shaka-streamer/pull/80)
(https://github.com/shaka-project/shaka-streamer/issues/18)
(https://github.com/shaka-project/shaka-streamer/pull/80)
- Automatic frame rate reduction
(https://github.com/google/shaka-streamer/pull/77)
(https://github.com/shaka-project/shaka-streamer/pull/77)
- Fix missing members in docs, auto-link to types in config docs
- Change the documentation theme
- Set channel count as an input feature, downmix as needed
(https://github.com/google/shaka-streamer/issues/38)
(https://github.com/google/shaka-streamer/pull/84)
(https://github.com/shaka-project/shaka-streamer/issues/38)
(https://github.com/shaka-project/shaka-streamer/pull/84)
- Add Windows support
(https://github.com/google/shaka-streamer/issues/8)
(https://github.com/google/shaka-streamer/pull/85)
(https://github.com/shaka-project/shaka-streamer/issues/8)
(https://github.com/shaka-project/shaka-streamer/pull/85)
- Add HTTP url output support
(https://github.com/google/shaka-streamer/pull/82)
(https://github.com/shaka-project/shaka-streamer/pull/82)
- Fix accidental live-type DASH output in VOD mode


## 0.3.0 (2019-10-18)

- Added autodetection of frame rate, resolution, interlacing, track numbers
- Added support for custom resolutions and bitrates
(https://github.com/google/shaka-streamer/issues/5)
(https://github.com/shaka-project/shaka-streamer/issues/5)
- Added hardware encoding on macOS
(https://github.com/google/shaka-streamer/issues/23)
(https://github.com/shaka-project/shaka-streamer/issues/23)
- Added support for NVENC-backed hardware encoding on Linux
- Fixed several issues in the docs, including installation instructions
- Complain if ffprobe is missing
(https://github.com/google/shaka-streamer/issues/35)
(https://github.com/shaka-project/shaka-streamer/issues/35)
- Fix PyYAML deprecation warning and YAML loading vulnerability
(https://github.com/google/shaka-streamer/issues/35)
(https://github.com/shaka-project/shaka-streamer/issues/35)
- Fixed resolution name (1440p vs 2k)
- Updated default bitrates
- Added definition of 8k resolution
- Now rejects unsupported features in text inputs
(https://github.com/google/shaka-streamer/issues/34)
(https://github.com/shaka-project/shaka-streamer/issues/34)
- Fixed cloud upload for VOD
(https://github.com/google/shaka-streamer/issues/30)
(https://github.com/shaka-project/shaka-streamer/issues/30)
- Added webcam support on macOS
(https://github.com/google/shaka-streamer/issues/29)
(https://github.com/shaka-project/shaka-streamer/issues/29)
- Make common errors easier to read
- Fixed early shutdown and missing files
(https://github.com/google/shaka-streamer/issues/32)
(https://github.com/shaka-project/shaka-streamer/issues/32)
- Added a check for gsutil and for cloud destination write access
- Speed up VP9 software encoding
- Fixed rounding errors in width in HLS playlist
(https://github.com/google/shaka-streamer/issues/36)
(https://github.com/shaka-project/shaka-streamer/issues/36)


## 0.2.0 (2019-10-14)

- Comprehensive docs now on GitHub Pages: https://google.github.io/shaka-streamer/
(https://github.com/google/shaka-streamer/issues/22)
- Comprehensive docs now on GitHub Pages: https://shaka-project.github.io/shaka-streamer/
(https://github.com/shaka-project/shaka-streamer/issues/22)
- Fixed orphaned processes on shutdown
(https://github.com/google/shaka-streamer/issues/20)
(https://github.com/shaka-project/shaka-streamer/issues/20)
- Improved cloud upload performance
(https://github.com/google/shaka-streamer/issues/19)
(https://github.com/shaka-project/shaka-streamer/issues/19)
- Added a setting for debug logging
(https://github.com/google/shaka-streamer/issues/12)
(https://github.com/shaka-project/shaka-streamer/issues/12)
- Fixed support for 6-channel audio
(https://github.com/google/shaka-streamer/issues/6)
(https://github.com/shaka-project/shaka-streamer/issues/6)
- Added support for arbitrary FFmpeg filters
(https://github.com/google/shaka-streamer/issues/4)
(https://github.com/shaka-project/shaka-streamer/issues/4)
- Added support for setting presentation delay
(https://github.com/google/shaka-streamer/issues/3)
(https://github.com/shaka-project/shaka-streamer/issues/3)
- Added support for setting availability window
(https://github.com/google/shaka-streamer/issues/2)
(https://github.com/shaka-project/shaka-streamer/issues/2)
- Added support for extracting a small time range for VOD
(https://github.com/google/shaka-streamer/issues/1)
(https://github.com/shaka-project/shaka-streamer/issues/1)
- Added support for external commands that generate input streams
- Added support for push to Amazon S3 (gsutil supports both GCS and S3)
- Added a quiet mode
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# ![Shaka Streamer](https://raw.githubusercontent.com/google/shaka-streamer/master/docs/source/shaka-streamer-logo.png)
# ![Shaka Streamer](https://raw.githubusercontent.com/shaka-project/shaka-streamer/main/docs/source/shaka-streamer-logo.png)

Shaka Streamer offers a simple config-file based approach to preparing streaming
media. It greatly simplifies the process of using FFmpeg and Shaka Packager for
both VOD and live content.

Live documentation can be found at https://google.github.io/shaka-streamer/
and is generated from the `docs/source/` folder, as well as the source code
itself.
Live documentation can be found at
https://shaka-project.github.io/shaka-streamer/ and is generated from the
`docs/source/` folder, as well as the source code itself.

Sample configs can be found in the [`config_files/`] folder in the repo.

[`config_files/`]: https://github.com/google/shaka-streamer/tree/master/config_files
[`config_files/`]: https://github.com/shaka-project/shaka-streamer/tree/main/config_files

Release versions of Shaka Streamer can be installed or upgraded through `pip3`
with:
Expand Down
4 changes: 2 additions & 2 deletions binaries/build_wheels.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
'macosx_10_9_x86_64': '-osx-x64',
}

FFMPEG_DL_PREFIX = 'https://github.com/joeyparrish/static-ffmpeg-binaries/releases/download/' + FFMPEG_VERSION
PACKAGER_DL_PREFIX = 'https://github.com/google/shaka-packager/releases/download/' + PACKAGER_VERSION
FFMPEG_DL_PREFIX = 'https://github.com/shaka-project/static-ffmpeg-binaries/releases/download/' + FFMPEG_VERSION
PACKAGER_DL_PREFIX = 'https://github.com/shaka-project/shaka-packager/releases/download/' + PACKAGER_VERSION

# The download links to each binary. These download links
# aren't complete, they miss the platfrom-specific suffix.
Expand Down
4 changes: 2 additions & 2 deletions binaries/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
description='A package containing FFmpeg, FFprobe, and Shaka Packager static builds.',
long_description=('An auxiliary package that provides platform-specific'
' binaries used by Shaka Streamer.'),
url='https://github.com/google/shaka-streamer/tree/master/binaries',
url='https://github.com/shaka-project/shaka-streamer/tree/main/binaries',
packages=[streamer_binaries.__name__,],
classifiers=[
'Programming Language :: Python :: 3',
Expand All @@ -42,4 +42,4 @@
# Only add the corresponding platform specific binaries to the wheel.
streamer_binaries.__name__: platform_binaries,
}
)
)
2 changes: 1 addition & 1 deletion docs/source/configuration_fields.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ the `config_files/`_ folder and browse through some examples. If you are trying
to customize one of those examples or get more details on supported options,
this document is for you.

.. _config_files/: https://github.com/google/shaka-streamer/tree/master/config_files
.. _config_files/: https://github.com/shaka-project/shaka-streamer/tree/main/config_files


Input Configs
Expand Down
10 changes: 5 additions & 5 deletions docs/source/overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,11 @@ the ``shaka-streamer`` script as an example of how to do this. See also
:doc:`module_api`.


.. _config_files/: https://github.com/google/shaka-streamer/tree/master/config_files
.. _issue #8: https://github.com/google/shaka-streamer/issues/8
.. _issue #17: https://github.com/google/shaka-streamer/issues/17
.. _issue #23: https://github.com/google/shaka-streamer/issues/23
.. _config_files/: https://github.com/shaka-project/shaka-streamer/tree/main/config_files
.. _issue #8: https://github.com/shaka-project/shaka-streamer/issues/8
.. _issue #17: https://github.com/shaka-project/shaka-streamer/issues/17
.. _issue #23: https://github.com/shaka-project/shaka-streamer/issues/23
.. _Python 3.6+: https://www.python.org/downloads/
.. _Python "yaml" module: https://pyyaml.org/
.. _Shaka Packager: https://github.com/google/shaka-packager
.. _Shaka Packager: https://github.com/shaka-project/shaka-packager
.. _FFmpeg: https://ffmpeg.org/
10 changes: 5 additions & 5 deletions docs/source/prerequisites.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,17 @@ These binaries can be installed for your platform easily with the
pip3 install shaka-streamer-binaries
The static FFmpeg builds are pulled from here:
https://github.com/joeyparrish/static-ffmpeg-binaries
https://github.com/shaka-project/static-ffmpeg-binaries

The static Shaka Packager builds are pulled from here:
https://github.com/google/shaka-packager
https://github.com/shaka-project/shaka-packager


Shaka Packager (manual installation, not recommended)
-----------------------------------------------------

Pre-built Shaka Packager binaries can be downloaded from github here:
https://github.com/google/shaka-packager/releases
https://github.com/shaka-project/shaka-packager/releases

To install a Shaka Packager binary on Linux:

Expand All @@ -75,7 +75,7 @@ To install a Shaka Packager binary on Linux:
/usr/local/bin/packager
To build Shaka Packager from source, follow instructions here:
https://google.github.io/shaka-packager/html/build_instructions.html
https://shaka-project.github.io/shaka-packager/html/build_instructions.html


FFmpeg (manual installation, not recommended)
Expand Down Expand Up @@ -174,7 +174,7 @@ To install Node.js and NPM on any other platform, you can try one of these:
* https://nodejs.org/en/download/

.. _Python "yaml" module: https://pyyaml.org/
.. _Shaka Packager: https://github.com/google/shaka-packager
.. _Shaka Packager: https://github.com/shaka-project/shaka-packager
.. _FFmpeg: https://ffmpeg.org/
.. _Homebrew: https://brew.sh/
.. _boto config file: http://boto.cloudhackers.com/en/latest/boto_config_tut.html
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
description='A simple config-file based approach to streaming media.',
long_description=long_description,
long_description_content_type='text/markdown',
url='https://github.com/google/shaka-streamer',
url='https://github.com/shaka-project/shaka-streamer',
packages=setuptools.find_packages(),
install_requires=[
'PyYAML',
Expand Down
3 changes: 2 additions & 1 deletion shaka-streamer
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ Shaka Streamer offers a simple config-file based approach to preparing streaming
media. It greatly simplifies the process of using FFmpeg and Shaka Packager for
both VOD and live content.
Full documentation can be found at https://google.github.io/shaka-streamer/
Full documentation can be found at
https://shaka-project.github.io/shaka-streamer/
"""

import argparse
Expand Down
2 changes: 1 addition & 1 deletion streamer/input_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ def __init__(self, dictionary: Dict[str, Any]):
"""

assert isinstance(dictionary, dict), """Malformed Input Config File,
See some examples at https://github.com/google/shaka-streamer/tree/master/config_files.
See some examples at https://github.com/shaka-project/shaka-streamer/tree/main/config_files.
"""

if (dictionary.get('inputs') is not None
Expand Down
6 changes: 3 additions & 3 deletions streamer/periodconcat_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ def find(elem: ElementTree.Element, *args: str) -> ElementTree.Element:

contents = "<?xml version='1.0' encoding='UTF-8'?>\n"
# TODO: Add Shaka-Packager version to this xml comment.
contents += "<!--Generated with https://github.com/google/shaka-packager -->\n"
contents += "<!--Made Multi-Period with https://github.com/google/shaka-streamer version {} -->\n".format(__version__)
contents += "<!--Generated with https://github.com/shaka-project/shaka-packager -->\n"
contents += "<!--Made Multi-Period with https://github.com/shaka-project/shaka-streamer version {} -->\n".format(__version__)

# xml.ElementTree replaces the default namespace with 'ns0'.
# Register the DASH namespace back as the default namespace before converting to string.
Expand Down Expand Up @@ -190,6 +190,6 @@ def _hls_concat(self) -> None:
# passed to the HLSConcater at the construction time.
hls_concater.concat_and_write(
self._pipeline_config.hls_output,
'Concatenated with https://github.com/google/shaka-streamer'
'Concatenated with https://github.com/shaka-project/shaka-streamer'
' version {}'.format(__version__),
)
4 changes: 2 additions & 2 deletions streamer/transcoder_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def _encode_audio(self, stream: AudioOutputStream, input: Input) -> List[str]:

if stream.layout.max_channels == 6:
filters += [
# Work around for https://github.com/google/shaka-packager/issues/598,
# Work around for https://github.com/shaka-project/shaka-packager/issues/598,
# as seen on https://trac.ffmpeg.org/ticket/6974
'channelmap=channel_layout=5.1',
]
Expand Down Expand Up @@ -229,7 +229,7 @@ def _encode_video(self, stream: VideoOutputStream, input: Input) -> List[str]:
# that are very close to 1, such as 5120:5123. In HLS, the behavior is
# worse. Some of the width values in the playlist wind up off by one,
# which causes playback failures in ExoPlayer.
# https://github.com/google/shaka-streamer/issues/36
# https://github.com/shaka-project/shaka-streamer/issues/36
filters.append('setsar=1:1')

if (stream.codec in {VideoCodec.H264, VideoCodec.HEVC}
Expand Down
Loading

0 comments on commit 3634f0b

Please sign in to comment.