Care about byte order

Author: ypresto

lib/src/main/java/net/ypresto/androidtranscoder/engine/PassThroughTrackTranscoder.java

@@ -21,6 +21,7 @@
 import android.media.MediaFormat;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 
 public class PassThroughTrackTranscoder implements TrackTranscoder {
     private final MediaExtractor mExtractor;
@@ -44,7 +45,7 @@ public PassThroughTrackTranscoder(MediaExtractor extractor, int trackIndex,
         mActualOutputFormat = mExtractor.getTrackFormat(mTrackIndex);
         mMuxer.setOutputFormat(mSampleType, mActualOutputFormat);
         mBufferSize = mActualOutputFormat.getInteger(MediaFormat.KEY_MAX_INPUT_SIZE);
-        mBuffer = ByteBuffer.allocateDirect(mBufferSize);
+        mBuffer = ByteBuffer.allocateDirect(mBufferSize).order(ByteOrder.nativeOrder());
     }
 
     @Override

lib/src/main/java/net/ypresto/androidtranscoder/engine/QueuedMuxer.java

@@ -21,6 +21,7 @@
 import android.util.Log;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -96,7 +97,7 @@ public void writeSampleData(SampleType sampleType, ByteBuffer byteBuf, MediaCode
         byteBuf.limit(bufferInfo.offset + bufferInfo.size);
         byteBuf.position(bufferInfo.offset);
         if (mByteBuffer == null) {
-            mByteBuffer = ByteBuffer.allocateDirect(BUFFER_SIZE).order(byteBuf.order());
+            mByteBuffer = ByteBuffer.allocateDirect(BUFFER_SIZE).order(ByteOrder.nativeOrder());
         }
         mByteBuffer.put(byteBuf);
         mSampleInfoList.add(new SampleInfo(sampleType, bufferInfo.size, bufferInfo));

lib/src/main/java/net/ypresto/androidtranscoder/utils/AvcCsdUtils.java

@@ -31,7 +31,11 @@ public class AvcCsdUtils {
     private static final byte AVC_SPS_NAL = 103; // 0<<7 + 3<<5 + 7<<0
 
     public static ByteBuffer getSpsBuffer(MediaFormat format) {
-        ByteBuffer prefixedSpsBuffer = format.getByteBuffer(MediaFormatExtraConstants.KEY_AVC_SPS).asReadOnlyBuffer();
+        ByteBuffer sourceBuffer = format.getByteBuffer(MediaFormatExtraConstants.KEY_AVC_SPS).asReadOnlyBuffer(); // might be direct buffer
+        ByteBuffer prefixedSpsBuffer = ByteBuffer.allocate(sourceBuffer.limit()).order(sourceBuffer.order());
+        prefixedSpsBuffer.put(sourceBuffer);
+        prefixedSpsBuffer.flip();
+
         skipStartCode(prefixedSpsBuffer);
         if (prefixedSpsBuffer.get() != AVC_SPS_NAL) {
             throw new IllegalStateException("Got non SPS NAL data.");