Skip to content

Commit c0313e2

Browse files
サンプルの RTSP プレイヤーを最新のインターフェースで動作するように修正
1 parent 835bca9 commit c0313e2

3 files changed

Lines changed: 29 additions & 9 deletions

File tree

dConnectSDK/dConnectLibStreaming/libmedia/src/main/java/org/deviceconnect/android/libmedia/streaming/rtsp/RtspClient.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class RtspClient {
4141
/**
4242
* RTSP サーバの URL.
4343
*/
44-
private String mRtspServerUrl;
44+
private final String mRtspServerUrl;
4545

4646
/**
4747
* RTSP サーバに送信するリクエストに付加するユーザエージェント.
@@ -61,12 +61,12 @@ public class RtspClient {
6161
/**
6262
* 指定ポート番号リスト.
6363
*/
64-
private List<Integer> mRtpPortList;
64+
private final List<Integer> mRtpPortList = new ArrayList<>();
6565

6666
/**
6767
* 使用ポート番号リスト.
6868
*/
69-
private List<Integer> mUsePortList;
69+
private final List<Integer> mUsePortList = new ArrayList<>();
7070

7171
/**
7272
* コンストラクタ.
@@ -97,8 +97,7 @@ public RtspClient(String url, List<Integer> rtpPortList) {
9797
}
9898

9999
mRtspServerUrl = url;
100-
mUsePortList = new ArrayList<>();
101-
mRtpPortList = rtpPortList;
100+
mRtpPortList.addAll(rtpPortList);
102101
}
103102

104103
/**

dConnectSDK/dConnectLibStreaming/libmedia/src/main/java/org/deviceconnect/android/libmedia/streaming/rtsp/player/RtspPlayer.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class RtspPlayer {
4444
/**
4545
* RTSP サーバの URL.
4646
*/
47-
private String mUrl;
47+
private final String mUrl;
4848

4949
/**
5050
* RTSP サーバへの接続リトライ回数.
@@ -119,6 +119,10 @@ public RtspPlayer(String url, List<Integer> rtpPortList) {
119119
addAudioFactory("mpeg4-generic", new AACLATMDecoderFactory());
120120
}
121121

122+
public String getUrl() {
123+
return mUrl;
124+
}
125+
122126
/**
123127
* 受信したデータサイズを取得します.
124128
*

dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/java/org/deviceconnect/android/rtspplayer/RTSPPlayerActivity.java

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.deviceconnect.android.rtspplayer;
22

33
import android.content.Intent;
4+
import android.media.Image;
45
import android.os.Bundle;
56
import android.util.Log;
67
import android.util.Size;
@@ -10,14 +11,15 @@
1011
import android.widget.ProgressBar;
1112
import android.widget.TextView;
1213

14+
import androidx.appcompat.app.AlertDialog;
15+
import androidx.appcompat.app.AppCompatActivity;
16+
1317
import org.deviceconnect.android.libmedia.streaming.rtsp.player.RtspPlayer;
1418

19+
import java.nio.ByteBuffer;
1520
import java.util.ArrayList;
1621
import java.util.List;
1722

18-
import androidx.appcompat.app.AlertDialog;
19-
import androidx.appcompat.app.AppCompatActivity;
20-
2123
public class RTSPPlayerActivity extends AppCompatActivity {
2224

2325
static final String EXTRA_URI = "_extra_uri";
@@ -98,6 +100,21 @@ public void onSizeChanged(int width, int height) {
98100
runOnUiThread(() -> changePlayerSize(width, height));
99101
}
100102

103+
@Override
104+
public void onVideoData(Image image, long presentationTimeUs) {
105+
106+
}
107+
108+
@Override
109+
public void onAudioFormatChanged(int samplingRate, int channel) {
110+
111+
}
112+
113+
@Override
114+
public void onAudioData(ByteBuffer data, int offset, int size, long presentationTimeUs) {
115+
116+
}
117+
101118
@Override
102119
public void onError(Exception e) {
103120
Log.e("RTSP-PLAYER", "Error", e);

0 commit comments

Comments
 (0)