Merge pull request #6462 from ant-media/fix-conference

Set owasp score to 7, change default value of sendAudioLevelToViewers

owasp-suppressions.xml

@@ -99,6 +99,14 @@
 	   <packageUrl regex="true">^pkg:maven/org\.bytedeco/(ffmpeg|cuda).*@.*$</packageUrl>
 	   <cve>CVE-2023-34112</cve>
 	</suppress>
+		<suppress>
+	   <notes><![CDATA[
+	   file name: ffmpeg-5.1.2-1.5.8.jar,ffmpeg-platform-5.1.2-1.5.8.jar, ffmpeg-5.1.2-1.5.8-linux-x86.jar
+	   This vulnerability is about using mpegvideoencoder. We don't use mpegvideo encoder in our end
+	   ]]></notes>
+	   <packageUrl regex="true">^pkg:maven/org\.bytedeco/(ffmpeg|cuda).*@.*$</packageUrl>
+	   <cve>CVE-2024-32230</cve>
+	</suppress>
 
 
 </suppressions>

pom.xml

@@ -225,7 +225,7 @@
               <artifactId>dependency-check-maven</artifactId>
               <version>${owasp.version}</version>
 			  <configuration>
-				 <failBuildOnCVSS>8</failBuildOnCVSS>
+				 <failBuildOnCVSS>7</failBuildOnCVSS>
 				 <suppressionFile>owasp-suppressions.xml</suppressionFile>
 			   </configuration>
               <executions>

src/main/java/io/antmedia/AppSettings.java

@@ -2061,8 +2061,8 @@ public boolean isWriteStatsToDatastore() {
 	 * 
 	 * Ant Media Server sends audio level 5 times in a second
 	 */
-	@Value("${sendAudioLevelToViewers:true}")
-	private boolean sendAudioLevelToViewers = true;
+	@Value("${sendAudioLevelToViewers:false}")
+	private boolean sendAudioLevelToViewers = false;
 
   /**
    * Enable/disable video frame scaling in GPU when there is an adaptive bitrate 

src/main/java/io/antmedia/datastore/db/types/Broadcast.java

@@ -373,6 +373,12 @@ public Broadcast() {
 	@Schema(description ="If this broadcast is a track of a WebRTC stream. This variable is Id of that stream.")
 	private String mainTrackStreamId;
 
+	/*
+	 * Refactor: remove this field and store everything as streams in the database.
+	 * On the other hand, we can keep the number of subtracks here
+	 * 
+	 * Lastly, there is also an dependency in the webpanel, it just plays the multitrack by looking at this field.
+	 */
 	@Schema(description ="If this broadcast is main track. This variable hold sub track ids.")
 	private List<String> subTrackStreamIds = new ArrayList<>();
 

src/main/server/webapps/root/images/icons/readme

@@ -0,0 +1 @@
+The icons(mute-icon, speaker-icon) are being used in multitrack-play.html

src/test/java/io/antmedia/test/AppSettingsUnitTest.java

@@ -537,7 +537,7 @@ public void testUnsetAppSettings(AppSettings appSettings) {
 		assertEquals(150, appSettings.getAbrUpScaleRTTMs(), 0.0001);
 		assertNotNull(appSettings.getClusterCommunicationKey());
 		assertEquals(false, appSettings.isId3TagEnabled());
-		assertEquals(true, appSettings.isSendAudioLevelToViewers());
+		assertEquals(false, appSettings.isSendAudioLevelToViewers());
 		assertNull(appSettings.getTimeTokenSecretForPublish());
 		assertNull(appSettings.getTimeTokenSecretForPlay());