expose hascongestion precent used

pedroSG94 · Oct 12, 2023 · cba3e76 · cba3e76
1 parent 1a19e74
commit cba3e76
Show file tree

Hide file tree

Showing 34 changed files with 192 additions and 36 deletions.
diff --git a/library/src/main/java/com/pedro/library/base/Camera1Base.java b/library/src/main/java/com/pedro/library/base/Camera1Base.java
@@ -807,6 +807,8 @@ public boolean reTry(long delay, String reason) {
   //cache control
   public abstract boolean hasCongestion();
 
+  public abstract boolean hasCongestion(float percentUsed);
+
   public abstract void resizeCache(int newSize) throws RuntimeException;
 
   public abstract int getCacheSize();

diff --git a/library/src/main/java/com/pedro/library/base/Camera2Base.java b/library/src/main/java/com/pedro/library/base/Camera2Base.java
@@ -752,6 +752,8 @@ public boolean reTry(long delay, String reason) {
   //cache control
   public abstract boolean hasCongestion();
 
+  public abstract boolean hasCongestion(float percentUsed);
+
   public abstract void resizeCache(int newSize) throws RuntimeException;
 
   public abstract int getCacheSize();

diff --git a/library/src/main/java/com/pedro/library/base/DisplayBase.java b/library/src/main/java/com/pedro/library/base/DisplayBase.java
@@ -485,6 +485,8 @@ public boolean reTry(long delay, String reason) {
   //cache control
   public abstract boolean hasCongestion();
 
+  public abstract boolean hasCongestion(float percentUsed);
+
   public abstract void resizeCache(int newSize) throws RuntimeException;
 
   public abstract int getCacheSize();

diff --git a/library/src/main/java/com/pedro/library/base/FromFileBase.java b/library/src/main/java/com/pedro/library/base/FromFileBase.java
@@ -448,6 +448,8 @@ public boolean reTry(long delay, String reason) {
   //cache control
   public abstract boolean hasCongestion();
 
+  public abstract boolean hasCongestion(float percentUsed);
+
   public abstract void resizeCache(int newSize) throws RuntimeException;
 
   public abstract int getCacheSize();

diff --git a/library/src/main/java/com/pedro/library/base/OnlyAudioBase.java b/library/src/main/java/com/pedro/library/base/OnlyAudioBase.java
@@ -293,6 +293,8 @@ public boolean reTry(long delay, String reason) {
   //cache control
   public abstract boolean hasCongestion();
 
+  public abstract boolean hasCongestion(float percentUsed);
+
   public abstract void resizeCache(int newSize) throws RuntimeException;
 
   public abstract int getCacheSize();

diff --git a/library/src/main/java/com/pedro/library/base/StreamBase.kt b/library/src/main/java/com/pedro/library/base/StreamBase.kt
@@ -557,6 +557,7 @@ abstract class StreamBase(
   protected abstract fun reConnect(delay: Long, backupUrl: String?)
   abstract fun setReTries(reTries: Int)
   abstract fun hasCongestion(): Boolean
+  abstract fun hasCongestion(percentUsed: Float = 20f): Boolean
   abstract fun setLogs(enabled: Boolean)
   abstract fun setCheckServerAlive(enabled: Boolean)
   @Throws(RuntimeException::class)

diff --git a/library/src/main/java/com/pedro/library/multiple/MultiRtpCamera1.java b/library/src/main/java/com/pedro/library/multiple/MultiRtpCamera1.java
@@ -439,11 +439,24 @@ public boolean hasCongestion(RtpType rtpType, int index) {
     }
   }
 
+  public boolean hasCongestion(RtpType rtpType, int index, int percentUsed) {
+    if (rtpType == RtpType.RTMP) {
+      return rtmpClients[index].hasCongestion(percentUsed);
+    } else {
+      return rtspClients[index].hasCongestion(percentUsed);
+    }
+  }
+
   @Override
   public boolean hasCongestion() {
     return false;
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return false;
+  }
+
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
     for (RtmpClient rtmpClient: rtmpClients) {

diff --git a/library/src/main/java/com/pedro/library/multiple/MultiRtpCamera2.java b/library/src/main/java/com/pedro/library/multiple/MultiRtpCamera2.java
@@ -439,11 +439,24 @@ public boolean hasCongestion(RtpType rtpType, int index) {
     }
   }
 
+  public boolean hasCongestion(RtpType rtpType, int index, int percentUsed) {
+    if (rtpType == RtpType.RTMP) {
+      return rtmpClients[index].hasCongestion(percentUsed);
+    } else {
+      return rtspClients[index].hasCongestion(percentUsed);
+    }
+  }
+
   @Override
   public boolean hasCongestion() {
     return false;
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return false;
+  }
+
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
     for (RtmpClient rtmpClient: rtmpClients) {

diff --git a/library/src/main/java/com/pedro/library/multiple/MultiRtpDisplay.java b/library/src/main/java/com/pedro/library/multiple/MultiRtpDisplay.java
@@ -254,11 +254,24 @@ public boolean hasCongestion(RtpType rtpType, int index) {
     }
   }
 
+  public boolean hasCongestion(RtpType rtpType, int index, int percentUsed) {
+    if (rtpType == RtpType.RTMP) {
+      return rtmpClients[index].hasCongestion(percentUsed);
+    } else {
+      return rtspClients[index].hasCongestion(percentUsed);
+    }
+  }
+
   @Override
   public boolean hasCongestion() {
     return false;
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return false;
+  }
+
   public void resizeCache(RtpType rtpType, int index, int newSize) {
     if (rtpType == RtpType.RTMP) {
       rtmpClients[index].resizeCache(newSize);

diff --git a/library/src/main/java/com/pedro/library/multiple/MultiRtpOnlyAudio.java b/library/src/main/java/com/pedro/library/multiple/MultiRtpOnlyAudio.java
@@ -361,11 +361,24 @@ public boolean hasCongestion(RtpType rtpType, int index) {
     }
   }
 
+  public boolean hasCongestion(RtpType rtpType, int index, int percentUsed) {
+    if (rtpType == RtpType.RTMP) {
+      return rtmpClients[index].hasCongestion(percentUsed);
+    } else {
+      return rtspClients[index].hasCongestion(percentUsed);
+    }
+  }
+
   @Override
   public boolean hasCongestion() {
     return false;
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return false;
+  }
+
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
     for (RtmpClient rtmpClient: rtmpClients) {

diff --git a/library/src/main/java/com/pedro/library/rtmp/RtmpCamera1.java b/library/src/main/java/com/pedro/library/rtmp/RtmpCamera1.java
@@ -215,6 +215,11 @@ public boolean hasCongestion() {
     return rtmpClient.hasCongestion();
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return rtmpClient.hasCongestion(percentUsed);
+  }
+
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
     rtmpClient.sendAudio(aacBuffer, info);

diff --git a/library/src/main/java/com/pedro/library/rtmp/RtmpCamera2.java b/library/src/main/java/com/pedro/library/rtmp/RtmpCamera2.java
@@ -224,6 +224,11 @@ public boolean hasCongestion() {
     return rtmpClient.hasCongestion();
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return rtmpClient.hasCongestion(percentUsed);
+  }
+
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
     rtmpClient.sendAudio(aacBuffer, info);

diff --git a/library/src/main/java/com/pedro/library/rtmp/RtmpDisplay.java b/library/src/main/java/com/pedro/library/rtmp/RtmpDisplay.java
@@ -187,6 +187,11 @@ public boolean hasCongestion() {
     return rtmpClient.hasCongestion();
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return rtmpClient.hasCongestion(percentUsed);
+  }
+
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
     rtmpClient.sendAudio(aacBuffer, info);

diff --git a/library/src/main/java/com/pedro/library/rtmp/RtmpFromFile.java b/library/src/main/java/com/pedro/library/rtmp/RtmpFromFile.java
@@ -210,6 +210,11 @@ public boolean hasCongestion() {
     return rtmpClient.hasCongestion();
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return rtmpClient.hasCongestion(percentUsed);
+  }
+
   @Override
   protected void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
     rtmpClient.setVideoInfo(sps, pps, vps);

diff --git a/library/src/main/java/com/pedro/library/rtmp/RtmpOnlyAudio.java b/library/src/main/java/com/pedro/library/rtmp/RtmpOnlyAudio.java
@@ -159,6 +159,11 @@ public boolean hasCongestion() {
     return rtmpClient.hasCongestion();
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return rtmpClient.hasCongestion(percentUsed);
+  }
+
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
     rtmpClient.sendAudio(aacBuffer, info);

diff --git a/library/src/main/java/com/pedro/library/rtmp/RtmpStream.kt b/library/src/main/java/com/pedro/library/rtmp/RtmpStream.kt
@@ -115,6 +115,8 @@ class RtmpStream(context: Context, connectCheckerRtmp: ConnectCheckerRtmp, video
 
   override fun hasCongestion(): Boolean = rtmpClient.hasCongestion()
 
+  override fun hasCongestion(percentUsed: Float): Boolean = rtmpClient.hasCongestion(percentUsed)
+
   override fun setLogs(enabled: Boolean) {
     rtmpClient.setLogs(enabled)
   }

diff --git a/library/src/main/java/com/pedro/library/rtsp/RtspCamera1.java b/library/src/main/java/com/pedro/library/rtsp/RtspCamera1.java
@@ -181,6 +181,11 @@ public boolean hasCongestion() {
     return rtspClient.hasCongestion();
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return rtspClient.hasCongestion(percentUsed);
+  }
+
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
     rtspClient.sendAudio(aacBuffer, info);

diff --git a/library/src/main/java/com/pedro/library/rtsp/RtspCamera2.java b/library/src/main/java/com/pedro/library/rtsp/RtspCamera2.java
@@ -190,6 +190,11 @@ public boolean hasCongestion() {
     return rtspClient.hasCongestion();
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return rtspClient.hasCongestion(percentUsed);
+  }
+
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
     rtspClient.sendAudio(aacBuffer, info);

diff --git a/library/src/main/java/com/pedro/library/rtsp/RtspDisplay.java b/library/src/main/java/com/pedro/library/rtsp/RtspDisplay.java
@@ -153,6 +153,11 @@ public boolean hasCongestion() {
     return rtspClient.hasCongestion();
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return rtspClient.hasCongestion(percentUsed);
+  }
+
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
     rtspClient.sendAudio(aacBuffer, info);

diff --git a/library/src/main/java/com/pedro/library/rtsp/RtspFromFile.java b/library/src/main/java/com/pedro/library/rtsp/RtspFromFile.java
@@ -177,6 +177,11 @@ public boolean hasCongestion() {
     return rtspClient.hasCongestion();
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return rtspClient.hasCongestion(percentUsed);
+  }
+
   @Override
   protected void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
     rtspClient.setVideoInfo(sps, pps, vps);

diff --git a/library/src/main/java/com/pedro/library/rtsp/RtspOnlyAudio.java b/library/src/main/java/com/pedro/library/rtsp/RtspOnlyAudio.java
@@ -142,6 +142,11 @@ public boolean hasCongestion() {
     return rtspClient.hasCongestion();
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return rtspClient.hasCongestion(percentUsed);
+  }
+
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
     rtspClient.sendAudio(aacBuffer, info);

diff --git a/library/src/main/java/com/pedro/library/rtsp/RtspStream.kt b/library/src/main/java/com/pedro/library/rtsp/RtspStream.kt
@@ -83,6 +83,8 @@ class RtspStream(context: Context, connectCheckerRtsp: ConnectCheckerRtsp, video
   }
 
   override fun hasCongestion(): Boolean = rtspClient.hasCongestion()
+
+  override fun hasCongestion(percentUsed: Float): Boolean = rtspClient.hasCongestion(percentUsed)
 
   override fun setLogs(enabled: Boolean) {
     rtspClient.setLogs(enabled)

diff --git a/library/src/main/java/com/pedro/library/srt/SrtCamera1.java b/library/src/main/java/com/pedro/library/srt/SrtCamera1.java
@@ -172,6 +172,11 @@ public boolean hasCongestion() {
     return srtClient.hasCongestion();
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return srtClient.hasCongestion(percentUsed);
+  }
+
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
     srtClient.sendAudio(aacBuffer, info);

diff --git a/library/src/main/java/com/pedro/library/srt/SrtCamera2.java b/library/src/main/java/com/pedro/library/srt/SrtCamera2.java
@@ -181,6 +181,11 @@ public boolean hasCongestion() {
     return srtClient.hasCongestion();
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return srtClient.hasCongestion(percentUsed);
+  }
+
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
     srtClient.sendAudio(aacBuffer, info);

diff --git a/library/src/main/java/com/pedro/library/srt/SrtDisplay.java b/library/src/main/java/com/pedro/library/srt/SrtDisplay.java
@@ -144,6 +144,11 @@ public boolean hasCongestion() {
     return rtmpClient.hasCongestion();
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return rtmpClient.hasCongestion(percentUsed);
+  }
+
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
     rtmpClient.sendAudio(aacBuffer, info);

diff --git a/library/src/main/java/com/pedro/library/srt/SrtFromFile.java b/library/src/main/java/com/pedro/library/srt/SrtFromFile.java
@@ -167,6 +167,11 @@ public boolean hasCongestion() {
     return srtClient.hasCongestion();
   }
 
+  @Override
+  public boolean hasCongestion(float percentUsed) {
+    return srtClient.hasCongestion(percentUsed);
+  }
+
   @Override
   protected void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
     srtClient.setVideoInfo(sps, pps, vps);