Merge branch 'master' into implementSelectibleTracks

.github/workflows/test.yml

@@ -66,7 +66,7 @@ jobs:
         run: |
           export RELEASE_VERSION="$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)"
           echo $RELEASE_VERSION
-          mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package -Dtest=!*/integration/*,!MuxerUnitTest -Dorg.bytedeco.javacpp.logger.debug=true org.jacoco:jacoco-maven-plugin:report sonar:sonar -Dmaven.javadoc.skip=true --quiet
+          mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package -Dtest=!*/integration/* -Dorg.bytedeco.javacpp.logger.debug=true org.jacoco:jacoco-maven-plugin:report sonar:sonar -Dmaven.javadoc.skip=true --quiet
       
       - name: Show MongoDB Log, Crash Log and Servis Status on failure
         if: failure()
@@ -224,7 +224,13 @@ jobs:
 
   deploy:   
     runs-on: ubuntu-22.04
-    needs: [run-unit-tests, check-vulnerabilities, run-integration-tests]                
+    needs: [run-unit-tests, check-vulnerabilities, run-integration-tests]    
+    env:
+      CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
+      CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
+      GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }}
+      GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -235,6 +241,7 @@ jobs:
           distribution: 'adopt' #openjdk
           java-version: '17'
           cache: 'maven'
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
 
       - name: Build projects # there is low probability that if somethings has pushed to the related branch while running test and before this job, it may build something not exactly same
         uses: ./.github/actions/build-projects 

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

@@ -2063,10 +2063,12 @@ public boolean isWriteStatsToDatastore() {
 	 */
 	@Value("${sendAudioLevelToViewers:true}")
 	private boolean sendAudioLevelToViewers = true;
-
-
-	@Value("${hwScalingEnabled:${"+SETTINGS_HW_SCALING_ENABLED+":true}}")
-	private boolean hwScalingEnabled = true;
+
+  /**
+   * Enable/disable video frame scaling in GPU when there is an adaptive bitrate 
+   */
+	@Value("${hwScalingEnabled:${"+SETTINGS_HW_SCALING_ENABLED+":false}}")
+	private boolean hwScalingEnabled = false;
 
 	/**
 	 * Firebase Service Account Key JSON to send push notification

src/main/java/io/antmedia/muxer/HLSMuxer.java

@@ -265,7 +265,7 @@ public synchronized void writePacket(AVPacket pkt, AVRational inputTimebase, AVR
 
 
 
-			logger.info("side data limit:{} for streamId:{}", pendingSEIData.limit(), streamId);
+			logger.info("sei data size:{} for streamId:{}", pendingSEIData.limit(), streamId);
 
 			//inject SEI NAL Unit
 			pendingSEIData.rewind();

src/main/java/io/antmedia/muxer/MuxAdaptor.java

@@ -1,26 +1,39 @@
 package io.antmedia.muxer;
 
 import static io.antmedia.muxer.IAntMediaStreamHandler.BROADCAST_STATUS_BROADCASTING;
-import static org.bytedeco.ffmpeg.global.avcodec.*;
-import static org.bytedeco.ffmpeg.global.avutil.*;
+import static org.bytedeco.ffmpeg.global.avcodec.AV_CODEC_ID_AAC;
+import static org.bytedeco.ffmpeg.global.avcodec.AV_CODEC_ID_H264;
+import static org.bytedeco.ffmpeg.global.avcodec.AV_CODEC_ID_PNG;
+import static org.bytedeco.ffmpeg.global.avcodec.AV_PKT_FLAG_KEY;
+import static org.bytedeco.ffmpeg.global.avutil.AVMEDIA_TYPE_ATTACHMENT;
+import static org.bytedeco.ffmpeg.global.avutil.AVMEDIA_TYPE_AUDIO;
+import static org.bytedeco.ffmpeg.global.avutil.AVMEDIA_TYPE_DATA;
+import static org.bytedeco.ffmpeg.global.avutil.AVMEDIA_TYPE_SUBTITLE;
+import static org.bytedeco.ffmpeg.global.avutil.AVMEDIA_TYPE_VIDEO;
+import static org.bytedeco.ffmpeg.global.avutil.AV_PIX_FMT_YUV420P;
+import static org.bytedeco.ffmpeg.global.avutil.AV_SAMPLE_FMT_FLTP;
+import static org.bytedeco.ffmpeg.global.avutil.av_channel_layout_default;
+import static org.bytedeco.ffmpeg.global.avutil.av_free;
+import static org.bytedeco.ffmpeg.global.avutil.av_malloc;
+import static org.bytedeco.ffmpeg.global.avutil.av_rescale_q;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Deque;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Queue;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import io.antmedia.logger.LoggerUtils;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.mina.core.buffer.IoBuffer;
@@ -61,6 +74,7 @@
 import io.antmedia.datastore.db.IDataStoreFactory;
 import io.antmedia.datastore.db.types.Broadcast;
 import io.antmedia.datastore.db.types.Endpoint;
+import io.antmedia.logger.LoggerUtils;
 import io.antmedia.muxer.parser.AACConfigParser;
 import io.antmedia.muxer.parser.AACConfigParser.AudioObjectTypes;
 import io.antmedia.muxer.parser.SpsParser;
@@ -163,7 +177,7 @@ public class MuxAdaptor implements IRecordingListener, IEndpointStatusListener {
 	protected static boolean isStreamSource = false;
 
 	private int previewCreatePeriod;
-	private double oldspeed;
+	private double latestSpeed;
 	private long lastQualityUpdateTime = 0;
 	private Broadcast broadcast;
 	protected AppSettings appSettings;
@@ -183,7 +197,7 @@ public class MuxAdaptor implements IRecordingListener, IEndpointStatusListener {
 	 * Value is the system time at that moment
 	 *
 	 */
