Merge pull request #354 from dronekit/video_recording

video recording bug fixes.

Author: m4gr3d

ServiceApp/src/org/droidplanner/services/android/utils/video/MediaCodecManager.java

@@ -207,10 +207,10 @@ private boolean processNALUChunk(NALUChunk naluChunk) {
                     inputBuffer.put(payloadData, 0, dataLength);
 
                     totalLength += dataLength;
-
-                    streamRecorder.onNaluChunkUpdated(payloadData, 0, dataLength);
                 }
 
+                streamRecorder.onNaluChunkUpdated(naluChunkAssembler.getParametersSet(), naluChunk);
+
                 mediaCodec.queueInputBuffer(index, 0, totalLength, naluChunk.presentationTime, naluChunk.flags);
             }
         } catch (IllegalStateException e) {

ServiceApp/src/org/droidplanner/services/android/utils/video/NALUChunkAssembler.java

@@ -64,6 +64,13 @@ NALUChunk getEndOfStream(){
     private int naluCounter = 0;
     private final static long DELTA_PRESENTATION_TIME = 42000L;
 
+    NALUChunk getParametersSet(){
+        if(areParametersSet())
+            return paramsNaluChunk;
+
+        return null;
+    }
+
     NALUChunk assembleNALUChunk(byte[] buffer, int bufferLength) {
 
         //The first 12 bytes are the rtp header.

ServiceApp/src/org/droidplanner/services/android/utils/video/StreamRecorder.java

@@ -18,9 +18,11 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
 import timber.log.Timber;
@@ -31,6 +33,7 @@
 class StreamRecorder {
 
     private final AtomicReference<String> recordingFilename = new AtomicReference<>();
+    private final AtomicBoolean areParametersSet = new AtomicBoolean(false);
 
     private final File mediaRootDir;
     private final Context context;
@@ -75,6 +78,7 @@ boolean isRecordingEnabled() {
 
     boolean enableRecording(String mediaFilename) {
         if (!isRecordingEnabled()) {
+            areParametersSet.set(false);
             recordingFilename.set(mediaFilename);
 
             Timber.i("Enabling local recording to %s", mediaFilename);
@@ -117,18 +121,48 @@ boolean disableRecording() {
             }
         }
 
+        areParametersSet.set(false);
+
         return true;
     }
 
     //TODO: Maybe put this on a background thread to avoid blocking on the write to file.
-    void onNaluChunkUpdated(byte[] payload, int index, int payloadLength) {
+    void onNaluChunkUpdated(NALUChunk parametersSet, NALUChunk dataChunk) {
         if (isRecordingEnabled() && h264Writer != null) {
-            try {
-                h264Writer.write(payload, index, payloadLength);
-            } catch (IOException e) {
-                Timber.e(e, e.getMessage());
+            if(areParametersSet.get()) {
+                try {
+                    writeNaluChunk(h264Writer, dataChunk);
+                } catch (IOException e) {
+                    Timber.e(e, e.getMessage());
+                }
             }
+            else{
+                try {
+                    areParametersSet.set(writeNaluChunk(h264Writer, parametersSet));
+                } catch (IOException e) {
+                    Timber.e(e, e.getMessage());
+                }
+            }
+        }
+    }
+
+    private boolean writeNaluChunk(BufferedOutputStream bos, NALUChunk naluChunk) throws IOException {
+        if(naluChunk == null)
+            return false;
+
+        int payloadCount = naluChunk.payloads.length;
+        for (int i = 0; i < payloadCount; i++) {
+            ByteBuffer payload = naluChunk.payloads[i];
+
+            if (payload.capacity() == 0)
+                continue;
+
+            final int dataLength = payload.position();
+            byte[] payloadData = payload.array();
+            bos.write(payloadData, 0, dataLength);
         }
+
+        return true;
     }
 
     void convertToMp4(final String filename) {