qq27800734/taoyao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] 安卓消费媒体

Browse Source
This commit is contained in:
acgist
2023-04-29 10:18:06 +08:00
parent 2bdb45874a
commit f5f19bc4c2
4 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/MediaManager.java
View File

@@ -721,14 +721,14 @@ public final class MediaManager {
@Override
public void onCapturerStarted(boolean status) {
Log.i(MediaManager.class.getSimpleName(), "结束视频捕获");
Log.i(MediaManager.class.getSimpleName(), "开始视频捕获");
this.mainObserver.onCapturerStarted(status);
this.shareObserver.onCapturerStarted(status);
}
@Override
public void onCapturerStopped() {
Log.i(MediaManager.class.getSimpleName(), "开始视频捕获");
Log.i(MediaManager.class.getSimpleName(), "结束视频捕获");
this.mainObserver.onCapturerStopped();
this.shareObserver.onCapturerStopped();
}

22
taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/client/Room.java
View File

@@ -52,11 +52,10 @@ public class Room extends CloseableClient implements RouterCallback {
private LocalClient localClient;
private PeerConnection.RTCConfiguration rtcConfiguration;
private PeerConnectionFactory peerConnectionFactory;
private String rtpCapabilities;
private String sctpCapabilities;
private Object rtpCapabilities;
private Object sctpCapabilities;
/**
*
* @param name 房间名称
* @param roomId 房间ID
* @param clientId 当前终端ID
@@ -121,8 +120,12 @@ public class Room extends CloseableClient implements RouterCallback {
return this.taoyao.requestFuture(
this.taoyao.buildMessage("media::router::rtp::capabilities", "roomId", this.roomId),
response -> {
final Object rtpCapabilities = MapUtils.get(response.body(), "rtpCapabilities");
this.nativeEnterRoom(this.nativeRoomPointer, JSONUtils.toJSON(rtpCapabilities), this.peerConnectionFactory.getNativePeerConnectionFactory(), this.rtcConfiguration);
this.nativeEnterRoom(
this.nativeRoomPointer,
JSONUtils.toJSON(MapUtils.get(response.body(), "rtpCapabilities")),
this.peerConnectionFactory.getNativePeerConnectionFactory(),
this.rtcConfiguration
);
return true;
},
response -> {
@@ -311,20 +314,19 @@ public class Room extends CloseableClient implements RouterCallback {
@Override
public void enterRoomCallback(String rtpCapabilities, String sctpCapabilities) {
this.rtpCapabilities = rtpCapabilities;
this.sctpCapabilities = sctpCapabilities;
this.rtpCapabilities = JSONUtils.toJava(rtpCapabilities);
this.sctpCapabilities = JSONUtils.toJava(sctpCapabilities);
this.taoyao.push(this.taoyao.buildMessage(
"room::enter",
"roomId", this.roomId,
"password", this.password,
"rtpCapabilities", rtpCapabilities,
"sctpCapabilities", sctpCapabilities
"rtpCapabilities", this.rtpCapabilities,
"sctpCapabilities", this.sctpCapabilities
));
}
@Override
public void closeRoomCallback() {
}
@Override