xymp
/
MpLive
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update

Browse Source 
Signed-off-by: begeekmyfriend <begeekmyfriend@gmail.com>
camera2
begeekmyfriend 4 years ago
parent ae2c11406a
commit fba1588ad6
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File

48
library/src/main/java/com/github/faucamp/simplertmp/io/RtmpConnection.java
Unescape Escape View File

@ -1,21 +1,5 @@
package com.github.faucamp.simplertmp.io; package com.github.faucamp.simplertmp.io;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketException;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.concurrent.atomic.AtomicInteger;
import android.util.Log; import android.util.Log;
import com.github.faucamp.simplertmp.RtmpHandler; import com.github.faucamp.simplertmp.RtmpHandler;
@ -26,16 +10,32 @@ import com.github.faucamp.simplertmp.amf.AmfNumber;
import com.github.faucamp.simplertmp.amf.AmfObject; import com.github.faucamp.simplertmp.amf.AmfObject;
import com.github.faucamp.simplertmp.amf.AmfString; import com.github.faucamp.simplertmp.amf.AmfString;
import com.github.faucamp.simplertmp.packets.Abort; import com.github.faucamp.simplertmp.packets.Abort;
import com.github.faucamp.simplertmp.packets.Audio;
import com.github.faucamp.simplertmp.packets.Command;
import com.github.faucamp.simplertmp.packets.Data; import com.github.faucamp.simplertmp.packets.Data;
import com.github.faucamp.simplertmp.packets.Handshake; import com.github.faucamp.simplertmp.packets.Handshake;
import com.github.faucamp.simplertmp.packets.Command; import com.github.faucamp.simplertmp.packets.RtmpPacket;
import com.github.faucamp.simplertmp.packets.Audio;
import com.github.faucamp.simplertmp.packets.SetPeerBandwidth; import com.github.faucamp.simplertmp.packets.SetPeerBandwidth;
import com.github.faucamp.simplertmp.packets.Video;
import com.github.faucamp.simplertmp.packets.UserControl; import com.github.faucamp.simplertmp.packets.UserControl;
import com.github.faucamp.simplertmp.packets.RtmpPacket; import com.github.faucamp.simplertmp.packets.Video;
import com.github.faucamp.simplertmp.packets.WindowAckSize; import com.github.faucamp.simplertmp.packets.WindowAckSize;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketException;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* Main RTMP connection implementation class * Main RTMP connection implementation class
* *
@ -116,7 +116,7 @@ public class RtmpConnection implements RtmpPublisher {
return false; return false;
} }
if (streamName == null || appName == null) { if (appName == null || streamName == null) {
mHandler.notifyRtmpIllegalArgumentException(new IllegalArgumentException( mHandler.notifyRtmpIllegalArgumentException(new IllegalArgumentException(
"Invalid RTMP URL. Must be in format: rtmp://host[:port]/application/streamName")); "Invalid RTMP URL. Must be in format: rtmp://host[:port]/application/streamName"));
return false; return false;
@ -491,7 +491,7 @@ public class RtmpConnection implements RtmpPublisher {
rtmpPacket.getHeader().setAbsoluteTimestamp((int) chunkStreamInfo.markAbsoluteTimestampTx()); rtmpPacket.getHeader().setAbsoluteTimestamp((int) chunkStreamInfo.markAbsoluteTimestampTx());
} }
rtmpPacket.writeTo(outputStream, rtmpSessionInfo.getTxChunkSize(), chunkStreamInfo); rtmpPacket.writeTo(outputStream, rtmpSessionInfo.getTxChunkSize(), chunkStreamInfo);
Log.d(TAG, "wrote packet: " + rtmpPacket + ", size: " + rtmpPacket.getHeader().getPacketLength()); //Log.d(TAG, "wrote packet: " + rtmpPacket + ", size: " + rtmpPacket.getHeader().getPacketLength());
if (rtmpPacket instanceof Command) { if (rtmpPacket instanceof Command) {
rtmpSessionInfo.addInvokedCommand(((Command) rtmpPacket).getTransactionId(), ((Command) rtmpPacket).getCommandName()); rtmpSessionInfo.addInvokedCommand(((Command) rtmpPacket).getTransactionId(), ((Command) rtmpPacket).getCommandName());
} }
@ -526,7 +526,9 @@ public class RtmpConnection implements RtmpPublisher {
UserControl user = (UserControl) rtmpPacket; UserControl user = (UserControl) rtmpPacket;
switch (user.getType()) { switch (user.getType()) {
case STREAM_BEGIN: case STREAM_BEGIN:
Log.d(TAG, "handleRxPacketLoop(): Receive STREAM_BEGIN"); if (currentStreamId != user.getFirstEventData()) {
mHandler.notifyRtmpIllegalStateException(new IllegalStateException("Current stream ID error!"));
}
break; break;
case PING_REQUEST: case PING_REQUEST:
ChunkStreamInfo channelInfo = rtmpSessionInfo.getChunkStreamInfo(ChunkStreamInfo.RTMP_CID_PROTOCOL_CONTROL); ChunkStreamInfo channelInfo = rtmpSessionInfo.getChunkStreamInfo(ChunkStreamInfo.RTMP_CID_PROTOCOL_CONTROL);

Write Preview
Loading…
Cancel
Save