Fixed #99

alexeyvasilyev · Dec 25, 2024 · 23c3652 · 23c3652
1 parent 8796f8b
commit 23c3652
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,8 +4,8 @@ buildscript {
   ext.compile_sdk_version = 35
   ext.min_sdk_version = 24
   ext.target_sdk_version = 35
-  ext.project_version_code = 532
-  ext.project_version_name = '5.3.2'
+  ext.project_version_code = 533
+  ext.project_version_name = '5.3.3'
 
   repositories {
     google()

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/library-client-rtsp/build.gradle b/library-client-rtsp/build.gradle
@@ -39,7 +39,7 @@ android {
 
 dependencies {
     implementation 'androidx.annotation:annotation:1.9.1'
-    implementation 'androidx.media3:media3-exoplayer:1.5.0'
+    implementation 'androidx.media3:media3-exoplayer:1.5.1'
     implementation 'androidx.camera:camera-core:1.4.1' // YUV -> BMP conversion
     implementation 'org.jcodec:jcodec:0.2.5' // SPS frame modification
 }
diff --git a/library-client-rtsp/src/main/java/com/alexvas/utils/VideoCodecUtils.kt b/library-client-rtsp/src/main/java/com/alexvas/utils/VideoCodecUtils.kt
@@ -101,6 +101,8 @@ object VideoCodecUtils {
             val nalUnitIndex = searchForNalUnitStart(data, off, length, nalUnitPrefixSize)
             if (nalUnitIndex >= 0) {
                 val nalUnitOffset = nalUnitIndex + nalUnitPrefixSize.get()
+                if (nalUnitOffset >= data.size)
+                    break
                 val nalUnitTypeOctet = data[nalUnitOffset]
                 if ((nalUnitTypeOctet and 0x1f).toInt() == byUnitType) {
                     return nalUnitIndex
@@ -304,6 +306,8 @@ object VideoCodecUtils {
 
             if (nalUnitIndex >= 0) {
                 val nalUnitOffset = nalUnitIndex + nalUnitPrefixSize.get()
+                if (nalUnitOffset >= data.size)
+                    return false
                 val nalUnitTypeOctet = data[nalUnitOffset]
 
                 if (isH265) {