Skip to content

Commit ca3926d

Browse files
natario1natario1
authored
ClipDataSource + docs (#54)
* Create DataSourceWrapper * Simplify demo * TrimDataSource tests * Seek twice in DataSource * Create ClipDataSource * Add docs * Slightly change website colors * Remove logs * Fix demo app
1 parent 63e6e30 commit ca3926d

File tree

19 files changed

+296
-185
lines changed

19 files changed

+296
-185
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ implementation 'com.otaliastudios:transcoder:0.7.4'
2828
- Multithreaded
2929
- Convenient, fluent API
3030
- Concatenate multiple video and audio tracks [[docs]](https://natario1.github.io/Transcoder/docs/concatenation)
31+
- Clip or trim video segments [[docs]](https://natario1.github.io/Transcoder/docs/clipping)
3132
- Choose output size, with automatic cropping [[docs]](https://natario1.github.io/Transcoder/docs/track-strategies#video-size)
3233
- Choose output rotation [[docs]](https://natario1.github.io/Transcoder/docs/advanced-options#video-rotation)
3334
- Choose output speed [[docs]](https://natario1.github.io/Transcoder/docs/advanced-options#video-speed)

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

Lines changed: 47 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
import com.otaliastudios.transcoder.internal.Logger;
2323
import com.otaliastudios.transcoder.sink.DataSink;
2424
import com.otaliastudios.transcoder.sink.DefaultDataSink;
25+
import com.otaliastudios.transcoder.source.DataSource;
26+
import com.otaliastudios.transcoder.source.TrimDataSource;
27+
import com.otaliastudios.transcoder.source.UriDataSource;
2528
import com.otaliastudios.transcoder.strategy.DefaultAudioStrategy;
2629
import com.otaliastudios.transcoder.strategy.DefaultVideoStrategy;
2730
import com.otaliastudios.transcoder.strategy.RemoveTrackStrategy;
@@ -41,8 +44,7 @@
4144

4245

4346
public class TranscoderActivity extends AppCompatActivity implements
44-
TranscoderListener,
45-
RadioGroup.OnCheckedChangeListener {
47+
TranscoderListener {
4648

4749
private static final String TAG = "DemoApp";
4850
private static final Logger LOG = new Logger(TAG);
@@ -81,50 +83,27 @@ public class TranscoderActivity extends AppCompatActivity implements
8183
private long mTrimStartUs = 0;
8284
private long mTrimEndUs = 0;
8385

84-
private TextWatcher mTrimStartTextWatcher = new TextWatcher() {
86+
private RadioGroup.OnCheckedChangeListener mRadioGroupListener
87+
= new RadioGroup.OnCheckedChangeListener() {
8588
@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-
}
89+
public void onCheckedChanged(RadioGroup group, int checkedId) {
90+
syncParameters();
10391
}
10492
};
105-
private TextWatcher mTrimEndTextWatcher = new TextWatcher() {
93+
94+
private TextWatcher mTextListener = new TextWatcher() {
10695
@Override
107-
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
108-
}
96+
public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
10997

11098
@Override
111-
public void onTextChanged(CharSequence s, int start, int before, int count) {
112-
}
99+
public void onTextChanged(CharSequence s, int start, int before, int count) { }
113100

114101
@Override
115102
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-
}
103+
syncParameters();
124104
}
125105
};
126106

127-
128107
@SuppressLint("SetTextI18n")
129108
@Override
130109
protected void onCreate(Bundle savedInstanceState) {
@@ -160,13 +139,13 @@ protected void onCreate(Bundle savedInstanceState) {
160139
mAudioSampleRateGroup = findViewById(R.id.sampleRate);
161140
mAudioReplaceGroup = findViewById(R.id.replace);
162141

163-
mAudioChannelsGroup.setOnCheckedChangeListener(this);
164-
mVideoFramesGroup.setOnCheckedChangeListener(this);
165-
mVideoResolutionGroup.setOnCheckedChangeListener(this);
166-
mVideoAspectGroup.setOnCheckedChangeListener(this);
167-
mAudioSampleRateGroup.setOnCheckedChangeListener(this);
168-
mTrimStartView.addTextChangedListener(mTrimStartTextWatcher);
169-
mTrimEndView.addTextChangedListener(mTrimEndTextWatcher);
142+
mAudioChannelsGroup.setOnCheckedChangeListener(mRadioGroupListener);
143+
mVideoFramesGroup.setOnCheckedChangeListener(mRadioGroupListener);
144+
mVideoResolutionGroup.setOnCheckedChangeListener(mRadioGroupListener);
145+
mVideoAspectGroup.setOnCheckedChangeListener(mRadioGroupListener);
146+
mAudioSampleRateGroup.setOnCheckedChangeListener(mRadioGroupListener);
147+
mTrimStartView.addTextChangedListener(mTextListener);
148+
mTrimEndView.addTextChangedListener(mTextListener);
170149
syncParameters();
171150

172151
mAudioReplaceGroup.setOnCheckedChangeListener((group, checkedId) -> {
@@ -178,13 +157,10 @@ protected void onCreate(Bundle savedInstanceState) {
178157
.setType("audio/*"), REQUEST_CODE_PICK_AUDIO);
179158
}
180159
}
181-
onCheckedChanged(group, checkedId);
160+
mRadioGroupListener.onCheckedChanged(group, checkedId);
182161
});
183-
}
184162

185-
@Override
186-
public void onCheckedChanged(RadioGroup group, int checkedId) {
187-
syncParameters();
163+
188164
}
189165

190166
private void syncParameters() {
@@ -240,6 +216,21 @@ private void syncParameters() {
240216
.addResizer(new FractionResizer(fraction))
241217
.frameRate(frames)
242218
.build();
219+
220+
try {
221+
mTrimStartUs = Long.valueOf(mTrimStartView.getText().toString()) * 1000000;
222+
} catch (NumberFormatException e) {
223+
mTrimStartUs = 0;
224+
LOG.w("Failed to read trimStart value.");
225+
}
226+
try {
227+
mTrimEndUs = Long.valueOf(mTrimEndView.getText().toString()) * 1000000;
228+
} catch (NumberFormatException e) {
229+
mTrimEndUs = 0;
230+
LOG.w("Failed to read trimEnd value.");
231+
}
232+
if (mTrimStartUs < 0) mTrimStartUs = 0;
233+
if (mTrimEndUs < 0) mTrimEndUs = 0;
243234
}
244235

245236
private void setIsTranscoding(boolean isTranscoding) {
@@ -311,27 +302,19 @@ private void transcode() {
311302
DataSink sink = new DefaultDataSink(mTranscodeOutputFile.getAbsolutePath());
312303
TranscoderOptions.Builder builder = Transcoder.into(sink);
313304
if (mAudioReplacementUri == null) {
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);
305+
if (mTranscodeInputUri1 != null) {
306+
DataSource source = new UriDataSource(this, mTranscodeInputUri1);
307+
builder.addDataSource(new TrimDataSource(source, mTrimStartUs, mTrimEndUs));
323308
}
309+
if (mTranscodeInputUri2 != null) builder.addDataSource(this, mTranscodeInputUri2);
310+
if (mTranscodeInputUri3 != null) builder.addDataSource(this, mTranscodeInputUri3);
324311
} else {
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);
312+
if (mTranscodeInputUri1 != null) {
313+
DataSource source = new UriDataSource(this, mTranscodeInputUri1);
314+
builder.addDataSource(TrackType.VIDEO, new TrimDataSource(source, mTrimStartUs, mTrimEndUs));
334315
}
316+
if (mTranscodeInputUri2 != null) builder.addDataSource(TrackType.VIDEO, this, mTranscodeInputUri2);
317+
if (mTranscodeInputUri3 != null) builder.addDataSource(TrackType.VIDEO, this, mTranscodeInputUri3);
335318
builder.addDataSource(TrackType.AUDIO, this, mAudioReplacementUri);
336319
}
337320
mTranscodeFuture = builder.setListener(this)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
android:layout_width="match_parent"
291291
android:layout_height="wrap_content"
292292
android:padding="16dp"
293-
android:text="Trim (seconds)" />
293+
android:text="Trim" />
294294

295295
<LinearLayout
296296
android:layout_width="match_parent"
@@ -302,7 +302,7 @@
302302
android:layout_width="wrap_content"
303303
android:layout_height="wrap_content"
304304
android:layout_marginEnd="8dp"
305-
android:text="Start:" />
305+
android:text="Start (s):" />
306306

307307
<com.google.android.material.textfield.TextInputEditText
308308
android:id="@+id/trim_start"
@@ -320,7 +320,7 @@
320320
android:layout_height="wrap_content"
321321
android:layout_marginStart="32dp"
322322
android:layout_marginEnd="8dp"
323-
android:text="End:" />
323+
android:text="End (s):" />
324324

325325
<com.google.android.material.textfield.TextInputEditText
326326
android:id="@+id/trim_end"

‎docs/_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Used by us
77
title: Transcoder
88
color: '#f8f8f8'
9-
description: A well documented Android library providing hardware-accelerated video transcoding, using MediaCodec APIs instead of native code (no FFMPEG patent issues). Supports cropping to any dimension, concatenation, audio processing and much more. # used by ourselves and by seo tag.
9+
description: A well documented Android library providing hardware-accelerated video transcoding, using MediaCodec APIs instead of native code (no FFMPEG patent issues). Supports cropping to any dimension, concatenation, clipping, audio processing, video speed and much more. # used by ourselves and by seo tag.
1010
disqus_shortname: 'natario1-transcoder'
1111
google_analytics_id: 'UA-155077779-2'
1212
google_site_verification: '4x49i17ABIrSvUl52SeL0-t0341aTnWWaC62-FYCRT4'

‎docs/_docs/advanced-options.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
layout: page
33
title: "Advanced Options"
44
description: "Advanced transcoding options"
5-
order: 6
5+
order: 7
66
disqus: 1
77
---
88

‎docs/_docs/clipping.md‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
---
2+
layout: page
3+
title: "Clipping and trimming"
4+
description: "How to clip each segment individually on both ends"
5+
order: 2
6+
disqus: 1
7+
---
8+
9+
Starting from `v0.8.0`, Transcoder offers the option to clip or trim video segments, on one or
10+
both ends. This is done by using special `DataSource` objects that wrap you original source,
11+
so that, in case of [concatenation](concatenation) of multiple media files, the trimming values
12+
can be set individually for each segment.
13+
14+
> When video tracks are involved, Transcoder will always move the clipping position to the
15+
closest video sync frame. This means that sync frames define the granularity of clipping!
16+
If the rate of sync frames in your media is very low, there might be a significant difference
17+
with respect to what you would expect.
18+
19+
For example, if your media has sync frames at seconds 2 and 4 and you try to clip the first 2.5
20+
seconds, Transcoder will actually only clip the first 2.
21+
22+
### TrimDataSource
23+
24+
The `TrimDataSource` class lets you trim segments by specifying the amount of time to be trimmed
25+
at both ends. For example, the code below will trim the file by 1 second at the beginning, and
26+
2 seconds at the end:
27+
28+
```java
29+
DataSource source = new UriDataSource(context, uri);
30+
DataSource trim = new TrimDataSource(source, 1000 * 1000, 2 * 1000 * 1000);
31+
Transcoder.into(filePath)
32+
.addDataSource(trim)
33+
.transcode()
34+
```
35+
36+
It is recommended to always check `source.getDurationUs()` to compute the correct values.
37+
38+
### ClipDataSource
39+
40+
The `ClipDataSource` class lets you clip segments by specifying a time window. For example,
41+
the code below clip the file from second 1 until second 5:
42+
43+
```java
44+
DataSource source = new UriDataSource(context, uri);
45+
DataSource clip = new ClipDataSource(source, 1000 * 1000, 5 * 1000 * 1000);
46+
Transcoder.into(filePath)
47+
.addDataSource(clip)
48+
.transcode()
49+
```
50+
51+
It is recommended to always check `source.getDurationUs()` to compute the correct values.
52+
53+
### Related APIs
54+
55+
|Method|Description|
56+
|------|-----------|
57+
|`new TrimDataSource(source, long)`|Creates a new data source trimmed on start.|
58+
|`new TrimDataSource(source, long, long)`|Creates a new data source trimmed on both ends.|
59+
|`new ClipDataSource(source, long)`|Creates a new data source clipped on start.|
60+
|`new ClipDataSource(source, long, long)`|Creates a new data source clipped on both ends.|
61+

‎docs/_docs/concatenation.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
layout: page
33
title: "Video Concatenation"
44
description: "How to concatenate video segments"
5-
order: 2
5+
order: 3
66
disqus: 1
77
---
88

‎docs/_docs/events.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
layout: page
33
title: "Transcoding Events"
44
description: "Listening to transcoding events"
5-
order: 3
5+
order: 4
66
disqus: 1
77
---
88

‎docs/_docs/track-strategies.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
layout: page
33
title: "Track Strategies"
44
description: "Per-track transcoding options"
5-
order: 5
5+
order: 6
66
disqus: 1
77
---
88

‎docs/_docs/validators.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
layout: page
33
title: "Validators"
44
description: "Validate or abort the transcoding process"
5-
order: 4
5+
order: 5
66
disqus: 1
77
---
88

0 commit comments

Comments
 (0)