-	private LinkedList<PacketTime> packetTimeList = new LinkedList<PacketTime>();
+	private Deque<PacketTime> packetTimeList = new ConcurrentLinkedDeque<>();
 
 	public boolean addID3Data(String data) {
 		for (Muxer muxer : muxerList) {
@@ -895,6 +909,7 @@ public void prepareMuxerIO()
 	public void updateStreamQualityParameters(String streamId, String quality, double speed, int inputQueueSize) {
 		long now = System.currentTimeMillis();
 
+		latestSpeed = speed;
 		//increase updating time to STAT_UPDATE_PERIOD_MS seconds because it may cause some issues in mongodb updates 
 		//or 
 		//update before STAT_UPDATE_PERIOD_MS if speed something meaningful
@@ -917,8 +932,13 @@ public void updateStreamQualityParameters(String streamId, String quality, doubl
 
 			getStreamHandler().setQualityParameters(streamId, quality, speed, inputQueueSize, System.currentTimeMillis());
 			oldQuality = quality;
-			oldspeed = speed;
 		}
+
+
+	}
+
+	public double getLatestSpeed() {
+		return latestSpeed;
 	}
 
 	public IAntMediaStreamHandler getStreamHandler() {
@@ -1312,7 +1332,7 @@ public void updateQualityParameters(long pts, AVRational timebase, long packetSi
 
 		if (packetTimeList.size() > 300) {
 			//limit the size.
-			packetTimeList.remove(0);
+			packetTimeList.removeFirst();
 		}
 
 		PacketTime firstPacket = packetTimeList.getFirst();
@@ -2286,7 +2306,7 @@ public void setBufferingFinishTimeMs(long bufferingFinishTimeMs) {
 		this.bufferingFinishTimeMs = bufferingFinishTimeMs;
 	}
 
-	public LinkedList<PacketTime> getPacketTimeList() {
+	public Queue<PacketTime> getPacketTimeList() {
 		return packetTimeList;
 	}
 

src/main/server/enable_ssl.sh

@@ -102,11 +102,27 @@ get_password() {
   done
 }
 
+# Check if there is a Container and install necessary packages
+is_docker_container() {
+    if [ -f /.dockerenv ]; then
+        apt-get install iptables dnsutils -y
+        return 0
+    fi
+
+    return 1
+}
+
+
 SUDO="sudo"
 if ! [ -x "$(command -v sudo)" ]; then
   SUDO=""
 fi
 
+if is_docker_container; then
+    SUDO=""
+fi
+
+
 output() {
   OUT=$?
       if [ $OUT -ne 0 ]; then
@@ -138,8 +154,8 @@ wait_for_dns_validation() {
 # Install jq
 install_jq() {
     if ! [ command -v jq &> /dev/null ]; then
-        sudo apt update -qq
-        sudo apt install -y jq
+        $SUDO apt update -qq
+        $SUDO apt install -y jq
     fi
 }
 
@@ -469,7 +485,11 @@ ipt_restore
 
 echo ""
 
-$SUDO service antmedia restart
+if is_docker_container; then
+    kill -HUP 1
+else
+    $SUDO service antmedia restart
+fi
 
 output
 

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

@@ -293,7 +293,7 @@ public void testSettings() {
 		assertEquals("secretpublish", appSettings.getTimeTokenSecretForPublish());
 
 
-		assertEquals(true, appSettings.isHwScalingEnabled());
+		assertEquals(false, appSettings.isHwScalingEnabled());
 		appSettings.setHwScalingEnabled(false);
 		assertEquals(false, appSettings.isHwScalingEnabled());
 
@@ -543,7 +543,7 @@ public void testUnsetAppSettings(AppSettings appSettings) {
 		assertNull(appSettings.getTimeTokenSecretForPublish());
 		assertNull(appSettings.getTimeTokenSecretForPlay());
 
-        assertTrue(appSettings.isHwScalingEnabled());
+        assertFalse(appSettings.isHwScalingEnabled());
 
 		assertNotNull(appSettings.getSubscriberAuthenticationKey());
 		assertNull(appSettings.getFirebaseAccountKeyJSON());