forked from ypresto/android-transcoder
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Get rid of flush() causes broken frames on some devices
Fixes ypresto#8
- Loading branch information
Showing
5 changed files
with
161 additions
and
100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 120 additions & 0 deletions
120
lib/src/main/java/net/ypresto/androidtranscoder/engine/QueuedMuxer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| package net.ypresto.androidtranscoder.engine; | ||
|
|
||
| import android.media.MediaCodec; | ||
| import android.media.MediaFormat; | ||
| import android.media.MediaMuxer; | ||
| import android.util.Log; | ||
|
|
||
| import java.nio.ByteBuffer; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * This class queues until all output track formats are determined. | ||
| */ | ||
| public class QueuedMuxer { | ||
| private static final String TAG = "QueuedMuxer"; | ||
| private static final int BUFFER_SIZE = 64 * 1024; // I have no idea whether this value is appropriate or not... | ||
| private final MediaMuxer mMuxer; | ||
| private final Listener mListener; | ||
| private MediaFormat mVideoFormat; | ||
| private MediaFormat mAudioFormat; | ||
| private int mVideoTrackIndex; | ||
| private int mAudioTrackIndex; | ||
| private ByteBuffer mByteBuffer; | ||
| private List<SampleInfo> mSampleInfoList; | ||
| private boolean mStarted; | ||
|
|
||
| public QueuedMuxer(MediaMuxer muxer, Listener listener) { | ||
| mMuxer = muxer; | ||
| mListener = listener; | ||
| mSampleInfoList = new ArrayList<>(); | ||
| } | ||
|
|
||
| public void setOutputFormat(SampleType sampleType, MediaFormat format) { | ||
| switch (sampleType) { | ||
| case VIDEO: | ||
| mVideoFormat = format; | ||
| break; | ||
| case AUDIO: | ||
| mAudioFormat = format; | ||
| break; | ||
| default: | ||
| throw new AssertionError(); | ||
| } | ||
| onSetOutputFormat(); | ||
| } | ||
|
|
||
| private void onSetOutputFormat() { | ||
| if (mVideoFormat == null || mAudioFormat == null) return; | ||
| mListener.onDetermineOutputFormat(); | ||
|
|
||
| mVideoTrackIndex = mMuxer.addTrack(mVideoFormat); | ||
| Log.v(TAG, "Added track #" + mVideoTrackIndex + " with " + mVideoFormat.getString(MediaFormat.KEY_MIME) + " to muxer"); | ||
| mAudioTrackIndex = mMuxer.addTrack(mAudioFormat); | ||
| Log.v(TAG, "Added track #" + mAudioTrackIndex + " with " + mAudioFormat.getString(MediaFormat.KEY_MIME) + " to muxer"); | ||
| mMuxer.start(); | ||
| mByteBuffer.flip(); | ||
| Log.v(TAG, "Output format determined, writing " + mSampleInfoList.size() + | ||
| " samples / " + mByteBuffer.limit() + " bytes to muxer."); | ||
| mStarted = true; | ||
| MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo(); | ||
| int offset = 0; | ||
| for (SampleInfo sampleInfo : mSampleInfoList) { | ||
| sampleInfo.writeToBufferInfo(bufferInfo, offset); | ||
| mMuxer.writeSampleData(getTrackIndexForSampleType(sampleInfo.mSampleType), mByteBuffer, bufferInfo); | ||
| offset += sampleInfo.mSize; | ||
| } | ||
| mSampleInfoList = null; | ||
| mByteBuffer = null; | ||
| } | ||
|
|
||
| public void writeSampleData(SampleType sampleType, ByteBuffer byteBuf, MediaCodec.BufferInfo bufferInfo) { | ||
| if (mStarted) { | ||
| mMuxer.writeSampleData(getTrackIndexForSampleType(sampleType), byteBuf, bufferInfo); | ||
| return; | ||
| } | ||
| byteBuf.limit(bufferInfo.offset + bufferInfo.size); | ||
| byteBuf.position(bufferInfo.offset); | ||
| if (mByteBuffer == null) { | ||
| mByteBuffer = ByteBuffer.allocateDirect(BUFFER_SIZE).order(byteBuf.order()); | ||
| } | ||
| mByteBuffer.put(byteBuf); | ||
| mSampleInfoList.add(new SampleInfo(sampleType, bufferInfo.size, bufferInfo)); | ||
| } | ||
|
|
||
| private int getTrackIndexForSampleType(SampleType sampleType) { | ||
| switch (sampleType) { | ||
| case VIDEO: | ||
| return mVideoTrackIndex; | ||
| case AUDIO: | ||
| return mAudioTrackIndex; | ||
| default: | ||
| throw new AssertionError(); | ||
| } | ||
| } | ||
|
|
||
| public enum SampleType {VIDEO, AUDIO} | ||
|
|
||
| private static class SampleInfo { | ||
| private final SampleType mSampleType; | ||
| private final int mSize; | ||
| private final long mPresentationTimeUs; | ||
| private final int mFlags; | ||
|
|
||
| private SampleInfo(SampleType sampleType, int size, MediaCodec.BufferInfo bufferInfo) { | ||
| mSampleType = sampleType; | ||
| mSize = size; | ||
| mPresentationTimeUs = bufferInfo.presentationTimeUs; | ||
| mFlags = bufferInfo.flags; | ||
| } | ||
|
|
||
| private void writeToBufferInfo(MediaCodec.BufferInfo bufferInfo, int offset) { | ||
| bufferInfo.set(offset, mSize, mPresentationTimeUs, mFlags); | ||
| } | ||
| } | ||
|
|
||
| public interface Listener { | ||
| void onDetermineOutputFormat(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.