Skip to content

Commit bfad210

Browse files
authored
Release v0.3.0 (#18)
* Release v0.3.0 * Update readme * Update release github actions * mix format
1 parent 61f6084 commit bfad210

4 files changed

Lines changed: 36 additions & 18 deletions

File tree

.github/workflows/release.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,10 @@ jobs:
3232

3333
- name: Create Checksum
3434
run: |
35-
chmod +x ./burrito_out/*
36-
shasum -a 256 ./burrito_out/* > shinkai_checksums.txt
37-
38-
- name: Create GitHub Release
39-
id: create_release
40-
uses: actions/create-release@v1
41-
with:
42-
tag_name: ${{ github.ref_name }}
43-
release_name: Release ${{ github.ref_name }}
44-
draft: true
35+
cd ./burrito_out
36+
chmod +x ./*
37+
shasum -a 256 ./* > shinkai_checksums.txt
38+
cd ..
4539
4640
- name: Publish archives and packages
4741
uses: softprops/action-gh-release@v1
@@ -50,4 +44,3 @@ jobs:
5044
generate_release_notes: true
5145
files: |
5246
./burrito_out/*
53-
./shinkai_checksums.txt

README.md

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ Live streams can be published to the server using:
66

77
| Protocol | Variants | Video Codecs | Audio Codecs |
88
|----------|----------|--------------|--------------|
9-
| RTSP client/cameras | TCP/UDP | H264, H265, AV1 | MPEG-4(AAC), G711(PCMA/PCMU) |\
10-
| RTMP client/publish | - | H264, H265, AV1 | MPEG-4(AAC), G711(PCMA/PCMU) |
9+
| RTSP client/cameras/publish | TCP/UDP | H264, H265, AV1 | MPEG-4(AAC), G711(PCMA/PCMU), Opus |
10+
| RTMP client/publish | - | H264, H265, AV1 | MPEG-4(AAC), G711(PCMA/PCMU), Opus |
1111

1212
Live streams can be read from the server with:
1313

1414
| Protocol | Variants | Video Codecs | Audio Codecs |
1515
|----------|----------|--------------|--------------|
1616
| HLS | fMP4/mpeg-ts/Low Latency | H264, H265, AV1 | MPEG-4(AAC) |
17+
| RTMP | - | H264, H265, AV1 | MPEG-4(AAC), G711(PCMA/PCMU), Opus |
1718

1819
## Usage and configuration
1920

@@ -29,33 +30,48 @@ Check the [configuration documentation](https://hexdocs.pm/shinkai/Shinkai.html)
2930
[HLS](https://developer.apple.com/streaming/) (HTTP Live Streaming) is an http based protocol widely supported on many devices. It works by splitting the media stream into small chunks and serving them over HTTP.
3031

3132
You can access the generated HLS by hitting the web page at:
32-
```
33+
```bash
3334
http://localhost:8888/hls/<stream_name>
3435
```
3536

3637
or get the manifest file link and feed it to your player:
37-
```
38+
```bash
3839
ffplay http://localhost:8888/hls/<stream_name>/master.m3u8
3940
```
4041

4142
### RTMP
4243
[RTMP](https://en.wikipedia.org/wiki/Real-Time_Messaging_Protocol) (Real-Time Messaging Protocol) is a protocol for streaming audio, video, and data over the internet. It is widely used for live streaming applications.
4344

4445
To publish a stream to the server using RTMP, you can use `ffmpeg`:
45-
```
46+
```bash
4647
ffmpeg -re -i input.mp4 -c copy -f flv rtmp://localhost:1935/live/test
4748
```
4849

4950
The stream will be available under the name `live-test` for playback.
5051

52+
To play any source using rtmp, you can use the source name as follows:
53+
```bash
54+
rtmp://localhost:1935/<stream_name>
55+
```
56+
57+
### RTSP
58+
[RTSP](https://en.wikipedia.org/wiki/Real_Time_Streaming_Protocol) (Real-Time Streaming Protocol) is an application-level network protocol designed for multiplexing and packetizing multimedia transport streams (such as interactive media, video and audio) over a suitable transport protocol.
59+
60+
To publish a stream to the server using RTSP, you can use `ffmpeg`:
61+
```bash
62+
ffmpeg -re -i input.mp4 -c copy -f rtsp rtsp://localhost:8554/live/test
63+
```
64+
65+
The stream will be available under the name `live-test` for playback.
66+
5167
## Installation
5268

5369
The package can be installed by adding `shinkai` to your list of dependencies in `mix.exs`:
5470

5571
```elixir
5672
def deps do
5773
[
58-
{:shinkai, "~> 0.2.0"}
74+
{:shinkai, "~> 0.3.0"}
5975
]
6076
end
6177
```

lib/shinkai/application.ex

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ defmodule Shinkai.Application do
33

44
use Application
55

6+
require Logger
7+
68
alias Shinkai.Sources
79

810
def start(_type, _args) do
@@ -40,6 +42,13 @@ defmodule Shinkai.Application do
4042
children
4143
end
4244

45+
# Macro.camelize(to_string(:live)) is there to create :live macro
46+
# because burrito releases fails when an rtmp stream is published with
47+
# :live atom not existing.
48+
Logger.info(
49+
"Shinkai #{Macro.camelize(to_string(:live))} Media Server v#{Application.spec(:shinkai, :vsn)}"
50+
)
51+
4352
opts = [strategy: :one_for_one, name: Shinkai.Supervisor]
4453
Supervisor.start_link(children, opts)
4554
end

mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
defmodule Shinkai.MixProject do
22
use Mix.Project
33

4-
@version "0.2.0"
4+
@version "0.3.0"
55
@github_url "https://github.com/elixir-streaming/shinkai"
66

77
def project do

0 commit comments

Comments
 (0)