Skip to content

Commit 63e6e30

Browse files
mudarnatario1
mudar
authored and
natario1
committed
TrimDataSource (deepmedia#50)
* Add support for trim, related to issue deepmedia#37 - New component TrimDataSource, wrapping DataSource to be trimmed. - MediaExtractorDataSource is an abstract class to limit visibility of MediaExtractor to package - Updates to Engine to replace selectAudio/transcode/selectVideo/transcode sequence by selectAudio/selectVideo/transcode/transcode * Added support for TrimDataSource into demo app Using 2 editText fields, default value is zero. * TranscoderOptions Builder support for TrimDataSource Builder can add directly trim values for UriDataSource * TrimDataSource updates following PR code review - fixed case where video track is absent - throw exceptions for invalid trim values * Removed unnecessary changes to Engine In the original sequence selectAudio / transcodeAudio / selectVideo / transcodeVideo the first step (selectAudio) is intercepted by selectVideo + seekVideo and the 3rd step (selectVideo) is skipped. So it becomes selectVideo / seekVideo / selectAudio / transcodeAudio / transcodeVideo - Also added throws IllegalArgumentException to TrimDataSource * Moved seekTo() from selectTrack() to canReadTrack() Cleaner simplified code :) The extractor needs a second call to seekTo() after reaching a video keyframe, to obtain better values for audio track. Otherwise, too many audio frames can be lost, causing visible off-sync. * Removed MediaExtractorDataSource Replaced by adding seekTo() to DataSource interface * Removed timestamp adjustment The rest of the lib already assumes that timestamps start from arbitrary values. * Use TrackTypeMap for readyTracks flags replacing two booleans * Handle trimEnd in isDrained() Stop reading when readUs is past duration. This removes the need to manually define KEY_DURATION in the mediaFormat * Fix seek vs canRead order to avoid possible bug where seekTo lands on a different track. Ex: The upstream source might be on AUDIO position, but if you seek later, the next position might VIDEO instead. * Apply seekTo() once per selected track - Updates to Engine to replace selectAudio/transcode/selectVideo/transcode sequence by selectAudio/selectVideo/transcode/transcode - remove unnecessary hasTrack() - seekTo() is applied in canReadTrack(), once per selected track. This now works because all track selection operations are done before the first call to canReadTrack(). - When 2 tracks are selected, seekTo() is called twice and this helps the extractor with Audio sampleTime issues. * seekBy() replaces seekTo(), selecting all tracks - reverted unnecessary changes to Engine class. Previous changes cannot guarantee that all calls to selectTracks() are done before the first canRead(). Latest bug was with merging multiple trimmed files. - use seekBy() to better handle first extractor timestamp - DefaultDataSource makes sure all available tracks are selected by extractor (without adding to mSelectedTracks array). Then seekTo() is called mutlitple times, using the resulting sampletimeUs for the later calls.
1 parent d91d6ff commit 63e6e30

File tree

6 files changed

+276
-7
lines changed

6 files changed

+276
-7
lines changed

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

Lines changed: 75 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
import android.annotation.SuppressLint;
44
import android.content.ClipData;
55
import android.content.Intent;
6-
import android.media.MediaMuxer;
76
import android.net.Uri;
87
import android.os.Bundle;
98
import android.os.SystemClock;
9+
import android.text.Editable;
10+
import android.text.TextWatcher;
11+
import android.widget.EditText;
1012
import android.widget.ProgressBar;
1113
import android.widget.RadioGroup;
1214
import android.widget.TextView;
@@ -61,6 +63,8 @@ public class TranscoderActivity extends AppCompatActivity implements
6163

6264
private ProgressBar mProgressView;
6365
private TextView mButtonView;
66+
private EditText mTrimStartView;
67+
private EditText mTrimEndView;
6468
private TextView mAudioReplaceView;
6569

6670
private boolean mIsTranscoding;
@@ -74,6 +78,52 @@ public class TranscoderActivity extends AppCompatActivity implements
7478
private long mTranscodeStartTime;
7579
private TrackStrategy mTranscodeVideoStrategy;
7680
private TrackStrategy mTranscodeAudioStrategy;
81+
private long mTrimStartUs = 0;
82+
private long mTrimEndUs = 0;
83+
84+
private TextWatcher mTrimStartTextWatcher = new TextWatcher() {
85+
@Override
86+
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
87+
}
88+
89+
@Override
90+
public void onTextChanged(CharSequence s, int start, int before, int count) {
91+
}
92+
93+
@Override
94+
public void afterTextChanged(Editable s) {
95+
if (s.length() > 0) {
96+
try {
97+
mTrimStartUs = Long.valueOf(s.toString()) * 1000000;
98+
} catch (NumberFormatException e) {
99+
mTrimStartUs = 0;
100+
LOG.w("Failed to read trimStart value.");
101+
}
102+
}
103+
}
104+
};
105+
private TextWatcher mTrimEndTextWatcher = new TextWatcher() {
106+
@Override
107+
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
108+
}
109+
110+
@Override
111+
public void onTextChanged(CharSequence s, int start, int before, int count) {
112+
}
113+
114+
@Override
115+
public void afterTextChanged(Editable s) {
116+
if (s.length() > 0) {
117+
try {
118+
mTrimEndUs = Long.valueOf(s.toString()) * 1000000;
119+
} catch (NumberFormatException e) {
120+
mTrimEndUs = 0;
121+
LOG.w("Failed to read trimEnd value.");
122+
}
123+
}
124+
}
125+
};
126+
77127

