Optimize RTMP writer thread
Merge RTMP writer thread into FLV muxer thread as well as connection thread. And seperate connection method from the frame cache fetch loop. Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>camera2
Leo Ma
9 years ago
parent
9339e9d544
commit
b1f35ffe89
@ -1,14 +0,0 @@
|
||||
package net.ossrs.yasea.rtmp.io;
|
||||
|
||||
import net.ossrs.yasea.rtmp.packets.RtmpPacket;
|
||||
|
||||
/**
|
||||
* Handler interface for received RTMP packets
|
||||
* @author francois
|
||||
*/
|
||||
public interface PacketRxHandler {
|
||||
|
||||
public void handleRxPacket(RtmpPacket rtmpPacket);
|
||||
|
||||
public void notifyWindowAckRequired(final int numBytesReadThusFar);
|
||||
}
|
||||
@ -1,124 +0,0 @@
|
||||
package net.ossrs.yasea.rtmp.io;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.net.SocketException;
|
||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
import net.ossrs.yasea.rtmp.RtmpPublisher;
|
||||
import net.ossrs.yasea.rtmp.packets.Audio;
|
||||
import net.ossrs.yasea.rtmp.packets.Command;
|
||||
import net.ossrs.yasea.rtmp.packets.RtmpPacket;
|
||||
import net.ossrs.yasea.rtmp.packets.Video;
|
||||
|
||||
/**
|
||||
* RTMPConnection's write thread
|
||||
*
|
||||
* @author francois, leo
|
||||
*/
|
||||
public class WriteThread extends Thread {
|
||||
|
||||
private static final String TAG = "WriteThread";
|
||||
|
||||
private RtmpSessionInfo rtmpSessionInfo;
|
||||
private OutputStream out;
|
||||
private ConcurrentLinkedQueue<RtmpPacket> writeQueue = new ConcurrentLinkedQueue<RtmpPacket>();
|
||||
private final Object txPacketLock = new Object();
|
||||
private volatile boolean active = true;
|
||||
private int videoFrameCount;
|
||||
private long lastTimeMillis;
|
||||
private RtmpPublisher publisher;
|
||||
|
||||
public WriteThread(RtmpSessionInfo rtmpSessionInfo, OutputStream out, RtmpPublisher publisher) {
|
||||
super("RtmpWriteThread");
|
||||
this.rtmpSessionInfo = rtmpSessionInfo;
|
||||
this.out = out;
|
||||
this.publisher = publisher;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
|
||||
while (active) {
|
||||
try {
|
||||
while (!writeQueue.isEmpty()) {
|
||||
RtmpPacket rtmpPacket = writeQueue.poll();
|
||||
ChunkStreamInfo chunkStreamInfo = rtmpSessionInfo.getChunkStreamInfo(rtmpPacket.getHeader().getChunkStreamId());
|
||||
chunkStreamInfo.setPrevHeaderTx(rtmpPacket.getHeader());
|
||||
if (!(rtmpPacket instanceof Video || rtmpPacket instanceof Audio)) {
|
||||
rtmpPacket.getHeader().setAbsoluteTimestamp((int) chunkStreamInfo.markAbsoluteTimestampTx());
|
||||
}
|
||||
rtmpPacket.writeTo(out, rtmpSessionInfo.getTxChunkSize(), chunkStreamInfo);
|
||||
Log.d(TAG, "WriteThread: wrote packet: " + rtmpPacket + ", size: " + rtmpPacket.getHeader().getPacketLength());
|
||||
if (rtmpPacket instanceof Command) {
|
||||
rtmpSessionInfo.addInvokedCommand(((Command) rtmpPacket).getTransactionId(), ((Command) rtmpPacket).getCommandName());
|
||||
}
|
||||
if (rtmpPacket instanceof Video) {
|
||||
publisher.getVideoFrameCacheNumber().getAndDecrement();
|
||||
calcFps();
|
||||
}
|
||||
}
|
||||
out.flush();
|
||||
} catch (SocketException se) {
|
||||
Log.e(TAG, "WriteThread: Caught SocketException during write loop, shutting down: " + se.getMessage());
|
||||
Thread.getDefaultUncaughtExceptionHandler().uncaughtException(this, se);
|
||||
active = false;
|
||||
continue;
|
||||
} catch (IOException ioe) {
|
||||
Log.e(TAG, "WriteThread: Caught IOException during write loop, shutting down: " + ioe.getMessage());
|
||||
Thread.getDefaultUncaughtExceptionHandler().uncaughtException(this, ioe);
|
||||
active = false;
|
||||
continue;
|
||||
}
|
||||
|
||||
// Waiting for next packet
|
||||
Log.d(TAG, "WriteThread: waiting...");
|
||||
synchronized (txPacketLock) {
|
||||
try {
|
||||
// isEmpty() may take some time, so time out should be set to wait next offer
|
||||
txPacketLock.wait(500);
|
||||
} catch (InterruptedException ex) {
|
||||
Log.w(TAG, "Interrupted", ex);
|
||||
this.interrupt();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Log.d(TAG, "exit");
|
||||
}
|
||||
|
||||
/** Transmit the specified RTMP packet (thread-safe) */
|
||||
public void send(RtmpPacket rtmpPacket) {
|
||||
if (rtmpPacket != null) {
|
||||
writeQueue.add(rtmpPacket);
|
||||
}
|
||||
synchronized (txPacketLock) {
|
||||
txPacketLock.notify();
|
||||
}
|
||||
}
|
||||
|
||||
public void shutdown() {
|
||||
Log.d(TAG, "Stopping");
|
||||
writeQueue.clear();
|
||||
active = false;
|
||||
synchronized (txPacketLock) {
|
||||
txPacketLock.notify();
|
||||
}
|
||||
}
|
||||
|
||||
private void calcFps() {
|
||||
if (videoFrameCount == 0) {
|
||||
lastTimeMillis = System.nanoTime() / 1000000;
|
||||
videoFrameCount++;
|
||||
} else {
|
||||
if (++videoFrameCount >= 48) {
|
||||
long diffTimeMillis = System.nanoTime() / 1000000 - lastTimeMillis;
|
||||
publisher.getEventHandler().onRtmpOutputFps((double) videoFrameCount * 1000 / diffTimeMillis);
|
||||
videoFrameCount = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue