Merge pull request #127 from ant-media/release/2.13.2

Release/2.13.2
ant-media · Feb 8, 2025 · e782970 · e782970
2 parents 2290879 + 8090ba4
commit e782970
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/ClipCreatorPlugin/src/main/java/io/antmedia/plugin/ClipCreatorPlugin.java b/ClipCreatorPlugin/src/main/java/io/antmedia/plugin/ClipCreatorPlugin.java
@@ -175,7 +175,6 @@ public Result startPeriodicRecording(int periodSeconds)
 
 			vertx.executeBlocking(() -> 
 			{
-				logger.info("startPeriodicRecording#createRecordings ", appName);
 				createRecordings();
 				return null;
 			}, false);
@@ -189,8 +188,9 @@ public Result startPeriodicRecording(int periodSeconds)
 
 	public void createRecordings() 
 	{
+
 		List<Broadcast> broadcasts = dataStore.getLocalLiveBroadcasts(serverSettings.getHostAddress());
-
+		logger.info("createRecordings for active broadcasts size:{}", broadcasts.size());
 		for (Broadcast broadcast : broadcasts) {
 			convertHlsToMp4(broadcast, true);
 		}

diff --git a/...orPlugin/src/test/java/io/antmedia/test/integration/ClipCreatorPluginIntegrationTest.java b/...orPlugin/src/test/java/io/antmedia/test/integration/ClipCreatorPluginIntegrationTest.java
@@ -7,6 +7,7 @@
 import io.antmedia.datastore.db.types.User;
 import io.antmedia.datastore.db.types.VoD;
 import io.antmedia.datastore.db.types.Broadcast.PlayListItem;
+import io.antmedia.datastore.db.types.BroadcastUpdate;
 import io.antmedia.muxer.IAntMediaStreamHandler;
 import io.antmedia.muxer.MuxAdaptor;
 import io.antmedia.plugin.ClipCreatorPlugin;
@@ -288,6 +289,7 @@ public void testPeriodicMp4CreationREST() throws Exception {
 
          Awaitility.await().atMost(30, TimeUnit.SECONDS).pollInterval(5, TimeUnit.SECONDS).until(() -> {
              List<VoD> voDList2 = callGetVoDList(0,50, streamId);
+             logger.info("VoD List size: {}", voDList2.size());
              return voDList2 != null && voDList2.size() == 2;
          });
 
@@ -1067,7 +1069,7 @@ public static Result callUpdateBroadcast(String id, String name, String descript
 		String url = ROOT_SERVICE_URL + "/v2/broadcasts/" + id;
 
 		HttpClient client = HttpClients.custom().setRedirectStrategy(new LaxRedirectStrategy()).build();
-		Broadcast broadcast = new Broadcast();
+		BroadcastUpdate broadcast = new BroadcastUpdate();
 		try {
 			broadcast.setStreamId(id);
 		} catch (Exception e1) {
@@ -1084,11 +1086,11 @@ public static Result callUpdateBroadcast(String id, String name, String descript
 
 		try {
 			Gson gson = new Gson();
-			HttpUriRequest post = RequestBuilder.put().setUri(url)
+			HttpUriRequest put = RequestBuilder.put().setUri(url)
 					.setHeader(HttpHeaders.CONTENT_TYPE, "application/json")
 					.setEntity(new StringEntity(gson.toJson(broadcast))).build();
 
-			HttpResponse response = client.execute(post);
+			HttpResponse response = client.execute(put);
 
 			StringBuffer result = readResponse(response);
 

diff --git a/FilterPlugin/src/test/java/io/antmedia/test/FilterManagerUnitTest.java b/FilterPlugin/src/test/java/io/antmedia/test/FilterManagerUnitTest.java
@@ -142,6 +142,7 @@ public void testCheckResultandFilterId() {
 			e.printStackTrace();
 			fail(e.getMessage());
 		}
+		broadcast.setUpdateTime(System.currentTimeMillis());
 		broadcast.setStatus(IAntMediaStreamHandler.BROADCAST_STATUS_BROADCASTING);
 		dataStore.save(broadcast);
 
@@ -226,6 +227,7 @@ public void testBugVideoFilterNotWorking(String filterString, String rawFile, in
 			e.printStackTrace();
 			fail(e.getMessage());
 		}
+		broadcast.setUpdateTime(System.currentTimeMillis());
 		broadcast.setStatus(IAntMediaStreamHandler.BROADCAST_STATUS_BROADCASTING);
 		dataStore.save(broadcast);
 
@@ -351,6 +353,7 @@ public void testFixVideoPtsInFilter(String filterString, String rawFile, int sou
 			e.printStackTrace();
 			fail(e.getMessage());
 		}
+		broadcast.setUpdateTime(System.currentTimeMillis());
 		broadcast.setStatus(IAntMediaStreamHandler.BROADCAST_STATUS_BROADCASTING);
 		dataStore.save(broadcast);
 
@@ -571,6 +574,7 @@ public AVFrame onAudioFrame(String streamId, AVFrame audioFrame) {
 			e.printStackTrace();
 			fail(e.getMessage());
 		}
+		broadcast.setUpdateTime(System.currentTimeMillis());
 		broadcast.setStatus(IAntMediaStreamHandler.BROADCAST_STATUS_BROADCASTING);
 		assertEquals("stream1", dataStore.save(broadcast));
 

diff --git a/FilterPlugin/src/test/java/io/antmedia/test/MCUManagerUnitTest.java b/FilterPlugin/src/test/java/io/antmedia/test/MCUManagerUnitTest.java
@@ -131,6 +131,7 @@ public void testMCUWithOtherRooms() throws Exception {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
+		broadcast.setUpdateTime(System.currentTimeMillis());
 		broadcast.setStatus(IAntMediaStreamHandler.BROADCAST_STATUS_BROADCASTING);
 		dataStore.save(broadcast);
 

diff --git a/...erPlugin/src/test/java/io/antmedia/plugin/integration/HLSMergerPluginIntegrationTest.java b/...erPlugin/src/test/java/io/antmedia/plugin/integration/HLSMergerPluginIntegrationTest.java
@@ -108,7 +108,7 @@ public void testMultiResolutionHLS() {
 
 			callStopMultiResolutionStream(mergedStreamId);
 
-			Awaitility.await().atMost(30, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).until(() -> {
+			Awaitility.await().atMost(45, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).until(() -> {
 				return !testFile(APP_URL+"/streams/" + mergedStreamId+ ".m3u8");
 			});
 
@@ -186,7 +186,8 @@ public void testMultiAudioHLS() {
 
 			callStopMultiResolutionStream(mergedStreamId);
 
-			Awaitility.await().atMost(30, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).until(() -> {
+			// hls list size is 15 and segment 2 secs, it means it'll be deleted after 30 seconds, have 45 to have some margin
+			Awaitility.await().atMost(45, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).until(() -> {
 				return !testFile(APP_URL+"/streams/" + mergedStreamId+ ".m3u8");
 			});