Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add rtmp and srt publish subscriber block #5867

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add rtmp and srt publish subscriber block #5867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d59d3e4
add rtmp and srt publish subscriber block
Dec 1, 2023
99a1e54
Merge branch 'master' into subscriberBlockRtmpSrt
Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/main/java/io/antmedia/AntMediaApplicationAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1781,7 +1781,21 @@ public boolean stopPlayingBySubscriberId(String subscriberId){
return false;
}

public boolean stopPublishingBySubscriberId(String subscriberId){
public boolean stopPublishingBySubscriberId(String streamId, String subscriberId) {

IClientBroadcastStream broadcastStream = (IClientBroadcastStream) getBroadcastStream(getScope(), streamId);
if (broadcastStream != null) {
Map broadcastParameters = broadcastStream.getParameters();
if (broadcastParameters != null && broadcastParameters.containsKey("subscriberId") && broadcastParameters.get("subscriberId").equals(subscriberId)) {
IStreamCapableConnection connection = broadcastStream.getConnection();
if (connection != null) {
connection.close();
}
return true;
}

}

return false;
}

Expand Down
5 changes: 3 additions & 2 deletions src/main/java/io/antmedia/rest/BroadcastRestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,8 +786,9 @@ public Result blockSubscriber(@ApiParam(value = "the id of the stream", required
getApplication().stopPlayingBySubscriberId(subscriberId);
}

if (Subscriber.PUBLISH_TYPE.equals(blockType) || Subscriber.PUBLISH_AND_PLAY_TYPE.equals(blockType)) {
getApplication().stopPublishingBySubscriberId(subscriberId);
if (Subscriber.PUBLISH_TYPE.equals(blockType) || Subscriber.PUBLISH_AND_PLAY_TYPE.equals(blockType))
{
getApplication().stopPublishingBySubscriberId(streamId, subscriberId);
}


Expand Down
28 changes: 28 additions & 0 deletions src/test/java/io/antmedia/test/AntMediaApplicationAdaptorUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
import org.mockito.Mockito;
import org.red5.server.api.IContext;
import org.red5.server.api.scope.IScope;
import org.red5.server.api.stream.IStreamCapableConnection;
import org.red5.server.scope.Scope;
import org.red5.server.stream.ClientBroadcastStream;
import org.springframework.context.ApplicationContext;

Expand Down Expand Up @@ -164,6 +166,7 @@ public void testIsIncomingTimeValid() {
Mockito.doReturn(mock(DataStore.class)).when(spyAdapter).getDataStore();



newSettings = new AppSettings();

assertFalse(spyAdapter.isIncomingTimeValid(newSettings));
Expand Down Expand Up @@ -1894,4 +1897,29 @@ public void testSetAndGetSubtrackPoller() {
assertEquals("The retrieved subtrackPoller should match the mock instance.", mockSubtrackPoller, retrievedSubtrackPoller);
}

@Test
public void testStopRtmpPublishBySubscriberId(){
AntMediaApplicationAdapter spyAdapter = Mockito.spy(adapter);

String streamId = "testStream";
String subscriberId = "testSubscriber";
IScope scope = mock(Scope.class);

ClientBroadcastStream cbs = mock(ClientBroadcastStream.class);
when(spyAdapter.getScope()).thenReturn(scope);
when(spyAdapter.getBroadcastStream(scope, streamId)).thenReturn(cbs);
Map broadcastParameters = new HashMap();

when(cbs.getParameters()).thenReturn(broadcastParameters);

IStreamCapableConnection connection = mock(IStreamCapableConnection.class);
when(cbs.getConnection()).thenReturn(connection);


assertFalse(spyAdapter.stopPublishingBySubscriberId(streamId,subscriberId));

broadcastParameters.put("subscriberId", subscriberId);
assertTrue(spyAdapter.stopPublishingBySubscriberId(streamId,subscriberId));

}
}
4 changes: 2 additions & 2 deletions src/test/java/io/antmedia/test/rest/BroadcastRestServiceV2UnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3178,7 +3178,7 @@ public void testBlockSubscriber(){
assertTrue((subscriberFromDB.getBlockedUntilUnitTimeStampMs() - System.currentTimeMillis()) <= 20000);
assertFalse((subscriberFromDB.getBlockedUntilUnitTimeStampMs() - System.currentTimeMillis()) > 20000);

Mockito.verify(adaptor).stopPublishingBySubscriberId(subscriber2Id);
Mockito.verify(adaptor).stopPublishingBySubscriberId(streamId, subscriber2Id);


String subscriber3Id = "subscriber3";
Expand All @@ -3197,7 +3197,7 @@ public void testBlockSubscriber(){
assertTrue((subscriberFromDB.getBlockedUntilUnitTimeStampMs() - System.currentTimeMillis()) <= 20000);
assertFalse((subscriberFromDB.getBlockedUntilUnitTimeStampMs() - System.currentTimeMillis()) > 20000);

Mockito.verify(adaptor).stopPublishingBySubscriberId(subscriber3Id);
Mockito.verify(adaptor).stopPublishingBySubscriberId(streamId, subscriber3Id);
Mockito.verify(adaptor).stopPlayingBySubscriberId(subscriber3Id);


Expand Down