Improve code quality

Signed-off-by: Leo Ma <[email protected]>
mzealey · Aug 12, 2017 · 57f23a3 · 57f23a3
1 parent 267aac5
commit 57f23a3
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/library/src/main/java/net/ossrs/yasea/SrsFlvMuxer.java b/library/src/main/java/net/ossrs/yasea/SrsFlvMuxer.java
@@ -663,7 +663,6 @@ public SrsFlvFrameBytes demuxAnnexb(ByteBuffer bb, MediaCodec.BufferInfo bi, boo
                 tbb.data = bb.slice();
                 tbb.size = bi.size - bb.position();
             }
-
             return tbb;
         }
     }
@@ -854,15 +853,10 @@ public void writeVideoSample(final ByteBuffer bb, MediaCodec.BufferInfo bi) {
             int dts = pts;
             int type = SrsCodecVideoAVCFrame.InterFrame;
             SrsFlvFrameBytes frame = avc.demuxAnnexb(bb, bi, true);
-            int nal_unit_type = (int)(frame.data.get(0) & 0x1f);
-            if (nal_unit_type == SrsAvcNaluType.NonIDR)
-            {
-
-            } else if (nal_unit_type == SrsAvcNaluType.IDR)
-            {
+            int nal_unit_type = frame.data.get(0) & 0x1f;
+            if (nal_unit_type == SrsAvcNaluType.IDR) {
                 type = SrsCodecVideoAVCFrame.KeyFrame;
-            } else if (nal_unit_type == SrsAvcNaluType.SPS || nal_unit_type == SrsAvcNaluType.PPS)
-            {
+            } else if (nal_unit_type == SrsAvcNaluType.SPS || nal_unit_type == SrsAvcNaluType.PPS) {
                 if (!frame.data.equals(h264_sps)) {
                     byte[] sps = new byte[frame.size];
                     frame.data.get(sps);
@@ -879,8 +873,9 @@ public void writeVideoSample(final ByteBuffer bb, MediaCodec.BufferInfo bi) {
                     writeH264SpsPps(dts, pts);
                 }
                 return;
-            } else
+            } else if (nal_unit_type != SrsAvcNaluType.NonIDR) {
                 return;
+            }
 
             ipbs.add(avc.muxNaluHeader(frame));
             ipbs.add(frame);