Add pause recording function

Signed-off-by: Leo Ma <[email protected]>
ielicyan · May 30, 2016 · 2a8bbbe · 2a8bbbe
1 parent b2b4b3f
commit 2a8bbbe
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 15 deletions.
diff --git a/app/src/main/java/net/ossrs/yasea/MainActivity.java b/app/src/main/java/net/ossrs/yasea/MainActivity.java
@@ -186,6 +186,7 @@ public void onClick(View v) {
                 stopPublish();
                 btnPublish.setEnabled(true);
                 btnStop.setEnabled(false);
+                btnRecord.setText("record");
             }
         });
 
@@ -204,12 +205,15 @@ public void onClick(View v) {
         btnRecord.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (btnRecord.getText() == "Record") {
+                if (btnRecord.getText().toString().contentEquals("record")) {
                     mEncoder.record();
-                    btnRecord.setText("Stop");
-                } else {
-                    mEncoder.stopRecord();
-                    btnRecord.setText("Record");
+                    btnRecord.setText("pause");
+                } else if (btnRecord.getText().toString().contentEquals("pause")) {
+                    mEncoder.pauseRecord();
+                    btnRecord.setText("resume");
+                } else if (btnRecord.getText().toString().contentEquals("resume")) {
+                    mEncoder.pauseRecord();
+                    btnRecord.setText("pause");
                 }
             }
         });

diff --git a/app/src/main/java/net/ossrs/yasea/SrsEncoder.java b/app/src/main/java/net/ossrs/yasea/SrsEncoder.java
@@ -155,10 +155,10 @@ public int start() {
         return 0;
     }
 
-    public void stopRecord() {
+    public void pauseRecord() {
         if (mp4Muxer != null) {
-            Log.i(TAG, "stop MP4 muxer");
-            mp4Muxer.stop();
+            Log.i(TAG, "pause MP4 muxer");
+            mp4Muxer.pause();
         }
     }
 

diff --git a/app/src/main/java/net/ossrs/yasea/SrsMp4Muxer.java b/app/src/main/java/net/ossrs/yasea/SrsMp4Muxer.java
@@ -82,6 +82,8 @@ public class SrsMp4Muxer {
 
     private Thread worker;
     private volatile boolean bRecording = false;
+    private volatile boolean bPaused = false;
+    private volatile boolean needToSearchKeyFrame = false;
     private final Object writeLock = new Object();
     private ConcurrentLinkedQueue<SrsEsFrame> frameCache = new ConcurrentLinkedQueue<>();
 
@@ -161,6 +163,16 @@ public void run() {
         worker.start();
     }
 
+    /**
+     * pause recording.
+     */
+    public void pause() {
+        bPaused = !bPaused;
+        if (!bPaused) {
+            needToSearchKeyFrame = true;
+        }
+    }
+
     /**
      * finish recording.
      */
@@ -266,7 +278,7 @@ class SrsAvcNaluType
     public void writeVideoSample(final ByteBuffer bb, MediaCodec.BufferInfo bi) throws IllegalArgumentException {
         int nal_unit_type = bb.get(4) & 0x1f;
         if (nal_unit_type == SrsAvcNaluType.IDR || nal_unit_type == SrsAvcNaluType.NonIDR) {
-            writeFrameByte(VIDEO_TRACK, bb, bi);
+            writeFrameByte(VIDEO_TRACK, bb, bi, nal_unit_type == SrsAvcNaluType.IDR);
         } else {
             while (bb.position() < bi.size) {
                 SrsEsFrameBytes frame = avc.annexb_demux(bb, bi);
@@ -305,20 +317,31 @@ public void writeAudioSample(final ByteBuffer bb, MediaCodec.BufferInfo bi) {
             aacSpecConfig = true;
             mp4Movie.addTrack(audioFormat, true);
         } else {
-            writeFrameByte(AUDIO_TRACK, bb, bi);
+            writeFrameByte(AUDIO_TRACK, bb, bi, false);
         }
     }
 
-    private void writeFrameByte(int track, ByteBuffer bb, MediaCodec.BufferInfo bi) {
+    private void writeFrameByte(int track, ByteBuffer bb, MediaCodec.BufferInfo bi, boolean isKeyFrame) {
         SrsEsFrame frame = new SrsEsFrame();
         frame.bb = bb;
         frame.bi = bi;
+        frame.isKeyFrame = isKeyFrame;
         frame.track = track;
 
-        if (bRecording) {
-            frameCache.add(frame);
-            synchronized (writeLock) {
-                writeLock.notifyAll();
+        if (bRecording && !bPaused) {
+            if (needToSearchKeyFrame) {
+                if (frame.isKeyFrame) {
+                    needToSearchKeyFrame = false;
+                    frameCache.add(frame);
+                    synchronized (writeLock) {
+                        writeLock.notifyAll();
+                    }
+                }
+            } else {
+                frameCache.add(frame);
+                synchronized (writeLock) {
+                    writeLock.notifyAll();
+                }
             }
         }
     }
@@ -346,6 +369,7 @@ class SrsEsFrame {
         public ByteBuffer bb;
         public MediaCodec.BufferInfo bi;
         public int track;
+        public boolean isKeyFrame;
 
         public boolean is_video() {
             return track == VIDEO_TRACK;
@@ -788,6 +812,7 @@ private void writeSampleData(int trackIndex, ByteBuffer byteBuf, MediaCodec.Buff
     private void finishMovie() throws IOException {
         if (flushBytes > 0) {
             fos.flush();
+            flushBytes = 0;
         }
         if (mdat.getSize() != 0) {
             // flush cached mdat box
@@ -819,6 +844,7 @@ private void finishMovie() throws IOException {
         track2SampleSizes.clear();
         aacSpecConfig = false;
         recFileSize = 0;
+        flushBytes = 0;
     }
 
     private FileTypeBox createFileTypeBox() {