Merge branch 'master' into feature/vod-metadata-rest

Author: burak-58

src/main/java/io/antmedia/datastore/db/DataStore.java

@@ -1227,37 +1227,38 @@ protected void updateStreamInfo(Broadcast broadcast, BroadcastUpdate newBroadcas
 	 * They are used by InMemoryDataStore and MapDBStore, Mongodb implements the same functionality inside its own class.
 	 */
 	protected ArrayList<VoD> searchOnServerVod(ArrayList<VoD> broadcastList, String search){
-		
+
 		long startTime = System.nanoTime();
 		if(search != null && !search.isEmpty()) {
+			String searchLower = search.toLowerCase();
 			for (Iterator<VoD> i = broadcastList.iterator(); i.hasNext(); ) {
 				VoD item = i.next();
-				if(item.getVodName() != null && item.getStreamName() != null && item.getStreamId() != null && item.getVodId() != null) {
-					if (item.getVodName().toLowerCase().contains(search.toLowerCase()) || item.getStreamId().toLowerCase().contains(search.toLowerCase()) || item.getStreamName().toLowerCase().contains(search.toLowerCase()) || item.getVodId().toLowerCase().contains(search.toLowerCase()))
-						continue;
-					else i.remove();
-				}
-				else if (item.getVodName()!= null && item.getVodId() != null){
-					if (item.getVodName().toLowerCase().contains(search.toLowerCase()) || item.getVodId().toLowerCase().contains(search.toLowerCase()))
-						continue;
-					else i.remove();
-				}
-				else{
-					if (item.getVodId() != null){
-						if (item.getVodId().toLowerCase().contains(search.toLowerCase()))
-							continue;
-						else i.remove();
-					}
+				if (matchesVodSearch(item, searchLower)) {
+					continue;
 				}
+				i.remove();
 			}
 		}
-		
+
 		long elapsedNanos = System.nanoTime() - startTime;
 		addQueryTime(elapsedNanos);
 		showWarningIfElapsedTimeIsMoreThanThreshold(elapsedNanos, "searchOnServerVod");
 		return broadcastList;
 	}
 
+	private boolean matchesVodSearch(VoD item, String searchLower) {
+		return containsIgnoreCase(item.getVodId(), searchLower) ||
+				containsIgnoreCase(item.getVodName(), searchLower) ||
+				containsIgnoreCase(item.getStreamId(), searchLower) ||
+				containsIgnoreCase(item.getStreamName(), searchLower) ||
+				containsIgnoreCase(item.getDescription(), searchLower) ||
+				containsIgnoreCase(item.getMetadata(), searchLower);
+	}
+
+	private boolean containsIgnoreCase(String field, String searchLower) {
+		return field != null && field.toLowerCase().contains(searchLower);
+	}
+
 	protected List<VoD> sortAndCropVodList(List<VoD> vodList, int offset, int size, String sortBy, String orderBy) 
 	{
 		long startTime = System.nanoTime();

src/main/java/io/antmedia/datastore/db/MongoStore.java

@@ -825,7 +825,9 @@ public List<VoD> getVodList(int offset, int size, String sortBy, String orderBy,
 						Filters.regex(STREAM_ID).caseInsensitive().pattern(".*" + search + ".*"),
 						Filters.regex("streamName").caseInsensitive().pattern(".*" + search + ".*"),
 						Filters.regex(VOD_ID).caseInsensitive().pattern(".*" + search + ".*"),
-						Filters.regex("vodName").caseInsensitive().pattern(".*" + search + ".*")
+						Filters.regex("vodName").caseInsensitive().pattern(".*" + search + ".*"),
+						Filters.regex("description").caseInsensitive().pattern(".*" + search + ".*"),
+						Filters.regex("metadata").caseInsensitive().pattern(".*" + search + ".*")
 						)
 						);
 
@@ -973,14 +975,16 @@ public long getPartialVodNumber(String search)
 		synchronized(vodLock) {
 
 			Query<VoD> query = vodDatastore.find(VoD.class);
-			if (search != null && !search.isEmpty()) 
+			if (search != null && !search.isEmpty())
 			{
 				logger.info("Server side search is called for {}", search);
 				query.filter(Filters.or(
 						Filters.regex("streamId").caseInsensitive().pattern(".*" + search + ".*"),
 						Filters.regex("streamName").caseInsensitive().pattern(".*" + search + ".*"),
 						Filters.regex(VOD_ID).caseInsensitive().pattern(".*" + search + ".*"),
-						Filters.regex("vodName").caseInsensitive().pattern(".*" + search + ".*")
+						Filters.regex("vodName").caseInsensitive().pattern(".*" + search + ".*"),
+						Filters.regex("description").caseInsensitive().pattern(".*" + search + ".*"),
+						Filters.regex("metadata").caseInsensitive().pattern(".*" + search + ".*")
 						));
 			}
 			partialVodNumber = query.count();

src/main/java/io/antmedia/licence/ILicenceService.java

@@ -9,6 +9,7 @@ public interface ILicenceService {
 	public static final String LICENCE_TYPE_STANDARD = "standard";
 	public static final String LICENCE_TYPE_OFFLINE = "offline";
 	public static final String LICENCE_TYPE_MARKETPLACE = "marketplace";
+	public static final String LICENCE_TYPE_LOCAL_SERVER = "local_server";
 
 
 	public enum BeanName {

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

@@ -53,6 +53,7 @@ public class RtmpMuxer extends Muxer {
 	boolean keyFrameReceived = false;
 
 	private AtomicBoolean preparedIO = new AtomicBoolean(false);
+	private AtomicBoolean cancelOpenIO = new AtomicBoolean(false);
 
 	public RtmpMuxer(String url, Vertx vertx) {
 		super(vertx);
@@ -141,32 +142,34 @@ public synchronized boolean prepareIO()
 			return false;
 		}
 		preparedIO.set(true);
+		cancelOpenIO.set(false);
 		boolean result = false;
 		//if there is a stream in the output format context, try to push
 		if (getOutputFormatContext().nb_streams() > 0) 
 		{
 			this.vertx.executeBlocking(() -> {
-	
 				if (openIO())
 				{
 					if (bsfFilterContextList.isEmpty())
 					{
 						writeHeader();
 						return null;
 					}
-					isRunning.set(true);
-					setStatus(IAntMediaStreamHandler.BROADCAST_STATUS_BROADCASTING);
+					if (!exitIfCancelled())
+					{
+						isRunning.set(true);
+						setStatus(IAntMediaStreamHandler.BROADCAST_STATUS_BROADCASTING);
+					}
+
 				}
 				else
 				{
 					clearResource();
 					setStatus(IAntMediaStreamHandler.BROADCAST_STATUS_FAILED);
 					logger.error("Cannot initializeOutputFormatContextIO for rtmp endpoint:{}", url);
 				}
-				
+
 				return null;
-				
-				
 			}, false);
 
 			result = true;
@@ -210,19 +213,24 @@ public synchronized boolean writeHeader() {
 	 */
 	@Override
 	public synchronized void writeTrailer() {
+		cancelOpenIO.set(true);
 		if(headerWritten){
 			super.writeTrailer();
 			trailerWritten = true;
 		}
 		else{
 			logger.info("Not writing trailer because header is not written yet");
+			clearResource();
 		}
 		setStatus(IAntMediaStreamHandler.BROADCAST_STATUS_FINISHED);
 	}
 
 	@Override
 	public synchronized void clearResource() {
 		super.clearResource();
+		if (!headerWritten) {
+			preparedIO.set(false);
+		}
 		/**
 		 *  Don't free the allocatedExtraDataPointer because it's internally deallocated
 		 *
@@ -235,6 +243,15 @@ public synchronized void clearResource() {
 		//allocatedExtraDataPointer is freed when the context is closing
 	}
 
+	private boolean exitIfCancelled() {
+		if (!cancelOpenIO.get()) {
+			return false;
+		}
+		logger.info("RTMP muxer openIO cancelled for {}", url);
+		clearResource();
+		return true;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */

src/main/java/io/antmedia/settings/ServerSettings.java

@@ -101,6 +101,8 @@ public class ServerSettings implements ApplicationContextAware, Serializable {
 
 	private static final String RTMPS_ENABLED = "rtmps.enabled";
 
+	private static final String LOCAL_LICENCE_SERVER_IP = "server.localLicenceServerIp";
+
 	/**
 	 * The IP filter that is allowed to access the web panel of Ant Media Server
 	 */
@@ -277,6 +279,13 @@ public class ServerSettings implements ApplicationContextAware, Serializable {
 	private String serverStatusWebHookURL;
 
 
+	/**
+	 * Customer License Key
+	 */
+	@Value( "${"+LOCAL_LICENCE_SERVER_IP+":#{null}}" )
+	private String localLicenceServerIps;
+
+
 	public String getJwksURL() {
 		return jwksURL;
 	}
@@ -697,4 +706,11 @@ public void setRtmpsEnabled(boolean rtmpsEnabled) {
 		ServerSettings.rtmpsEnabled = rtmpsEnabled;
 	}
 
+	public String getLocalLicenceServerIps() {
+		return localLicenceServerIps;
+	}
+
+	public void setLocalLicenceServerIps(String localLicenceServerIps) {
+		this.localLicenceServerIps = localLicenceServerIps;
+	}
 }

src/main/java/io/antmedia/streamsource/StreamFetcherManager.java

@@ -540,23 +540,20 @@ public void controlStreamFetchers(boolean restart) {
 
 			//get the updated broadcast object
 			Broadcast broadcast = datastore.get(streamScheduler.getStreamId());
-			
-			if  (broadcast != null && AntMediaApplicationAdapter.PLAY_LIST.equals(broadcast.getType())) {
-				//if it's playlist, continue
+
+			if (broadcast != null && AntMediaApplicationAdapter.PLAY_LIST.equals(broadcast.getType())) {
+				// For playlists, only check auto-stop if autoStartStopEnabled is true
+				if (broadcast.isAutoStartStopEnabled() && isToBeStoppedAutomatically(broadcast)) {
+					logger.info("Auto-stopping playlist {} because no viewers are watching", streamScheduler.getStreamId());
+					stopPlayList(streamScheduler.getStreamId());
+				}
 				continue;
 			}
-			
+
 			boolean autoStop = false;
-			if (restart || broadcast == null || 
-					(autoStop = isToBeStoppedAutomatically(broadcast))) 
+			if (restart || broadcast == null ||
+					(autoStop = isToBeStoppedAutomatically(broadcast)))
 			{
-				//logic of If condition is
-				
-				// stop it if it's restart = true 
-				//   or 
-				// brodcast == null because it means stream is deleted
-				//  or
-				// autoStop
 
 				logger.info("Calling stop stream {} due to restart -> {}, broadcast is null -> {}, auto stop because no viewer -> {}", 
 						streamScheduler.getStreamId(), restart, broadcast == null, autoStop);

src/main/java/io/antmedia/websocket/WebSocketCommunityHandler.java

@@ -153,7 +153,7 @@ else if (cmd.equals(WebSocketConstants.STOP_COMMAND)) {
 			else if (cmd.equals(WebSocketConstants.PING_COMMAND)) {
 				sendPongMessage(session);
 			}
-			else if (cmd.equals(WebSocketConstants.GET_STREAM_INFO_COMMAND) || cmd.equals(WebSocketConstants.PLAY_COMMAND)) 
+			else if (cmd.equals(WebSocketConstants.GET_STREAM_INFO_COMMAND) || cmd.equals(WebSocketConstants.PLAY_COMMAND))
 			{
 				sendNotFoundJSON(streamId, session);
 			}
@@ -166,7 +166,6 @@ else if (cmd.equals(WebSocketConstants.GET_STREAM_INFO_COMMAND) || cmd.equals(We
 		}
 
 	}
-		
 
 	private void startRTMPAdaptor(Session session, final String streamId, boolean enableVideo) {
 		int rtmpPort = appAdaptor.getServerSettings().getRtmpPort();