Skip to content

Commit a509138

Browse files
NiekAkerboomNiekAkerboom
committed
Add support for custom postprocessing
Code copied from: https://github.com/natario1/Transcoder/pull/97
1 parent 1af92a0 commit a509138

File tree

14 files changed

+224
-68
lines changed

14 files changed

+224
-68
lines changed

‎demo/src/main/java/com/otaliastudios/transcoder/demo/TranscoderActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ public void afterTextChanged(Editable s) {
108108
@Override
109109
protected void onCreate(Bundle savedInstanceState) {
110110
super.onCreate(savedInstanceState);
111-
Logger.setLogLevel(Logger.LEVEL_VERBOSE);
111+
Logger.setLogLevel(Logger.LEVEL_ERROR);
112112
setContentView(R.layout.activity_transcoder);
113113

114114
mButtonView = findViewById(R.id.button);
115115
mButtonView.setOnClickListener(v -> {
116116
if (!mIsTranscoding) {
117117
startActivityForResult(new Intent(Intent.ACTION_GET_CONTENT)
118-
.setType("video/*")
118+
.setType("audio/*,video/*")
119119
.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true), REQUEST_CODE_PICK);
120120
} else {
121121
mTranscodeFuture.cancel(true);

‎lib/src/main/java/com/otaliastudios/transcoder/TranscoderOptions.java

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import android.os.Looper;
88

99
import com.otaliastudios.transcoder.engine.TrackType;
10+
import com.otaliastudios.transcoder.iofactory.DecoderIOFactory;
11+
import com.otaliastudios.transcoder.iofactory.DefaultDecoderIOFactory;
1012
import com.otaliastudios.transcoder.resample.AudioResampler;
1113
import com.otaliastudios.transcoder.resample.DefaultAudioResampler;
1214
import com.otaliastudios.transcoder.sink.DataSink;
@@ -44,6 +46,7 @@ public class TranscoderOptions {
4446
private TranscoderOptions() {}
4547

4648
private DataSink dataSink;
49+
private DecoderIOFactory decoderIOFactory;
4750
private List<DataSource> videoDataSources;
4851
private List<DataSource> audioDataSources;
4952
private TrackStrategy audioTrackStrategy;
@@ -62,6 +65,11 @@ public DataSink getDataSink() {
6265
return dataSink;
6366
}
6467

68+
@NonNull
69+
public DecoderIOFactory getDecoderIOFactory() {
70+
return decoderIOFactory;
71+
}
72+
6573
@NonNull
6674
public List<DataSource> getAudioDataSources() {
6775
return audioDataSources;
@@ -108,6 +116,7 @@ public AudioResampler getAudioResampler() {
108116

109117
public static class Builder {
110118
private DataSink dataSink;
119+
private DecoderIOFactory decoderIOFactory;
111120
private final List<DataSource> audioDataSources = new ArrayList<>();
112121
private final List<DataSource> videoDataSources = new ArrayList<>();
113122
private TranscoderListener listener;
@@ -325,6 +334,19 @@ public Builder setAudioResampler(@NonNull AudioResampler audioResampler) {
325334
return this;
326335
}
327336

337+
/**
338+
* Sets an {@link DecoderIOFactory} to provide decoder input and output.
339+
* Can be use to implement custom video postprocessing
340+
* Defaults to {@link DefaultAudioResampler}.
341+
*
342+
* @param decoderIOFactory a decoder io factory
343+
* @return this for chaining
344+
*/
345+
public Builder setDecoderIOFactory(DecoderIOFactory decoderIOFactory) {
346+
this.decoderIOFactory = decoderIOFactory;
347+
return this;
348+
}
349+
328350
/**
329351
* Generates muted audio data sources if needed
330352
* @return The list of audio data sources including the muted sources
@@ -396,11 +418,16 @@ public TranscoderOptions build() {
396418
if (audioResampler == null) {
397419
audioResampler = new DefaultAudioResampler();
398420
}
421+
if (decoderIOFactory == null) {
422+
decoderIOFactory = new DefaultDecoderIOFactory();
423+
}
424+
399425
TranscoderOptions options = new TranscoderOptions();
400426
options.listener = listener;
401427
options.audioDataSources = buildAudioDataSources();
402428
options.videoDataSources = videoDataSources;
403429
options.dataSink = dataSink;
430+
options.decoderIOFactory = decoderIOFactory;
404431
options.listenerHandler = listenerHandler;
405432
options.audioTrackStrategy = audioTrackStrategy;
406433
options.videoTrackStrategy = videoTrackStrategy;
@@ -417,4 +444,4 @@ public Future<Void> transcode() {
417444
return Transcoder.getInstance().transcode(build());
418445
}
419446
}
420-
}
447+
}

‎lib/src/main/java/com/otaliastudios/transcoder/engine/Engine.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ private void openCurrentStep(@NonNull TrackType type, @NonNull TranscoderOptions
170170
switch (type) {
171171
case VIDEO:
172172
transcoder = new VideoTrackTranscoder(dataSource, mDataSink,
173+
options.getDecoderIOFactory(),
173174
interpolator,
174175
options.getVideoRotation());
175176
break;

‎lib/src/main/java/com/otaliastudios/transcoder/iofactory/DecoderIOFactory.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.otaliastudios.transcoder.iofactory;
2+
3+
import android.view.Surface;
4+
5+
import com.otaliastudios.transcoder.transcode.base.VideoDecoderOutputBase;
6+
import com.otaliastudios.transcoder.transcode.base.VideoEncoderInputBase;
7+
8+
import org.jetbrains.annotations.NotNull;
9+
10+
public interface DecoderIOFactory {
11+
@NotNull VideoEncoderInputBase createVideoInput(@NotNull Surface surface);
12+
@NotNull VideoDecoderOutputBase createVideoOutput();
13+
}

‎lib/src/main/java/com/otaliastudios/transcoder/iofactory/DefaultDecoderIOFactory.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.otaliastudios.transcoder.iofactory;
2+
3+
import android.view.Surface;
4+
5+
import com.otaliastudios.transcoder.transcode.internal.VideoDecoderOutput;
6+
import com.otaliastudios.transcoder.transcode.internal.VideoEncoderInput;
7+
import com.otaliastudios.transcoder.transcode.base.VideoDecoderOutputBase;
8+
import com.otaliastudios.transcoder.transcode.base.VideoEncoderInputBase;
9+
10+
import org.jetbrains.annotations.NotNull;
11+
12+
public class DefaultDecoderIOFactory implements DecoderIOFactory {
13+
@NotNull
14+
@Override
15+
public VideoEncoderInputBase createVideoInput(@NotNull Surface surface) {
16+
return new VideoEncoderInput(surface);
17+
}
18+
19+
@NotNull
20+
@Override
21+
public VideoDecoderOutputBase createVideoOutput() {
22+
return new VideoDecoderOutput();
23+
}
24+
}

‎lib/src/main/java/com/otaliastudios/transcoder/source/DefaultDataSource.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@ public abstract class DefaultDataSource implements DataSource {
3535
= new TrackTypeMap<>(0L, 0L);
3636
private long mFirstTimestampUs = Long.MIN_VALUE;
3737

38+
private long mCachedDuration = Long.MIN_VALUE;
3839
private void ensureMetadata() {
3940
if (!mMetadataApplied) {
4041
mMetadataApplied = true;
4142
applyRetriever(mMetadata);
43+
mCachedDuration = Long.MIN_VALUE;
4244
}
4345
}
4446

@@ -163,9 +165,13 @@ public int getOrientation() {
163165
@Override
164166
public long getDurationUs() {
165167
ensureMetadata();
168+
if (mCachedDuration != Long.MIN_VALUE) {
169+
return mCachedDuration;
170+
}
166171
try {
167-
return Long.parseLong(mMetadata
172+
mCachedDuration = Long.parseLong(mMetadata
168173
.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)) * 1000;
174+
return mCachedDuration;
169175
} catch (NumberFormatException e) {
170176
return -1;
171177
}
@@ -237,5 +243,6 @@ public void rewind() {
237243
} catch (Exception ignore) { }
238244
mMetadata = new MediaMetadataRetriever();
239245
mMetadataApplied = false;
246+
mCachedDuration = Long.MIN_VALUE;
240247
}
241248
}

‎lib/src/main/java/com/otaliastudios/transcoder/strategy/DefaultVideoStrategy.java

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
import android.media.MediaFormat;
55
import android.os.Build;
66

7+
import androidx.annotation.NonNull;
8+
79
import com.otaliastudios.transcoder.engine.TrackStatus;
810
import com.otaliastudios.transcoder.internal.BitRates;
11+
import com.otaliastudios.transcoder.internal.Logger;
12+
import com.otaliastudios.transcoder.internal.MediaFormatConstants;
913
import com.otaliastudios.transcoder.strategy.size.AspectRatioResizer;
1014
import com.otaliastudios.transcoder.strategy.size.AtMostResizer;
1115
import com.otaliastudios.transcoder.strategy.size.ExactResizer;
1216
import com.otaliastudios.transcoder.strategy.size.ExactSize;
1317
import com.otaliastudios.transcoder.strategy.size.FractionResizer;
1418
import com.otaliastudios.transcoder.strategy.size.MultiResizer;
15-
import com.otaliastudios.transcoder.strategy.size.Size;
1619
import com.otaliastudios.transcoder.strategy.size.Resizer;
17-
import com.otaliastudios.transcoder.internal.Logger;
18-
import com.otaliastudios.transcoder.internal.MediaFormatConstants;
19-
20-
import androidx.annotation.NonNull;
20+
import com.otaliastudios.transcoder.strategy.size.Size;
2121

2222
import java.util.List;
2323

@@ -48,6 +48,19 @@ private Options() {}
4848
private int targetFrameRate;
4949
private float targetKeyFrameInterval;
5050
private String targetMimeType;
51+
private boolean allowPassThrough;
52+
}
53+
54+
/**
55+
* Creates a new {@link Builder} with a {@link Resizer} using given dimensions.
56+
*
57+
* @param resizer first resizer
58+
* @return a strategy builder
59+
*/
60+
@NonNull
61+
@SuppressWarnings("WeakerAccess")
62+
public static Builder resizer(Resizer resizer) {
63+
return new Builder(resizer);
5164
}
5265

5366
/**
@@ -123,6 +136,7 @@ public static class Builder {
123136
private long targetBitRate = BITRATE_UNKNOWN;
124137
private float targetKeyFrameInterval = DEFAULT_KEY_FRAME_INTERVAL;
125138
private String targetMimeType = MediaFormatConstants.MIMETYPE_VIDEO_AVC;
139+
private boolean allowPassThrough = true;
126140

127141
@SuppressWarnings("unused")
128142
public Builder() { }
@@ -189,6 +203,13 @@ public Builder mimeType(@NonNull String mimeType) {
189203
return this;
190204
}
191205

206+
@SuppressWarnings("unused")
207+
@NonNull
208+
public Builder allowPassThrough(boolean allowPassThrough) {
209+
this.allowPassThrough = allowPassThrough;
210+
return this;
211+
}
212+
192213
@NonNull
193214
@SuppressWarnings("WeakerAccess")
194215
public Options options() {
@@ -198,6 +219,7 @@ public Options options() {
198219
options.targetBitRate = targetBitRate;
199220
options.targetKeyFrameInterval = targetKeyFrameInterval;
200221
options.targetMimeType = targetMimeType;
222+
options.allowPassThrough = allowPassThrough;
201223
return options;
202224
}
203225

@@ -264,7 +286,7 @@ public TrackStatus createOutputFormat(@NonNull List<MediaFormat> inputFormats,
264286
// or, for example, each part would be copied into output with its own size,
265287
// breaking the muxer.
266288
boolean canPassThrough = inputFormats.size() == 1;
267-
if (canPassThrough && typeDone && sizeDone && frameRateDone && frameIntervalDone) {
289+
if (options.allowPassThrough && canPassThrough && typeDone && sizeDone && frameRateDone && frameIntervalDone) {
268290
LOG.i("Input minSize: " + inSize.getMinor() + ", desired minSize: " + outSize.getMinor() +
269291
"\nInput frameRate: " + inputFrameRate + ", desired frameRate: " + outFrameRate +
270292
"\nInput iFrameInterval: " + inputIFrameInterval + ", desired iFrameInterval: " + options.targetKeyFrameInterval);

‎lib/src/main/java/com/otaliastudios/transcoder/transcode/BaseTrackTranscoder.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,9 @@ private int feedDecoder(long timeoutUs, boolean forceInputEos) {
212212
}
213213

214214
final int result = mDecoder.dequeueInputBuffer(timeoutUs);
215-
if (result < 0) return DRAIN_STATE_NONE;
215+
if (result < 0) {
216+
return DRAIN_STATE_NONE;
217+
}
216218

217219
mDataChunk.buffer = mDecoderBuffers.getInputBuffer(result);
218220
mDataSource.readTrack(mDataChunk);

‎lib/src/main/java/com/otaliastudios/transcoder/transcode/VideoTrackTranscoder.java

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,23 @@
1616
package com.otaliastudios.transcoder.transcode;
1717

1818
import android.media.MediaCodec;
19-
import android.media.MediaExtractor;
2019
import android.media.MediaFormat;
2120

2221
import androidx.annotation.NonNull;
2322

2423
import com.otaliastudios.transcoder.engine.TrackType;
2524
import com.otaliastudios.transcoder.internal.MediaCodecBuffers;
25+
import com.otaliastudios.transcoder.iofactory.DecoderIOFactory;
2626
import com.otaliastudios.transcoder.sink.DataSink;
2727
import com.otaliastudios.transcoder.source.DataSource;
2828
import com.otaliastudios.transcoder.time.TimeInterpolator;
29-
import com.otaliastudios.transcoder.transcode.internal.VideoDecoderOutput;
30-
import com.otaliastudios.transcoder.transcode.internal.VideoEncoderInput;
3129
import com.otaliastudios.transcoder.internal.Logger;
3230
import com.otaliastudios.transcoder.internal.MediaFormatConstants;
3331
import com.otaliastudios.transcoder.transcode.internal.VideoFrameDropper;
32+
import com.otaliastudios.transcoder.transcode.base.VideoDecoderOutputBase;
33+
import com.otaliastudios.transcoder.transcode.base.VideoEncoderInputBase;
34+
35+
import org.jetbrains.annotations.NotNull;
3436

3537
import java.nio.ByteBuffer;
3638

@@ -41,20 +43,24 @@ public class VideoTrackTranscoder extends BaseTrackTranscoder {
4143
@SuppressWarnings("unused")
4244
private static final Logger LOG = new Logger(TAG);
4345

44-
private VideoDecoderOutput mDecoderOutputSurface;
45-
private VideoEncoderInput mEncoderInputSurface;
46+
private VideoDecoderOutputBase mDecoderOutputSurface;
47+
private VideoEncoderInputBase mEncoderInputSurface;
4648
private MediaCodec mEncoder; // Keep this since we want to signal EOS on it.
4749
private VideoFrameDropper mFrameDropper;
50+
private DecoderIOFactory mDecoderIOFactory;
4851
private final TimeInterpolator mTimeInterpolator;
4952
private final int mSourceRotation;
5053
private final int mExtraRotation;
5154

55+
5256
public VideoTrackTranscoder(
5357
@NonNull DataSource dataSource,
5458
@NonNull DataSink dataSink,
59+
@NotNull DecoderIOFactory decoderIOFactory,
5560
@NonNull TimeInterpolator timeInterpolator,
5661
int rotation) {
5762
super(dataSource, dataSink, TrackType.VIDEO);
63+
mDecoderIOFactory = decoderIOFactory;
5864
mTimeInterpolator = timeInterpolator;
5965
mSourceRotation = dataSource.getOrientation();
6066
mExtraRotation = rotation;
@@ -76,7 +82,7 @@ protected void onConfigureEncoder(@NonNull MediaFormat format, @NonNull MediaCod
7682

7783
@Override
7884
protected void onStartEncoder(@NonNull MediaFormat format, @NonNull MediaCodec encoder) {
79-
mEncoderInputSurface = new VideoEncoderInput(encoder.createInputSurface());
85+
mEncoderInputSurface = mDecoderIOFactory.createVideoInput(encoder.createInputSurface());
8086
super.onStartEncoder(format, encoder);
8187
}
8288

@@ -98,10 +104,7 @@ protected void onConfigureDecoder(@NonNull MediaFormat format, @NonNull MediaCod
98104
// refer: https://android.googlesource.com/platform/frameworks/av/+blame/lollipop-release/media/libstagefright/Utils.cpp
99105
format.setInteger(MediaFormatConstants.KEY_ROTATION_DEGREES, 0);
100106

101-
// The rotation we should apply is the intrinsic source rotation, plus any extra
102-
// rotation that was set into the TranscoderOptions.
103-
mDecoderOutputSurface = new VideoDecoderOutput();
104-
mDecoderOutputSurface.setRotation((mSourceRotation + mExtraRotation) % 360);
107+
mDecoderOutputSurface = mDecoderIOFactory.createVideoOutput();
105108
decoder.configure(format, mDecoderOutputSurface.getSurface(), null, 0);
106109
}
107110

@@ -112,25 +115,7 @@ protected void onCodecsStarted(@NonNull MediaFormat inputFormat, @NonNull MediaF
112115
inputFormat.getInteger(MediaFormat.KEY_FRAME_RATE),
113116
outputFormat.getInteger(MediaFormat.KEY_FRAME_RATE));
114117
mEncoder = encoder;
115-
116-
// Cropping support.
117-
// Ignoring any outputFormat KEY_ROTATION (which is applied at playback time), the rotation
118-
// difference between input and output is mSourceRotation + mExtraRotation.
119-
int rotation = (mSourceRotation + mExtraRotation) % 360;
120-
boolean flip = (rotation % 180) != 0;
121-
float inputWidth = inputFormat.getInteger(MediaFormat.KEY_WIDTH);
122-
float inputHeight = inputFormat.getInteger(MediaFormat.KEY_HEIGHT);
123-
float inputRatio = inputWidth / inputHeight;
124-
float outputWidth = flip ? outputFormat.getInteger(MediaFormat.KEY_HEIGHT) : outputFormat.getInteger(MediaFormat.KEY_WIDTH);
125-
float outputHeight = flip ? outputFormat.getInteger(MediaFormat.KEY_WIDTH) : outputFormat.getInteger(MediaFormat.KEY_HEIGHT);
126-
float outputRatio = outputWidth / outputHeight;
127-
float scaleX = 1, scaleY = 1;
128-
if (inputRatio > outputRatio) { // Input wider. We have a scaleX.
129-
scaleX = inputRatio / outputRatio;
130-
} else if (inputRatio < outputRatio) { // Input taller. We have a scaleY.
131-
scaleY = outputRatio / inputRatio;
132-
}
133-
mDecoderOutputSurface.setScale(scaleX, scaleY);
118+
mDecoderOutputSurface.configureWith(inputFormat, outputFormat, mSourceRotation, mExtraRotation);
134119
}
135120

136121
@Override
@@ -169,4 +154,4 @@ protected void onDrainDecoder(@NonNull MediaCodec decoder, int bufferIndex, @Non
169154
}
170155
}
171156
}
172-
}
157+
}

0 commit comments

Comments
 (0)