Skip to content

Commit bc9bc3d

Browse files
committed
Merge branch 'modify_libstreaming_project' of https://github.com/TakayukiHoshi1984/DeviceConnect-Android into modify_libstreaming_project
2 parents 66067c8 + 967b99f commit bc9bc3d

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

  • dConnectManager/dConnectManager/dconnect-manager-core/src/main/java/org/deviceconnect/android/manager/core
  • dConnectSDK/dConnectLibStreaming/libmedia/src/main/java/org/deviceconnect/android/libmedia/streaming/rtp

dConnectManager/dConnectManager/dconnect-manager-core/src/main/java/org/deviceconnect/android/manager/core/DConnectManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,7 @@ private void startRESTServer(final KeyStore keyStore) {
566566
ArrayList<String> list = new ArrayList<>();
567567
list.add("127.0.0.1"); // ipv4
568568
list.add("::1"); // ipv6
569+
list.add(DConnectUtil.getIPAddress(getContext()));
569570
builder.ipWhiteList(list);
570571
}
571572

dConnectSDK/dConnectLibStreaming/libmedia/src/main/java/org/deviceconnect/android/libmedia/streaming/rtp/RtpDepacketize.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
package org.deviceconnect.android.libmedia.streaming.rtp;
22

3+
import android.util.Log;
4+
5+
import org.deviceconnect.android.libmedia.BuildConfig;
6+
37
public abstract class RtpDepacketize {
8+
9+
private static final boolean DEBUG = BuildConfig.DEBUG;
10+
private static final String TAG = "RTP-DEPACKET";
11+
412
/**
513
* RTP のヘッダーサイズを定義します.
614
*/
@@ -89,7 +97,10 @@ public void write(byte[] data, int dataLength) {
8997
protected boolean checkSequenceNumber(byte[] data) {
9098
boolean result = true;
9199
int s = getSequenceNumber(data);
92-
if (mSequenceNumber != -1 && (mSequenceNumber + 1) % 65535 != s) {
100+
if (mSequenceNumber != -1 && (mSequenceNumber + 1) % 65536 != s) {
101+
if (DEBUG) {
102+
Log.e(TAG, "Error sequence number: [" + mSequenceNumber + " " + s + "]");
103+
}
93104
result = false;
94105
}
95106
mSequenceNumber = s;

0 commit comments

Comments
 (0)