1

王通
1 parent 11a60adb
Showing 4 changed files with 26 additions and 58 deletions
src/main/java/cn/org/hentai/jtt1078/publisher/Channel.java
src/main/java/cn/org/hentai/jtt1078/server/Jtt1078Handler.java
src/main/java/cn/org/hentai/jtt1078/server/Jtt1078MessageDecoder.java
src/main/java/cn/org/hentai/jtt1078/server/RTSPHandler.java
@@ -92,10 +92,6 @@ public class Channel
         }
     }
  
-    public void writeVideoRtp(byte[] h264) {
-
-    }
-
     public void broadcastVideo(long timeoffset, byte[] flvTag)
     {
         for (Subscriber subscriber : subscribers)
@@ -150,20 +146,9 @@ public class Channel
                 if (i == 0) continue;
                 byte[] nalu = new byte[i];
                 buffer.sliceInto(nalu, i);
-                //System.out.println(nalu.length);
-                //System.out.println(toHex(nalu));
                 return nalu;
             }
         }
         return null;
     }
-
-    public String toHex(byte[] bytes) {
-        StringBuilder sb = new StringBuilder();
-        for (byte b : bytes) {
-            sb.append(String.format("%02X ", b));
-        }
-
-        return sb.toString();
-    }
 }
 package cn.org.hentai.jtt1078.server;
  
+import cn.org.hentai.jtt1078.entity.Media;
+import cn.org.hentai.jtt1078.entity.MediaEncoding;
 import cn.org.hentai.jtt1078.publisher.Channel;
 import cn.org.hentai.jtt1078.publisher.PublishManager;
+import cn.org.hentai.jtt1078.entity.Audio;
 import cn.org.hentai.jtt1078.rtp.H264Packeter;
 import cn.org.hentai.jtt1078.rtsp.RtspSessionManager;
 import cn.org.hentai.jtt1078.util.Packet;
@@ -13,13 +16,15 @@ import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.handler.codec.rtsp.RtspDecoder;
 import io.netty.handler.codec.rtsp.RtspEncoder;
+import io.netty.util.Attribute;
 import io.netty.util.AttributeKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import io.netty.handler.timeout.IdleState;
-import io.netty.handler.timeout.IdleStateEvent;
  
 import java.net.InetSocketAddress;
+import java.util.Iterator;
+import io.netty.handler.timeout.IdleState;
+import io.netty.handler.timeout.IdleStateEvent;
  
 /**
  * Created by matrixy on 2019/4/9.
@@ -39,7 +44,8 @@ public class Jtt1078Handler extends SimpleChannelInboundHandler&lt;Packet&gt;
         int channel = packet.nextByte() & 0xff;
         String tag = sim + "-" + channel;
  
-        if (SessionManager.contains(nettyChannel, "tag") == false) {
+        if (SessionManager.contains(nettyChannel, "tag") == false)
+        {
             Channel chl = PublishManager.getInstance().open(tag);
             SessionManager.set(nettyChannel, "tag", tag);
             new Thread(new PushTask(tag)).start();
@@ -68,7 +74,7 @@ public class Jtt1078Handler extends SimpleChannelInboundHandler&lt;Packet&gt;
                 SessionManager.set(nettyChannel, "video-sequence", sequence);
             }
             long timestamp = packet.seek(16).nextLong();
-            //PublishManager.getInstance().publishVideo(tag, sequence, timestamp, pt, packet.seek(lengthOffset + 2).nextBytes());
+            PublishManager.getInstance().publishVideo(tag, sequence, timestamp, pt, packet.seek(lengthOffset + 2).nextBytes());
             if (RtspSessionManager.isRegistered(tag)) {
                 io.netty.channel.Channel push = RtspSessionManager.getPush(tag);
                 H264Packeter packeter = (H264Packeter) push.attr(AttributeKey.valueOf(tag)).get();
@@ -23,45 +23,20 @@ public class Jtt1078MessageDecoder extends ByteToMessageDecoder
     protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
     {
         int length = in.readableBytes();
-        while (length > 30) {
-            in.markReaderIndex();
-            int frameHeader = in.readInt();
-            if (frameHeader == 0x30316364) {
-                in.skipBytes(11);
-                int dataType = (in.readByte() >> 4) & 0xFF, lengthOffset = 28;
-                // 透传数据类型：0100，没有后面的时间以及Last I Frame Interval和Last Frame Interval字段
-                if (dataType == 0x04) lengthOffset = 28 - 8 - 2 - 2;
-                else if (dataType == 0x03) lengthOffset = 28 - 4;
-                in.skipBytes(lengthOffset - 16);
-                int bodyLength = in.readShort() & 0xFFFFFFFF;
-                int packetLength = lengthOffset + bodyLength + 2;
-                //System.out.println(bodyLength);
-                if (length < packetLength) {
-                    in.resetReaderIndex();
-                    return;
-                }
-                byte[] data = new byte[packetLength];
-                in.resetReaderIndex();
-                in.readBytes(data);
-                Packet packet = Packet.create(data);
-                out.add(packet);
-//                System.out.println("start:" + (lengthOffset + 2));
-//                System.out.println(toHex(data));
-            } else {
-                in.resetReaderIndex();
-                in.readByte();
-            }
+        for (int i = 0, k = (int)Math.ceil(length / 512f); i < k; i++)
+        {
+            int l = i < k - 1 ? 512 : length - (i * 512);
+            in.readBytes(block, 0, l);
  
-            length = in.readableBytes();
-        }
-    }
+            decoder.write(block, 0, l);
  
-    public String toHex(byte[] bytes) {
-        StringBuilder sb = new StringBuilder();
-        for (byte b : bytes) {
-            sb.append(String.format("%02X ", b));
-        }
+            while (true)
+            {
+                Packet p = decoder.decode();
+                if (p == null) break;
  
-        return sb.toString();
+                out.add(p);
+            }
+        }
     }
 }
@@ -8,7 +8,9 @@ import io.netty.channel.*;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.handler.codec.http.*;
+import io.netty.handler.codec.http.DefaultHttpContent;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.rtsp.*;
 import io.netty.util.internal.StringUtil;
 import org.slf4j.Logger;
@@ -21,7 +23,7 @@ public class RTSPHandler extends ChannelInboundHandlerAdapter {
  
     private final static Logger log = LoggerFactory.getLogger(RTSPHandler.class);
  
-    private String channelId = "138000099998-1";
+    private String channelId = "122223333444-1";
  
     private HttpMethod currentMethod = RtspMethods.OPTIONS;