Skip to content

Commit 0c289ce

Browse files
author
kumiko.koshiro
committed
change: handler IOException
1 parent 5f59e4c commit 0c289ce

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private void setupMetadata() throws IOException {
148148
Log.d(TAG, "Duration (us): " + mDurationUs);
149149
}
150150

151-
private void setupTrackTranscoders(MediaFormatStrategy formatStrategy) {
151+
private void setupTrackTranscoders(MediaFormatStrategy formatStrategy) throws IOException {
152152
MediaExtractorUtils.TrackResult trackResult = MediaExtractorUtils.getFirstVideoAndAudioTrack(mExtractor);
153153
MediaFormat videoOutputFormat = formatStrategy.createVideoOutputFormat(trackResult.mVideoTrackFormat);
154154
MediaFormat audioOutputFormat = formatStrategy.createAudioOutputFormat(trackResult.mAudioTrackFormat);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package net.ypresto.androidtranscoder.engine;
1717

18+
import android.annotation.SuppressLint;
1819
import android.media.MediaCodec;
1920
import android.media.MediaExtractor;
2021
import android.media.MediaFormat;
@@ -63,6 +64,7 @@ public void determineFormat() {
6364
mActualOutputFormat = mExtractor.getTrackFormat(mTrackIndex);
6465
}
6566

67+
@SuppressLint("Assert")
6668
@Override
6769
public boolean stepPipeline() {
6870
if (mIsEOS) return false;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717

1818
import android.media.MediaFormat;
1919

20+
import java.io.IOException;
21+
2022
public interface TrackTranscoder {
2123

22-
void setup();
24+
void setup() throws IOException;
2325

2426
/**
2527
* Get actual MediaFormat which is used to write to muxer.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import android.media.MediaMuxer;
2222
import android.util.Log;
2323

24+
import java.io.IOException;
2425
import java.nio.ByteBuffer;
2526

2627
// Refer: https://android.googlesource.com/platform/cts/+/lollipop-release/tests/tests/media/src/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
@@ -35,7 +36,6 @@ public class VideoTrackTranscoder implements TrackTranscoder {
3536
private final MediaFormat mOutputFormat;
3637
private final MediaMuxer mMuxer;
3738
private final MediaCodec.BufferInfo mBufferInfo = new MediaCodec.BufferInfo();
38-
private boolean mWritingToMuxerStarted;
3939
private MediaCodec mDecoder;
4040
private MediaCodec mEncoder;
4141
private ByteBuffer[] mDecoderInputBuffers;
@@ -62,7 +62,7 @@ public VideoTrackTranscoder(MediaExtractor extractor,
6262
}
6363

6464
@Override
65-
public void setup() {
65+
public void setup() throws IOException {
6666
mExtractor.selectTrack(mTrackIndex);
6767
mEncoder = MediaCodec.createEncoderByType(mOutputFormat.getString(MediaFormat.KEY_MIME));
6868
mEncoder.configure(mOutputFormat, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);

0 commit comments

Comments
 (0)