Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ioppermann committed Jul 21, 2022
2 parents b4ecf73 + b2a6a5d commit 2ac8bb5
Show file tree
Hide file tree
Showing 142 changed files with 17,797 additions and 4,678 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build_restreamer-ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ jobs:
context: .
file: ./Dockerfile
build-args: |
PUBLIC_URL=/ui
PUBLIC_URL=./
NODE_IMAGE=${{ env.NODE_IMAGE }}
platforms: linux/amd64,linux/arm64,linux/arm/v7
push: true
tags: |
Expand Down
3 changes: 2 additions & 1 deletion .github_build/Build.restreamer-ui.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# RESTREAMER UI
RELEASE=1.1.0
RELEASE=1.2.0
NODE_IMAGE=node:18.6.0-alpine3.15
1 change: 1 addition & 0 deletions .linguirc
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"de",
"fr",
"it",
"pl",
"pt",
"es",
"ru"
Expand Down
35 changes: 33 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
# Restreamer-UI

#### v1.1.0 > v1.2.0

- Add allow writing HLS to disk
- Add audio pan filter
- Add video rotation filter ([#347](https://github.com/datarhei/restreamer/discussions/347))
- Add video h/v flip filter
- Add audio volume filter ([#313](https://github.com/datarhei/restreamer/issues/313))
- Add audio loudness normalization filter
- Add audio resample filter, that was before part of the encoders
- Add HLS Master playlist (requires FFmpeg hlsbitrate.patch) (thx Dwaynarang, Electra Player compatibility)
- Add LinkedIn & Azure Media Services to publication services (thx kalashnikov)
- Add AirPlay support with silvermine videojs plugin
- Add Chromecast support (thx badincite, [#10](https://github.com/datarhei/restreamer-ui/pull/10))
- Add stream distribution across multiple internal servers
- Add SRT settings
- Add HLS version selection (thx Dwaynarang, Electra Player compatibility)
- Add Owncast to publication services ([#369](https://github.com/datarhei/restreamer/issues/369))
- Add Telegram to publication services (thx Martin Held)
- Add Polish translations (thx Robert Rykała)
- Mod extends the datarhei Core publication service with srt streaming
- Mod allow decoders and encoders to set global options
- Mod allow trailing slash on Core address
- Fix player problem with different stream formats (9:16)
- Fix process report naming
- Fix publication service icon styles
- Fix VAAPI encoder

Dependency:

- datarhei Core v16.9.0+

#### v1.0.0 > v1.1.0

- Add compatibility list for encoders
Expand All @@ -9,8 +40,9 @@
- Add missed VAAPI encoder
- Add missed V4L2_M2M encoder
- Add missed Raspberry Pi 64bit Docker image
- Mod updates VideoJS
- Add option to disable playersites share-button (thx Anders Mellgren)
- Add security pr
- Mod updates VideoJS
- Fix hides unset content license on playersite (thx Anders Mellgren)
- Fix updates V4L2 device-list on select
- Fix snapshot interval ([#341](https://github.com/datarhei/restreamer/issues/340))
Expand All @@ -21,7 +53,6 @@
- Fix datarhei Core publication service
- Fix dependabot alerts
- Fix code scanning alerts
- Merge security pr

Preparation for FFmpeg v5.0 (migration will not work)

Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
FROM node:17.9.0-alpine3.15
ARG NODE_IMAGE=node:18.6.0-alpine3.15

FROM $NODE_IMAGE

ARG NODE_SPACE_SIZE=10240
ENV NODE_OPTIONS="--openssl-legacy-provider --max-old-space-size=$NODE_SPACE_SIZE"

ARG PUBLIC_URL "/"
ENV PUBLIC_URL "./"

COPY . /ui

Expand Down
22 changes: 20 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Restreamer-UI

The user interface of the Restreamer for the connection to the Core application.
The user interface of the Restreamer for the connection to the [datarhei Core](https://github.com/datarhei/core)application.

- React
- Material-UI (MUI)
Expand All @@ -17,7 +17,7 @@ $ npm run start
```

Connect the UI with a [datarhei Core](https://github.com/datarhei/core):
http://localhost:3000?address=http://core-ip:core-port/
http://localhost:3000?address=http://core-ip:core-port

### To add/fix translations:
Locales are located in `src/locals`
Expand All @@ -26,5 +26,23 @@ $ npm run i18n-extract:clean
$ npm run i18n-compile
```

### Known outdated dependencies
Requires MUI 5.2+ & React 18 compatibility. Clappr-Player upgrade (or removal).

```sh
@mui/material 5.1.1 → 5.9.0
@mui/styles ^5.1.1 → ^5.9.0
@testing-library/dom ^8.13.0 → ^8.16.0
@testing-library/jest-dom ^4.2.4 → ^5.16.4
@testing-library/react ^12.1.5 → ^13.3.0
@testing-library/user-event ^13.5.0 → ^14.2.5
eslint ^7.32.0 → ^8.19.0
hls.js ^0.14.17 → ^1.1.5
react ^17.0.2 → ^18.2.0
react-dom ^17.0.2 → ^18.2.0
react-scripts ^4.0.3 → ^5.0.1
typescript ^3.9.7 → ^4.7.4
```

## License
See the [LICENSE](./LICENSE) file for licensing information.
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"name": "restreamer-ui",
"version": "1.1.0",
"bundle": "restreamer-v2.1.0",
"version": "1.2.0",
"bundle": "restreamer-v2.2.0",
"private": false,
"license": "Apache-2.0",
"dependencies": {
"@auth0/auth0-spa-js": "^1.22.0",
"@auth0/auth0-spa-js": "^1.22.1",
"@clappr/core": "^0.4.21",
"@clappr/hlsjs-playback": "^0.6.0",
"@clappr/plugins": "^0.4.16",
"@clappr/stats-plugin": "^0.2.0",
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
"@emotion/react": "^11.9.3",
"@emotion/styled": "^11.9.3",
"@fontsource/dosis": "^4.5.8",
"@fontsource/roboto": "^4.5.7",
"@fortawesome/fontawesome-svg-core": "^6.1.1",
"@fortawesome/free-brands-svg-icons": "^6.1.1",
"@fortawesome/free-solid-svg-icons": "^6.1.1",
"@fortawesome/react-fontawesome": "^0.1.18",
"@lingui/core": "^3.13.3",
"@lingui/macro": "^3.13.3",
"@lingui/react": "^3.13.3",
"@mui/icons-material": "^5.8.2",
"@mui/lab": "^5.0.0-alpha.84",
"@fortawesome/react-fontawesome": "^0.2.0",
"@lingui/core": "^3.14.0",
"@lingui/macro": "^3.14.0",
"@lingui/react": "^3.14.0",
"@mui/icons-material": "^5.8.4",
"@mui/lab": "^5.0.0-alpha.90",
"@mui/material": "5.1.1",
"@mui/styles": "^5.1.1",
"@testing-library/dom": "^8.13.0",
Expand Down Expand Up @@ -82,10 +82,10 @@
]
},
"devDependencies": {
"@babel/core": "^7.18.2",
"@lingui/cli": "^3.13.3",
"@babel/core": "^7.18.6",
"@lingui/cli": "^3.14.0",
"babel-core": "^7.0.0-bridge.0",
"prettier": "^2.6.2",
"prettier": "^2.7.1",
"react-error-overlay": "^6.0.11"
},
"resolutions": {
Expand Down
15 changes: 15 additions & 0 deletions public/_player/videojs/dist/ic_airplay_white_24px.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/_player/videojs/dist/ic_cast_white_24dp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/_player/videojs/dist/videojs-airplay.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2ac8bb5

Please sign in to comment.