- Fixed #8

- Structure redesign.
alexeyvasilyev · Apr 3, 2021 · cd938c0 · cd938c0
1 parent 55c0464
commit cd938c0
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -51,5 +51,5 @@ dependencies {
     implementation "androidx.navigation:navigation-fragment-ktx:${androidXNavigationVersion}"
     implementation "androidx.navigation:navigation-ui-ktx:${androidXNavigationVersion}"
     implementation 'com.github.AppDevNext.Logcat:LogcatCore:2.5.0'
-    implementation project(':library-rtsp')
+    implementation project(':library-client-rtsp')
 }
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-  ext.kotlin_version = '1.4.31'
+  ext.kotlin_version = '1.4.32'
   repositories {
     jcenter()
     google()
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.1.2'
+    classpath 'com.android.tools.build:gradle:4.1.3'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
   }

diff --git a/constants.gradle b/constants.gradle
@@ -3,11 +3,11 @@ project.ext {
     buildToolsVersion = '30.0.3'
     minSdkVersion = 21    // 5.0
     targetSdkVersion = 30 // 11.0
-    releaseVersion = "1.3.0"
-    releaseVersionCode = 130
+    releaseVersion = "1.3.1"
+    releaseVersionCode = 131
 
-    androidXAnnotationVersion = '1.1.0'
-    androidXAppcompatVersion = '1.1.0'
+    androidXAnnotationVersion = '1.2.0'
+    androidXAppcompatVersion = '1.2.0'
     androidXNavigationVersion = '2.3.4'
     exoplayerVersion = '2.13.2'
 }
diff --git a/library-rtsp/.gitignore → library-client-rtsp/.gitignore b/library-rtsp/.gitignore → library-client-rtsp/.gitignore
diff --git a/library-rtsp/build.gradle → library-client-rtsp/build.gradle b/library-rtsp/build.gradle → library-client-rtsp/build.gradle
diff --git a/library-rtsp/proguard-rules.txt → library-client-rtsp/proguard-rules.txt b/library-rtsp/proguard-rules.txt → library-client-rtsp/proguard-rules.txt
diff --git a/library-rtsp/src/main/AndroidManifest.xml → ...-client-rtsp/src/main/AndroidManifest.xml b/library-rtsp/src/main/AndroidManifest.xml → ...-client-rtsp/src/main/AndroidManifest.xml
diff --git a/...main/java/com/alexvas/rtsp/AacParser.java → ...main/java/com/alexvas/rtsp/AacParser.java b/...main/java/com/alexvas/rtsp/AacParser.java → ...main/java/com/alexvas/rtsp/AacParser.java
diff --git a/...main/java/com/alexvas/rtsp/RtpParser.java → ...main/java/com/alexvas/rtsp/RtpParser.java b/...main/java/com/alexvas/rtsp/RtpParser.java → ...main/java/com/alexvas/rtsp/RtpParser.java
diff --git a/...ain/java/com/alexvas/rtsp/RtspClient.java → ...ain/java/com/alexvas/rtsp/RtspClient.java b/...ain/java/com/alexvas/rtsp/RtspClient.java → ...ain/java/com/alexvas/rtsp/RtspClient.java
@@ -566,7 +566,7 @@ private static void readRtpData(
             int keepAliveTimeout,
             @NonNull RtspClientKeepAliveListener keepAliveListener)
     throws IOException {
-        byte[] data = new byte[15000]; // Usually not bigger than MTU
+        byte[] data = new byte[0]; // Usually not bigger than MTU = 15KB
 
         final VideoRtpParser videoParser = new VideoRtpParser();
         final AacParser audioParser = (sdpInfo.audioTrack != null && sdpInfo.audioTrack.audioCodec == AUDIO_CODEC_AAC ?
@@ -585,6 +585,9 @@ private static void readRtpData(
 //                throw new IOException("No RTP frames found");
             }
 //          header.dumpHeader();
+            if (header.payloadSize > data.length)
+                data = new byte[header.payloadSize];
+
             NetUtils.readData(inputStream, data, 0, header.payloadSize);
 
             // Check if keep-alive should be sent

diff --git a/...java/com/alexvas/rtsp/VideoRtpParser.java → ...java/com/alexvas/rtsp/VideoRtpParser.java b/...java/com/alexvas/rtsp/VideoRtpParser.java → ...java/com/alexvas/rtsp/VideoRtpParser.java
diff --git a/...ain/java/com/alexvas/utils/ByteUtils.java → ...ain/java/com/alexvas/utils/ByteUtils.java b/...ain/java/com/alexvas/utils/ByteUtils.java → ...ain/java/com/alexvas/utils/ByteUtils.java
diff --git a/...main/java/com/alexvas/utils/NetUtils.java → ...main/java/com/alexvas/utils/NetUtils.java b/...main/java/com/alexvas/utils/NetUtils.java → ...main/java/com/alexvas/utils/NetUtils.java
diff --git a/...va/com/alexvas/utils/VideoCodecUtils.java → ...va/com/alexvas/utils/VideoCodecUtils.java b/...va/com/alexvas/utils/VideoCodecUtils.java → ...va/com/alexvas/utils/VideoCodecUtils.java
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,2 @@
-include ':library-rtsp'
+include ':library-client-rtsp'
 include ':app'