Merge "I splitted the start and end transtions into separate classes." (11dd3254) · Commits · e / os / android_frameworks_base

media/java/android/media/videoeditor/TransitionAtEnd.java→media/java/android/media/videoeditor/TransitionEndCurtainClosing.java

100755 → 100644

+8 −36

Original line number	Diff line number	Diff line
		@@ -16,36 +16,19 @@

		package android.media.videoeditor;


		/**
		* TransitionAtEnd is a class useful to manage a predefined transition at the
		* end of the movie.
		* {@hide}
		*/
		public class TransitionAtEnd extends Transition {
		/**
		* 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.
		*/
		public static final int TYPE_FADE_TO_BLACK = 0;

		/**
		* 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.
		* applied at the end of the movie. {@hide}
		*/
		public static final int TYPE_CURTAIN_CLOSING = 1;

		// The transition type
		private final int mType;

		public class TransitionEndCurtainClosing extends Transition {
		/**
		* An object of this type cannot be instantiated by using the default
		* constructor
		*/
		@SuppressWarnings("unused")
		private TransitionAtEnd() {
		this(null, null, 0, 0);
		private TransitionEndCurtainClosing() {
		this(null, null, 0);
		}

		/**
		@@ -55,21 +38,10 @@ public class TransitionAtEnd extends Transition {
		* @param afterMediaItem The transition is applied to the end of this
		* media item
		* @param durationMs duration of the transition in milliseconds
		* @param type type of the transition to apply.
		*/
		public TransitionAtEnd(String transitionId, MediaItem afterMediaItem, long duration,
		int type) {
		public TransitionEndCurtainClosing(String transitionId, MediaItem afterMediaItem,
		long duration) {
		super(transitionId, afterMediaItem, null, duration, Transition.BEHAVIOR_LINEAR);
		mType = type;
		}

		/**
		* Get the type of this transition
		*
		* @return The type of the transition
		*/
		public int getType() {
		return mType;
		}

		/*

media/java/android/media/videoeditor/TransitionEndFadeToBlack.java

0 → 100755

+52 −0

Original line number	Diff line number	Diff line
		/*
		* 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);
		}

		/**
		* 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
		*/
		public TransitionEndFadeToBlack(String transitionId, MediaItem afterMediaItem, long duration) {
		super(transitionId, afterMediaItem, null, duration, Transition.BEHAVIOR_LINEAR);
		}

		/*
		* {@inheritDoc}
		*/
		@Override
		void generate() {
		}
		}

media/java/android/media/videoeditor/TransitionAtStart.java→media/java/android/media/videoeditor/TransitionStartCurtainOpening.java

+56 −0

Original line number	Diff line number	Diff line
		@@ -18,35 +18,19 @@ package android.media.videoeditor;


		/**
		* TransitionAtStart is a class useful to manage a predefined transition at the
		* beginning of the movie.
		* {@hide}
		*/
		public class TransitionAtStart extends Transition {
		/**
		* This transition fades from black using fade-in in a certain provided
		* duration. This transition is always applied at the beginning of the
		* movie.
		*/
		public static final int TYPE_FADE_FROM_BLACK = 0;

		/**
		* This transition fades from black frame using curtain opening: A black
		* 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 static final int TYPE_CURTAIN_OPENING = 1;

		// The transition type
		private final int mType;

		public class TransitionStartCurtainOpening extends Transition {
		/**
		* An object of this type cannot be instantiated by using the default
		* constructor
		*/
		@SuppressWarnings("unused")
		private TransitionAtStart() {
		this(null, null, 0, 0);
		private TransitionStartCurtainOpening() {
		this(null, null, 0);
		}

		/**
		@@ -56,22 +40,11 @@ public class TransitionAtStart extends Transition {
		* @param beforeMediaItem The transition is applied to the beginning of
		* this media item
		* @param durationMs The duration of the transition in milliseconds
		* @param type The type of the transition to apply.
		*/
		public TransitionAtStart(String transitionId, MediaItem beforeMediaItem, long durationMs,
		int type) {
		public TransitionStartCurtainOpening(String transitionId, MediaItem beforeMediaItem,
		long durationMs) {
		super(transitionId, null, beforeMediaItem, durationMs,
		Transition.BEHAVIOR_LINEAR);
		mType = type;
		}

		/**
		* Get the type of this transition
		*
		* @return The type of the transition
		*/
		public int getType() {
		return mType;
		}

		/*
		@@ -80,11 +53,4 @@ public class TransitionAtStart extends Transition {
		@Override
		public void generate() {
		}

		/*
		* {@inheritDoc}
		*/
		@Override
		void invalidate() {
		}
		}

media/java/android/media/videoeditor/TransitionStartFadeFromBlack.java

0 → 100644

+54 −0

Original line number	Diff line number	Diff line
		/*
		* 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);
		}

		/**
		* 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
		*/
		public TransitionStartFadeFromBlack(String transitionId, MediaItem beforeMediaItem,
		long durationMs) {
		super(transitionId, null, beforeMediaItem, durationMs,
		Transition.BEHAVIOR_LINEAR);
		}

		/*
		* {@inheritDoc}
		*/
		@Override
		public void generate() {
		}
		}

media/java/android/media/videoeditor/VideoEditorTestImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -714,7 +714,7 @@ public class VideoEditorTestImpl implements VideoEditor {

		// Subtract the transition times
		for (Transition transition : mTransitions) {
		if (!(transition instanceof TransitionAtStart) && !(transition instanceof TransitionAtEnd)) {
		if (!(transition instanceof TransitionStartCurtainOpening) && !(transition instanceof TransitionEndFadeToBlack)) {
		mDurationMs -= transition.getDuration();
		}
		}