Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Feature/srt #14

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
  [![badge](https://img.shields.io/github/stars/apivideo/api.video-android-live-stream?style=social)](https://github.com/apivideo/api.video-android-live-stream)
  [![badge](https://img.shields.io/discourse/topics?server=https%3A%2F%2Fcommunity.api.video)](https://community.api.video)
![](https://github.com/apivideo/.github/blob/main/assets/apivideo_banner.png)
<h1 align="center">Android RTMP live stream client</h1>
<h1 align="center">Android RTMP and SRT live stream client</h1>

[api.video](https://api.video) is the video infrastructure for product builders. Lightning fast
video APIs for integrating, scaling, and managing on-demand & low latency live streaming features in
Expand Down Expand Up @@ -154,8 +154,8 @@ You can check device supported configurations by using the helper: `Helper`

We are using external library

| Plugin | README |
| ------ | ------ |
| Plugin | README |
|---------------------------------------------------------|------------------------------------------------------------------------------|
| [StreamPack](https://github.com/ThibaultBee/StreamPack) | [README.md](https://github.com/ThibaultBee/StreamPack/blob/master/README.md) |

## Sample application
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ buildscript {
versionName = "${properties['VERSION_NAME']}"

// StreamPack
streamPackVersion = "2.6.1"
streamPackVersion = "3.0.0"
}
}
plugins {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ class Configuration(context: Context) {
class Endpoint(private val sharedPref: SharedPreferences, private val resources: Resources) {
var url: String = ""
get() = sharedPref.getString(
resources.getString(R.string.rtmp_endpoint_url_key),
resources.getString(R.string.server_url_key),
field
)!!

var streamKey: String = ""
get() = sharedPref.getString(resources.getString(R.string.rtmp_stream_key_key), field)!!
get() = sharedPref.getString(resources.getString(R.string.stream_key_key), field)!!
}
}
10 changes: 5 additions & 5 deletions example/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
<string name="audio_enable_echo_canceler_key">audio_enable_echo_canceler_key</string>
<string name="audio_enable_noise_suppressor_key">audio_enable_noise_suppressor_key</string>
<string name="audio_enable_noise_suppressor">Enable noise suppressor</string>
<string name="default_rtmp_endpoint">rtmp://broadcast.api.video/s/</string>
<string name="rtmp_endpoint_url_key">rtmp_address_key</string>
<string name="rtmp_endpoint_url">RTMP endpoint</string>
<string name="rtmp_stream_key_key">rtmp_stream_key_key</string>
<string name="rtmp_stream_key">Stream key</string>
<string name="default_server_url">rtmp://broadcast.api.video/s/</string>
<string name="server_url_key">server_url_key</string>
<string name="server_url">RTMP or SRT server URL</string>
<string name="stream_key_key">stream_key_key</string>
<string name="stream_key">RTMP Stream key or SRT stream id</string>
<string name="permissions">Permissions</string>
<string name="permission_not_granted">Permissions not granted: leaving!</string>
</resources>
10 changes: 5 additions & 5 deletions example/src/main/res/xml/preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@

<PreferenceCategory app:title="@string/endpoint">
<EditTextPreference
android:defaultValue="@string/default_rtmp_endpoint"
app:key="@string/rtmp_endpoint_url_key"
app:title="@string/rtmp_endpoint_url"
android:defaultValue="@string/default_server_url"
app:key="@string/server_url_key"
app:title="@string/server_url"
app:useSimpleSummaryProvider="true" />

<EditTextPreference
android:defaultValue=""
app:key="@string/rtmp_stream_key_key"
app:title="@string/rtmp_stream_key"
app:key="@string/stream_key_key"
app:title="@string/stream_key"
app:useSimpleSummaryProvider="true" />
</PreferenceCategory>
</PreferenceScreen>
8 changes: 5 additions & 3 deletions livestream/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,11 @@ dokkaHtml {
dependencies {
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation "io.github.thibaultbee:streampack:$streamPackVersion"
implementation "io.github.thibaultbee:streampack-extension-rtmp:$streamPackVersion"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'

implementation "io.github.thibaultbee.streampack:streampack-core:$streamPackVersion"
implementation "io.github.thibaultbee.streampack:streampack-ui:$streamPackVersion"
implementation "io.github.thibaultbee.streampack:streampack-extension-rtmp:$streamPackVersion"
implementation "io.github.thibaultbee.streampack:streampack-extension-srt:$streamPackVersion"

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
Expand Down
Loading
Loading