Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed the start and end transition types.

Browse Source 
Change-Id: I0c3f9f82a90e0835f550b11c5f1ea8a1147535a4
This commit is contained in:
Gil Dobjanschi
2010-10-26 11:53:24 -07:00
parent 23617befe4
commit fa3d263131
6 changed files with 15 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
media/java/android/media/videoeditor/TransitionEndCurtainClosing.java
View File

@@ -1,54 +0,0 @@
/*
* Copyright (C) 2010 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.media.videoeditor;
/**
* This transition fades to black frame using curtain closing: A black image is
* moved from top to bottom to cover the video. This transition is always
* applied at the end of the movie. {@hide}
*/
public class TransitionEndCurtainClosing extends Transition {
/**
* An object of this type cannot be instantiated by using the default
* constructor
*/
@SuppressWarnings("unused")
private TransitionEndCurtainClosing() {
this(null, null, 0, BEHAVIOR_LINEAR);
}
/**
* Constructor.
*
* @param transitionId The transition id
* @param afterMediaItem The transition is applied to the end of this
* media item
* @param durationMs duration of the transition in milliseconds
* @param behavior The transition behavior
*/
public TransitionEndCurtainClosing(String transitionId, MediaItem afterMediaItem,
long duration, int behavior) {
super(transitionId, afterMediaItem, null, duration, behavior);
}
/*
* {@inheritDoc}
*/
@Override
void generate() {
}
}

54
media/java/android/media/videoeditor/TransitionEndFadeToBlack.java
View File

@@ -1,54 +0,0 @@
/*
* Copyright (C) 2010 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.media.videoeditor;
/**
* This transition fades to black frame using fade out in a certain provided
* duration. This transition is always applied at the end of the movie. {@hide
* }
*/
public class TransitionEndFadeToBlack extends Transition {
/**
* An object of this type cannot be instantiated by using the default
* constructor
*/
@SuppressWarnings("unused")
private TransitionEndFadeToBlack() {
this(null, null, 0, BEHAVIOR_LINEAR);
}
/**
* Constructor.
*
* @param transitionId The transition id
* @param afterMediaItem The transition is applied to the end of this
* media item
* @param durationMs duration of the transition in milliseconds
* @param behavior The transition behavior
*/
public TransitionEndFadeToBlack(String transitionId, MediaItem afterMediaItem, long duration,
int behavior) {
super(transitionId, afterMediaItem, null, duration, behavior);
}
/*
* {@inheritDoc}
*/
@Override
void generate() {
}
}

9
media/java/android/media/videoeditor/TransitionFadeToBlack.java → media/java/android/media/videoeditor/TransitionFadeBlack.java
View File

