loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes after removing deprecated methods from Transformer.Builder

Browse Source 
After removing `Transformer.Builder.setFlattenForSlowMotion()`, there is no need to keep `flattenForSlowMotion` in Transformer since it's now set in `EditedMediaItem`.
The change also includes making `audioProcessors` and `videoEffects` attributes final.

PiperOrigin-RevId: 703076023
This commit is contained in:
shahddaghash 2024-12-05 05:12:16 -08:00 committed by Copybara-Service
parent b6724e2115
commit 862791f837
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASENOTES.md
View File

@ -143,6 +143,8 @@
`Transformer.start(MediaItem, String)` instead. `Transformer.start(MediaItem, String)` instead.
* Remove deprecated `SingleFrameGlShaderProgram`. Use * Remove deprecated `SingleFrameGlShaderProgram`. Use
`BaseGlShaderProgram` instead. `BaseGlShaderProgram` instead.
* Remove `Transformer.flattenForSlowMotion`. Use
`EditedMediaItem.flattenForSlowMotion` instead.
## 1.5 ## 1.5

15
libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
View File

@ -103,11 +103,10 @@ public final class Transformer {
private @MonotonicNonNull String audioMimeType; private @MonotonicNonNull String audioMimeType;
private @MonotonicNonNull String videoMimeType; private @MonotonicNonNull String videoMimeType;
private @MonotonicNonNull TransformationRequest transformationRequest; private @MonotonicNonNull TransformationRequest transformationRequest;
private ImmutableList<AudioProcessor> audioProcessors; private final ImmutableList<AudioProcessor> audioProcessors;
private ImmutableList<Effect> videoEffects; private final ImmutableList<Effect> videoEffects;
private boolean removeAudio; private boolean removeAudio;
private boolean removeVideo; private boolean removeVideo;
private boolean flattenForSlowMotion;
private boolean trimOptimizationEnabled; private boolean trimOptimizationEnabled;
private boolean portraitEncodingEnabled; private boolean portraitEncodingEnabled;
private boolean fileStartsOnVideoFrameEnabled; private boolean fileStartsOnVideoFrameEnabled;
@ -547,7 +546,6 @@ public final class Transformer {
videoEffects, videoEffects,
removeAudio, removeAudio,
removeVideo, removeVideo,
flattenForSlowMotion,
trimOptimizationEnabled, trimOptimizationEnabled,
portraitEncodingEnabled, portraitEncodingEnabled,
fileStartsOnVideoFrameEnabled, fileStartsOnVideoFrameEnabled,
@ -730,7 +728,6 @@ public final class Transformer {
private final ImmutableList<Effect> videoEffects; private final ImmutableList<Effect> videoEffects;
private final boolean removeAudio; private final boolean removeAudio;
private final boolean removeVideo; private final boolean removeVideo;
private final boolean flattenForSlowMotion;
private final boolean trimOptimizationEnabled; private final boolean trimOptimizationEnabled;
private final boolean portraitEncodingEnabled; private final boolean portraitEncodingEnabled;
private final boolean fileStartsOnVideoFrameEnabled; private final boolean fileStartsOnVideoFrameEnabled;
@ -770,7 +767,6 @@ public final class Transformer {
ImmutableList<Effect> videoEffects, ImmutableList<Effect> videoEffects,
boolean removeAudio, boolean removeAudio,
boolean removeVideo, boolean removeVideo,
boolean flattenForSlowMotion,
boolean trimOptimizationEnabled, boolean trimOptimizationEnabled,
boolean portraitEncodingEnabled, boolean portraitEncodingEnabled,
boolean fileStartsOnVideoFrameEnabled, boolean fileStartsOnVideoFrameEnabled,
@ -792,7 +788,6 @@ public final class Transformer {
this.videoEffects = videoEffects; this.videoEffects = videoEffects;
this.removeAudio = removeAudio; this.removeAudio = removeAudio;
this.removeVideo = removeVideo; this.removeVideo = removeVideo;
this.flattenForSlowMotion = flattenForSlowMotion;
this.trimOptimizationEnabled = trimOptimizationEnabled; this.trimOptimizationEnabled = trimOptimizationEnabled;
this.portraitEncodingEnabled = portraitEncodingEnabled; this.portraitEncodingEnabled = portraitEncodingEnabled;
this.fileStartsOnVideoFrameEnabled = fileStartsOnVideoFrameEnabled; this.fileStartsOnVideoFrameEnabled = fileStartsOnVideoFrameEnabled;
@ -994,16 +989,10 @@ public final class Transformer {
* @throws IllegalStateException If an export is already in progress. * @throws IllegalStateException If an export is already in progress.
*/ */
public void start(MediaItem mediaItem, String path) { public void start(MediaItem mediaItem, String path) {
if (!mediaItem.clippingConfiguration.equals(MediaItem.ClippingConfiguration.UNSET)
&& flattenForSlowMotion) {
throw new IllegalArgumentException(
"Clipping is not supported when slow motion flattening is requested");
}
EditedMediaItem editedMediaItem = EditedMediaItem editedMediaItem =
new EditedMediaItem.Builder(mediaItem) new EditedMediaItem.Builder(mediaItem)
.setRemoveAudio(removeAudio) .setRemoveAudio(removeAudio)
.setRemoveVideo(removeVideo) .setRemoveVideo(removeVideo)
.setFlattenForSlowMotion(flattenForSlowMotion)
.setEffects(new Effects(audioProcessors, videoEffects)) .setEffects(new Effects(audioProcessors, videoEffects))
.build(); .build();
start(editedMediaItem, path); start(editedMediaItem, path);