diff --git a/WebRTCControlled/app/src/main/java/com/ttstd/controlled/webrtc/SelfCodecEncoder.java b/WebRTCControlled/app/src/main/java/com/ttstd/controlled/webrtc/SelfCodecEncoder.java index f48607e..57fe4cb 100644 --- a/WebRTCControlled/app/src/main/java/com/ttstd/controlled/webrtc/SelfCodecEncoder.java +++ b/WebRTCControlled/app/src/main/java/com/ttstd/controlled/webrtc/SelfCodecEncoder.java @@ -29,8 +29,8 @@ public class SelfCodecEncoder { // ---- 自定义二进制协议(与控制端 SelfCodecDecoder 保持一致)---- private static final byte MAGIC = (byte) 0xAB; private static final int CHUNK_SIZE = 16384; // 每个 DataChannel 分片大小 - private static final int UNIT_TYPE_CONFIG = 1; // SPS/PPS 等参数集 - private static final int UNIT_TYPE_FRAME = 2; // 编码帧 + private static final byte UNIT_TYPE_CONFIG = 1; // SPS/PPS 等参数集 + private static final byte UNIT_TYPE_FRAME = 2; // 编码帧 private static final String TAG = "SelfCodecEncoder"; diff --git a/WebRTCController/app/src/main/java/com/ttstd/controller/webrtc/WebRtcClient.java b/WebRTCController/app/src/main/java/com/ttstd/controller/webrtc/WebRtcClient.java index ff9f108..e224a4b 100644 --- a/WebRTCController/app/src/main/java/com/ttstd/controller/webrtc/WebRtcClient.java +++ b/WebRTCController/app/src/main/java/com/ttstd/controller/webrtc/WebRtcClient.java @@ -64,6 +64,10 @@ public class WebRtcClient { void onDisconnected(); } + public interface StreamModeReportListener { + void onStreamModeReported(int mode); + } + private ConnectionListener connectionListener; public WebRtcClient(Context context, WebSocketClient wsClient, String deviceId) { @@ -395,7 +399,7 @@ public class WebRtcClient { } private void sendIceCandidate(IceCandidate candidate, String controlledId) { - Log.e(TAG, "sendIceCandidate: " ); + Log.d(TAG, "sendIceCandidate: " ); SignalMessage msg = new SignalMessage(); msg.setType("ICE_CANDIDATE"); msg.setFromDeviceId(deviceId); diff --git a/WebRTCController/app/src/main/res/layout/activity_main.xml b/WebRTCController/app/src/main/res/layout/activity_main.xml index a182f7a..f0dfb1e 100644 --- a/WebRTCController/app/src/main/res/layout/activity_main.xml +++ b/WebRTCController/app/src/main/res/layout/activity_main.xml @@ -160,8 +160,9 @@ android:backgroundTint="#E53935" android:text="断开连接" android:textColor="@android:color/white" /> +