Skip to content

Commit 29b6315

Browse files
Peter Arwanitis + Stefan Kruschespex66
Peter Arwanitis + Stefan Krusche
authored andcommitted
Debug line clean-up
1 parent 1b491ad commit 29b6315

File tree

8 files changed

+6
-12
lines changed

8 files changed

+6
-12
lines changed

RtspCamera/project.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99

1010
# Project target.
1111
target=android-10
12+
android.library=false

RtspCamera/src/com/orangelabs/rcs/core/ims/protocol/rtp/Processor.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,7 @@ public void run() {
131131

132132
// Drop the old packet
133133
long seqNum = inBuffer.getSequenceNumber();
134-
135-
System.out.println("Proc run: sq# " + seqNum);
136-
134+
137135
if (seqNum + 3 > bigSeqNum) {
138136
if (seqNum > bigSeqNum) {
139137
bigSeqNum = seqNum;

RtspCamera/src/de/kp/net/rtp/recorder/RtspVideoRecorder.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -499,10 +499,7 @@ public void run() {
499499
}
500500

501501
if (encodeResult == 0 && encodedFrame.length > 0) {
502-
// Send encoded frame
503-
504-
System.out.println("LVP: captureThread: addFrame");
505-
502+
// Send encoded frame
506503
rtpInput.addFrame(encodedFrame, timeStamp += timestampInc);
507504
}
508505

-122 KB
Binary file not shown.
-158 KB
Binary file not shown.
-113 KB
Binary file not shown.
-147 KB
Binary file not shown.

RtspViewer/src/de/kp/rtspviewer/RtspViewerActivity.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
* @author Peter Arwanitis ([email protected])
88
*
99
*/
10-
import java.net.URI;
11-
1210
import android.app.Activity;
1311
import android.os.Bundle;
1412
import android.util.Log;
@@ -18,7 +16,7 @@
1816
import com.orangelabs.rcs.provider.settings.RcsSettings;
1917
import com.orangelabs.rcs.service.api.client.media.video.VideoSurfaceView;
2018

21-
import de.kp.net.rtsp.viewer.RtspVideoRenderer;
19+
import de.kp.net.rtp.viewer.RtpVideoRenderer;
2220

2321

2422

@@ -27,7 +25,7 @@ public class RtspViewerActivity extends Activity {
2725
/**
2826
* Video renderer
2927
*/
30-
private RtspVideoRenderer incomingRenderer = null;
28+
private RtpVideoRenderer incomingRenderer = null;
3129

3230
/**
3331
* Video preview
@@ -92,7 +90,7 @@ public void onCreate(Bundle icicle) {
9290
incomingVideoView = (VideoSurfaceView)findViewById(R.id.incoming_video_view);
9391
incomingVideoView.setAspectRatio(videoWidth, videoHeight);
9492
try {
95-
incomingRenderer = new RtspVideoRenderer("rtsp://192.168.178.47:8080/video");
93+
incomingRenderer = new RtpVideoRenderer("rtsp://192.168.178.53:8080/video");
9694

9795
} catch (Exception e) {
9896
// TODO Auto-generated catch block

0 commit comments

Comments
 (0)