78128
@SuppressLint("SetTextI18n")
79129
@Override
@@ -97,6 +147,8 @@ protected void onCreate(Bundle savedInstanceState) {
97147
mProgressView = findViewById(R.id.progress);
98148
mProgressView.setMax(PROGRESS_BAR_MAX);
99149

150+
mTrimStartView = findViewById(R.id.trim_start);
151+
mTrimEndView = findViewById(R.id.trim_end);
100152
mAudioReplaceView = findViewById(R.id.replace_info);
101153

102154
mAudioChannelsGroup = findViewById(R.id.channels);
@@ -113,6 +165,8 @@ protected void onCreate(Bundle savedInstanceState) {
113165
mVideoResolutionGroup.setOnCheckedChangeListener(this);
114166
mVideoAspectGroup.setOnCheckedChangeListener(this);
115167
mAudioSampleRateGroup.setOnCheckedChangeListener(this);
168+
mTrimStartView.addTextChangedListener(mTrimStartTextWatcher);
169+
mTrimEndView.addTextChangedListener(mTrimEndTextWatcher);
116170
syncParameters();
117171

118172
mAudioReplaceGroup.setOnCheckedChangeListener((group, checkedId) -> {
@@ -257,13 +311,27 @@ private void transcode() {
257311
DataSink sink = new DefaultDataSink(mTranscodeOutputFile.getAbsolutePath());
258312
TranscoderOptions.Builder builder = Transcoder.into(sink);
259313
if (mAudioReplacementUri == null) {
260-
if (mTranscodeInputUri1 != null) builder.addDataSource(this, mTranscodeInputUri1);
261-
if (mTranscodeInputUri2 != null) builder.addDataSource(this, mTranscodeInputUri2);
262-
if (mTranscodeInputUri3 != null) builder.addDataSource(this, mTranscodeInputUri3);
314+
if (mTrimStartUs > 0 || mTrimEndUs > 0) {
315+
if (mTranscodeInputUri1 != null) builder.addDataSource(this, mTranscodeInputUri1, mTrimStartUs, mTrimEndUs);
316+
if (mTranscodeInputUri2 != null) builder.addDataSource(this, mTranscodeInputUri2, mTrimStartUs, mTrimEndUs);
317+
if (mTranscodeInputUri3 != null) builder.addDataSource(this, mTranscodeInputUri3, mTrimStartUs, mTrimEndUs);
318+
}
319+
else {
320+
if (mTranscodeInputUri1 != null) builder.addDataSource(this, mTranscodeInputUri1);
321+
if (mTranscodeInputUri2 != null) builder.addDataSource(this, mTranscodeInputUri2);
322+
if (mTranscodeInputUri3 != null) builder.addDataSource(this, mTranscodeInputUri3);
323+
}
263324
} else {
264-
if (mTranscodeInputUri1 != null) builder.addDataSource(TrackType.VIDEO, this, mTranscodeInputUri1);
265-
if (mTranscodeInputUri2 != null) builder.addDataSource(TrackType.VIDEO, this, mTranscodeInputUri2);
266-
if (mTranscodeInputUri3 != null) builder.addDataSource(TrackType.VIDEO, this, mTranscodeInputUri3);
325+
if (mTrimStartUs > 0 || mTrimEndUs > 0) {
326+
if (mTranscodeInputUri1 != null) builder.addDataSource(TrackType.VIDEO, this, mTranscodeInputUri1, mTrimStartUs, mTrimEndUs);
327+
if (mTranscodeInputUri2 != null) builder.addDataSource(TrackType.VIDEO, this, mTranscodeInputUri2, mTrimStartUs, mTrimEndUs);
328+
if (mTranscodeInputUri3 != null) builder.addDataSource(TrackType.VIDEO, this, mTranscodeInputUri3, mTrimStartUs, mTrimEndUs);
329+
}
330+
else {
331+
if (mTranscodeInputUri1 != null) builder.addDataSource(TrackType.VIDEO, this, mTranscodeInputUri1);
332+
if (mTranscodeInputUri2 != null) builder.addDataSource(TrackType.VIDEO, this, mTranscodeInputUri2);
333+
if (mTranscodeInputUri3 != null) builder.addDataSource(TrackType.VIDEO, this, mTranscodeInputUri3);
334+
}
267335
builder.addDataSource(TrackType.AUDIO, this, mAudioReplacementUri);
268336
}
269337
mTranscodeFuture = builder.setListener(this)

‎demo/src/main/res/layout/activity_transcoder.xml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,55 @@
285285
android:layout_height="wrap_content" />
286286
</RadioGroup>
287287

288+
<!-- TRIM -->
289+
<TextView
290+
android:layout_width="match_parent"
291+
android:layout_height="wrap_content"
292+
android:padding="16dp"
293+
android:text="Trim (seconds)" />
294+
295+
<LinearLayout
296+
android:layout_width="match_parent"
297+
android:layout_height="?attr/listPreferredItemHeightSmall"
298+
android:gravity="center"
299+
android:orientation="horizontal">
300+
301+
<TextView
302+
android:layout_width="wrap_content"
303+
android:layout_height="wrap_content"
304+
android:layout_marginEnd="8dp"
305+
android:text="Start:" />
306+
307+
<com.google.android.material.textfield.TextInputEditText
308+
android:id="@+id/trim_start"
309+
android:layout_width="wrap_content"
310+
android:layout_height="match_parent"
311+
android:inputType="number"
312+
android:maxLines="1"
313+
android:gravity="center_horizontal"
314+
android:minWidth="48dp"
315+
android:singleLine="true"
316+
android:text="0" />
317+
318+
<TextView
319+
android:layout_width="wrap_content"
320+
android:layout_height="wrap_content"
321+
android:layout_marginStart="32dp"
322+
android:layout_marginEnd="8dp"
323+
android:text="End:" />
324+
325+
<com.google.android.material.textfield.TextInputEditText
326+
android:id="@+id/trim_end"
327+
android:layout_width="wrap_content"
328+
android:layout_height="match_parent"
329+
android:inputType="number"
330+
android:maxLines="1"
331+
android:gravity="center_horizontal"
332+
android:minWidth="48dp"
333+
android:singleLine="true"
334+
android:text="0" />
335+
</LinearLayout>
336+
288337
<!-- REPLACE AUDIO -->
289338
<TextView
290339
android:padding="16dp"

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.otaliastudios.transcoder.source.DataSource;
1414
import com.otaliastudios.transcoder.source.FileDescriptorDataSource;
1515
import com.otaliastudios.transcoder.source.FilePathDataSource;
16+
import com.otaliastudios.transcoder.source.TrimDataSource;
1617
import com.otaliastudios.transcoder.source.UriDataSource;
1718
import com.otaliastudios.transcoder.strategy.DefaultAudioStrategy;
1819
import com.otaliastudios.transcoder.strategy.DefaultVideoStrategies;
@@ -174,12 +175,24 @@ public Builder addDataSource(@NonNull Context context, @NonNull Uri uri) {
174175
return addDataSource(new UriDataSource(context, uri));
175176
}
176177

178+
@NonNull
179+
@SuppressWarnings({"unused", "UnusedReturnValue"})
180+
public Builder addDataSource(@NonNull Context context, @NonNull Uri uri, long trimStartUs, long trimEndUs) {
181+
return addDataSource(new TrimDataSource(new UriDataSource(context, uri), trimStartUs, trimEndUs));
182+
}
183+
177184
@NonNull
178185
@SuppressWarnings({"unused", "UnusedReturnValue"})
179186
public Builder addDataSource(@NonNull TrackType type, @NonNull Context context, @NonNull Uri uri) {
180187
return addDataSource(type, new UriDataSource(context, uri));
181188
}
182189

190+
@NonNull
191+
@SuppressWarnings({"unused", "UnusedReturnValue"})
192+
public Builder addDataSource(@NonNull TrackType type, @NonNull Context context, @NonNull Uri uri, long trimStartUs, long trimEndUs) {
193+
return addDataSource(type, new TrimDataSource(new UriDataSource(context, uri), trimStartUs, trimEndUs));
194+
}
195+
183196
/**
184197
* Sets the audio output strategy. If absent, this defaults to
185198
* {@link com.otaliastudios.transcoder.strategy.DefaultAudioStrategy}.

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,14 @@ public interface DataSource {
5454
*/
5555
void selectTrack(@NonNull TrackType type);
5656

57+
/**
58+
* Moves all selected tracks forward by the specified duration.
59+
*
60+
* @param durationUs requested duration
61+
* @return the new presentation time in microseconds
62+
*/
63+
long seekBy(long durationUs);
64+
5765
/**
5866
* Returns true if we can read the given track at this point.
5967
* If true if returned, source should expect a {@link #readTrack(Chunk)} call.

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,22 @@ public void selectTrack(@NonNull TrackType type) {
6363
mExtractor.selectTrack(mIndex.require(type));
6464
}
6565

66+
@Override
67+
public long seekBy(long durationUs) {
68+
ensureExtractor();
69+
final int trackCount = mExtractor.getTrackCount();
70+
for (int i = 0; i < trackCount; i++) {
71+
mExtractor.selectTrack(i);
72+
}
73+
long timestampUs = mExtractor.getSampleTime() + durationUs;
74+
// Seeking once per track helps the extractor with Audio sampleTime issues
75+
for (int i = 0; i < trackCount; i++) {
76+
mExtractor.seekTo(timestampUs, MediaExtractor.SEEK_TO_CLOSEST_SYNC);
77+
timestampUs = mExtractor.getSampleTime();
78+
}
79+
return timestampUs;
80+
}
81+
6682
@Override
6783
public boolean isDrained() {
6884
ensureExtractor();

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

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
package com.otaliastudios.transcoder.source;
2+
3+
4+
import android.media.MediaFormat;
5+
6+
import androidx.annotation.NonNull;
7+
import androidx.annotation.Nullable;
8+
9+
import com.otaliastudios.transcoder.engine.TrackType;
10+
import com.otaliastudios.transcoder.internal.Logger;
11+
12+
import org.jetbrains.annotations.Contract;
13+
14+
/**
15+
* A {@link DataSource} wrapper that trims source at both ends.
16+
*/
17+
public class TrimDataSource implements DataSource {
18+
private static final String TAG = "TrimDataSource";
19+
private static final Logger LOG = new Logger(TAG);
20+
@NonNull
21+
private DataSource source;
22+
private long trimStartUs;
23+
private long trimDurationUs;
24+
private boolean didSeekTracks = false;
25+
26+
public TrimDataSource(@NonNull DataSource source, long trimStartUs, long trimEndUs) throws IllegalArgumentException {
27+
if (trimStartUs < 0 || trimEndUs < 0) {
28+
throw new IllegalArgumentException("Trim values cannot be negative.");
29+
}
30+
this.source = source;
31+
this.trimStartUs = trimStartUs;
32+
this.trimDurationUs = computeTrimDuration(source.getDurationUs(), trimStartUs, trimEndUs);
33+
}
34+
35+
@Contract(pure = true)
36+
private static long computeTrimDuration(long duration, long trimStart, long trimEnd) throws IllegalArgumentException {
37+
if (trimStart + trimEnd > duration) {
38+
throw new IllegalArgumentException("Trim values cannot be greater than media duration.");
39+
}
40+
return duration - trimStart - trimEnd;
41+
}
42+
43+
@Override
44+
public int getOrientation() {
45+
return source.getOrientation();
46+
}
47+
48+
@Nullable
49+
@Override
50+
public double[] getLocation() {
51+
return source.getLocation();
52+
}
53+
54+
@Override
55+
public long getDurationUs() {
56+
return trimDurationUs;
57+
}
58+
59+
@Nullable
60+
@Override
61+
public MediaFormat getTrackFormat(@NonNull TrackType type) {
62+
return source.getTrackFormat(type);
63+
}
64+
65+
@Override
66+
public void selectTrack(@NonNull TrackType type) {
67+
source.selectTrack(type);
68+
}
69+
70+
@Override
71+
public long seekBy(long durationUs) {
72+
return source.seekBy(durationUs);
73+
}
74+
75+
@Override
76+
public boolean canReadTrack(@NonNull TrackType type) {
77+
if (!didSeekTracks) {
78+
final long sampleTimeUs = seekBy(trimStartUs);
79+
updateTrimValues(sampleTimeUs);
80+
didSeekTracks = true;
81+
}
82+
return source.canReadTrack(type);
83+
}
84+
85+
private void updateTrimValues(long timestampUs) {
86+
trimDurationUs += trimStartUs - timestampUs;
87+
trimStartUs = timestampUs;
88+
}
89+
90+
@Override
91+
public void readTrack(@NonNull Chunk chunk) {
92+
source.readTrack(chunk);
93+
}
94+
95+
@Override
96+
public long getReadUs() {
97+
return source.getReadUs();
98+
}
99+
100+
@Override
101+
public boolean isDrained() {
102+
return source.isDrained() || getReadUs() >= getDurationUs();
103+
}
104+
105+
@Override
106+
public void releaseTrack(@NonNull TrackType type) {
107+
source.releaseTrack(type);
108+
}
109+
110+
@Override
111+
public void rewind() {
112+
didSeekTracks = false;
113+
source.rewind();
114+
}
115+
}

0 commit comments

Comments
 (0)