@@ -18,16 +18,17 @@ package android.media.videoeditor;
/**
* This class is used to render a fade to black transition between two videos.
* This class is used to render a fade to black and fade from black transition
* between two media items.
* {@hide}
*/
public class TransitionFadeToBlack extends Transition {
public class TransitionFadeBlack extends Transition {
/**
* An object of this type cannot be instantiated by using the default
* constructor
*/
@SuppressWarnings("unused")
private TransitionFadeToBlack() {
private TransitionFadeBlack() {
this(null, null, null, 0, 0);
}
@@ -45,7 +46,7 @@ public class TransitionFadeToBlack extends Transition {
*
* @throws IllegalArgumentException if behavior is not supported.
*/
public TransitionFadeToBlack(String transitionId, MediaItem afterMediaItem,
public TransitionFadeBlack(String transitionId, MediaItem afterMediaItem,
MediaItem beforeMediaItem, long durationMs, int behavior) {
super(transitionId, afterMediaItem, beforeMediaItem, durationMs, behavior);
}

56
media/java/android/media/videoeditor/TransitionStartCurtainOpening.java
View File

@@ -1,56 +0,0 @@
/*
* Copyright (C) 2010 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.media.videoeditor;
/**
* This transition fades from black frame using curtain opening. A black
* image is displayed and moves from bottom to top making the video visible.
* This transition is always applied at the beginning of the movie.
* {@hide}
*/
public class TransitionStartCurtainOpening extends Transition {
/**
* An object of this type cannot be instantiated by using the default
* constructor
*/
@SuppressWarnings("unused")
private TransitionStartCurtainOpening() {
this(null, null, 0, Transition.BEHAVIOR_LINEAR);
}
/**
* Constructor
*
* @param transitionId The transition id
* @param beforeMediaItem The transition is applied to the beginning of
* this media item
* @param durationMs The duration of the transition in milliseconds
* @param behavior The transition behavior
*/
public TransitionStartCurtainOpening(String transitionId, MediaItem beforeMediaItem,
long durationMs, int behavior) {
super(transitionId, null, beforeMediaItem, durationMs, behavior);
}
/*
* {@inheritDoc}
*/
@Override
public void generate() {
}
}

54
media/java/android/media/videoeditor/TransitionStartFadeFromBlack.java
View File

@@ -1,54 +0,0 @@
/*
* Copyright (C) 2010 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.media.videoeditor;
/**
* This transition fades from black using fade-in in a certain provided
* duration. This transition is always applied at the beginning of the movie.
* {@hide}
*/
public class TransitionStartFadeFromBlack extends Transition {
/**
* An object of this type cannot be instantiated by using the default
* constructor
*/
@SuppressWarnings("unused")
private TransitionStartFadeFromBlack() {
this(null, null, 0, Transition.BEHAVIOR_LINEAR);
}
/**
* Constructor
*
* @param transitionId The transition id
* @param beforeMediaItem The transition is applied to the beginning of
* this media item
* @param durationMs The duration of the transition in milliseconds
* @param behavior The transition behavior
*/
public TransitionStartFadeFromBlack(String transitionId, MediaItem beforeMediaItem,
long durationMs, int behavior) {
super(transitionId, null, beforeMediaItem, durationMs, behavior);
}
/*
* {@inheritDoc}
*/
@Override
public void generate() {
}
}

35
media/java/android/media/videoeditor/VideoEditorTestImpl.java
View File

@@ -892,13 +892,7 @@ public class VideoEditorTestImpl implements VideoEditor {
}
final Transition transition;
if (TransitionStartCurtainOpening.class.getSimpleName().equals(type)) {
transition = new TransitionStartCurtainOpening(transitionId, beforeMediaItem,
durationMs, behavior);
} else if (TransitionStartFadeFromBlack.class.getSimpleName().equals(type)) {
transition = new TransitionStartFadeFromBlack(transitionId, beforeMediaItem,
durationMs, behavior);
} else if (TransitionAlpha.class.getSimpleName().equals(type)) {
if (TransitionAlpha.class.getSimpleName().equals(type)) {
final int blending = Integer.parseInt(parser.getAttributeValue("", ATTR_BLENDING));
final String maskFilename = parser.getAttributeValue("", ATTR_MASK);
final boolean invert = Boolean.getBoolean(parser.getAttributeValue("", ATTR_INVERT));
@@ -911,15 +905,9 @@ public class VideoEditorTestImpl implements VideoEditor {
final int direction = Integer.parseInt(parser.getAttributeValue("", ATTR_DIRECTION));
transition = new TransitionSliding(transitionId, afterMediaItem, beforeMediaItem,
durationMs, behavior, direction);
} else if (TransitionFadeToBlack.class.getSimpleName().equals(type)) {
transition = new TransitionFadeToBlack(transitionId, afterMediaItem, beforeMediaItem,
} else if (TransitionFadeBlack.class.getSimpleName().equals(type)) {
transition = new TransitionFadeBlack(transitionId, afterMediaItem, beforeMediaItem,
durationMs, behavior);
} else if (TransitionEndCurtainClosing.class.getSimpleName().equals(type)) {
transition = new TransitionEndCurtainClosing(transitionId, afterMediaItem, durationMs,
behavior);
} else if (TransitionEndFadeToBlack.class.getSimpleName().equals(type)) {
transition = new TransitionEndFadeToBlack(transitionId, afterMediaItem, durationMs,
behavior);
} else {
transition = null;
}
@@ -1132,17 +1120,14 @@ public class VideoEditorTestImpl implements VideoEditor {
*/
private void computeTimelineDuration() {
mDurationMs = 0;
for (MediaItem mediaItem : mMediaItems) {
final int mediaItemsCount = mMediaItems.size();
for (int i = 0; i < mediaItemsCount; i++) {
final MediaItem mediaItem = mMediaItems.get(i);
mDurationMs += mediaItem.getTimelineDuration();
}
// Subtract the transition times
for (Transition transition : mTransitions) {
if (!(transition instanceof TransitionStartCurtainOpening)
&& !(transition instanceof TransitionStartFadeFromBlack)
&& !(transition instanceof TransitionEndFadeToBlack)
&& !(transition instanceof TransitionEndCurtainClosing)) {
mDurationMs -= transition.getDuration();
if (mediaItem.getEndTransition() != null) {
if (i < mediaItemsCount - 1) {
mDurationMs -= mediaItem.getEndTransition().getDuration();
}
}
}
}