Skip to content

Commit

Permalink
update library
Browse files Browse the repository at this point in the history
  • Loading branch information
pedro committed Jul 21, 2021
1 parent 00730d5 commit 32e2813
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 25 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ allprojects {
}
}
dependencies {
implementation 'com.github.pedroSG94:RTSP-Server:1.0.8'
implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:2.0.2'
implementation 'com.github.pedroSG94:RTSP-Server:1.0.9'
implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:2.0.5'
}
```
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ android {
applicationId "com.pedro.sample"
minSdkVersion 16
targetSdkVersion 30
versionCode 108
versionName "1.0.8"
versionCode 109
versionName "1.0.9"
}
buildTypes {
release {
Expand All @@ -22,7 +22,7 @@ android {

dependencies {
implementation project(':rtspserver')
implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:2.0.2'
implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:2.0.5'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/com/pedro/sample/CameraDemoActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ class CameraDemoActivity : AppCompatActivity(), ConnectCheckerRtsp, View.OnClick
}
}

override fun onConnectionStartedRtsp(rtspUrl: String) {
}

override fun onDisconnectRtsp() {
runOnUiThread {
Toast.makeText(this@CameraDemoActivity, "Disconnected", Toast.LENGTH_SHORT).show()
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.5.0'
ext.kotlin_version = '1.5.20'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
Expand Down
6 changes: 3 additions & 3 deletions rtspserver/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 30
versionCode 108
versionName "1.0.8"
versionCode 109
versionName "1.0.9"
}

buildTypes {
Expand All @@ -24,5 +24,5 @@ android {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:2.0.2'
implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:2.0.5'
}
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,14 @@ class RtspServerCamera1 : Camera1Base {

override fun shouldRetry(reason: String?): Boolean = false

override fun reConnect(delay: Long) {
}

override fun hasCongestion(): Boolean = rtspServer.hasCongestion()

override fun setReTries(reTries: Int) {
}

override fun reConnect(delay: Long, backupUrl: String?) {
}

override fun getCacheSize(): Int = 0

override fun getSentAudioFrames(): Long = 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ class RtspServerCamera2 : Camera2Base {

override fun shouldRetry(reason: String?): Boolean = false

override fun reConnect(delay: Long) {
}

override fun hasCongestion(): Boolean = rtspServer.hasCongestion()

override fun setReTries(reTries: Int) {
}

override fun reConnect(delay: Long, backupUrl: String?) {
}

override fun getCacheSize(): Int = 0

override fun getSentAudioFrames(): Long = 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,14 @@ class RtspServerDisplay(context: Context, useOpengl: Boolean,

override fun shouldRetry(reason: String?): Boolean = false

override fun reConnect(delay: Long) {
}

override fun hasCongestion(): Boolean = rtspServer.hasCongestion()

override fun setReTries(reTries: Int) {
}

override fun reConnect(delay: Long, backupUrl: String?) {
}

override fun getCacheSize(): Int = 0

override fun getSentAudioFrames(): Long = 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@ class RtspServerFromFile : FromFileBase {

override fun shouldRetry(reason: String?): Boolean = false

override fun reConnect(delay: Long) {
}

override fun hasCongestion(): Boolean = rtspServer.hasCongestion()

override fun setReTries(reTries: Int) {
}

override fun reConnect(delay: Long, backupUrl: String?) {
}

override fun getCacheSize(): Int = 0

override fun getSentAudioFrames(): Long = 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ class RtspServerOnlyAudio(connectCheckerRtsp: ConnectCheckerRtsp, port: Int) : O

override fun shouldRetry(reason: String?): Boolean = false

override fun reConnect(delay: Long) {
}

override fun hasCongestion(): Boolean = rtspServer.hasCongestion()

override fun setReTries(reTries: Int) {
}

override fun reConnect(delay: Long, backupUrl: String?) {
}

override fun getCacheSize(): Int = 0

override fun getSentAudioFrames(): Long = 0
Expand Down

0 comments on commit 32e2813

Please sign in to comment.