Merge "Fix for issue 3409874:Crash during addition of pan and zoom effect if... (ba2ee617) · Commits · e / os / android_frameworks_base

media/java/android/media/videoeditor/MediaArtistNativeHelper.java

+32 −16

Original line number	Original line	Diff line number	Diff line
	@@ -2898,20 +2898,35 @@ class MediaArtistNativeHelper {

	if (bEffectKbPresent) {		if (bEffectKbPresent) {
	try {		try {
			if(((MediaImageItem)lMediaItem).getGeneratedImageClip() != null) {
	mClipProperties.clipProperties[previewIndex]		mClipProperties.clipProperties[previewIndex]
	= getMediaProperties(((MediaImageItem)lMediaItem).getGeneratedImageClip());		= getMediaProperties(((MediaImageItem)lMediaItem).
			getGeneratedImageClip());
			}
			else {
			mClipProperties.clipProperties[previewIndex]
			= getMediaProperties(((MediaImageItem)lMediaItem).
			getScaledImageFileName());
			mClipProperties.clipProperties[previewIndex].width =
			((MediaImageItem)lMediaItem).getScaledWidth();
			mClipProperties.clipProperties[previewIndex].height =
			((MediaImageItem)lMediaItem).getScaledHeight();
			}
	} catch (Exception e) {		} catch (Exception e) {
	throw new IllegalArgumentException("Unsupported file or file not found");		throw new IllegalArgumentException("Unsupported file or file not found");
	}		}
	} else {		} else {
	try {		try {
	mClipProperties.clipProperties[previewIndex]		mClipProperties.clipProperties[previewIndex]
	= getMediaProperties(((MediaImageItem)lMediaItem).getScaledImageFileName());		= getMediaProperties(((MediaImageItem)lMediaItem).
			getScaledImageFileName());
	} catch (Exception e) {		} catch (Exception e) {
	throw new IllegalArgumentException("Unsupported file or file not found");		throw new IllegalArgumentException("Unsupported file or file not found");
	}		}
	mClipProperties.clipProperties[previewIndex].width = ((MediaImageItem)lMediaItem).getScaledWidth();		mClipProperties.clipProperties[previewIndex].width =
	mClipProperties.clipProperties[previewIndex].height = ((MediaImageItem)lMediaItem).getScaledHeight();		((MediaImageItem)lMediaItem).getScaledWidth();
			mClipProperties.clipProperties[previewIndex].height =
			((MediaImageItem)lMediaItem).getScaledHeight();
	}		}
	} else {		} else {
	try {		try {
	@@ -3632,6 +3647,7 @@ class MediaArtistNativeHelper {
	mPreviewEditSettings.transitionSettingsArray[index].audioTransitionType =		mPreviewEditSettings.transitionSettingsArray[index].audioTransitionType =
	AudioTransition.NONE;		AudioTransition.NONE;
	}		}

	for (int clipCnt = 0; clipCnt < mPreviewEditSettings.clipSettingsArray.length; clipCnt++) {		for (int clipCnt = 0; clipCnt < mPreviewEditSettings.clipSettingsArray.length; clipCnt++) {
	if (mPreviewEditSettings.clipSettingsArray[clipCnt].fileType == FileType.JPG) {		if (mPreviewEditSettings.clipSettingsArray[clipCnt].fileType == FileType.JPG) {
	mPreviewEditSettings.clipSettingsArray[clipCnt].clipPath =		mPreviewEditSettings.clipSettingsArray[clipCnt].clipPath =

media/java/android/media/videoeditor/VideoEditorImpl.java

+31 −11

Original line number	Original line	Diff line number	Diff line
	@@ -103,6 +103,7 @@ public class VideoEditorImpl implements VideoEditor {
	private static final String ATTR_DUCK_THRESHOLD = "ducking_threshold";		private static final String ATTR_DUCK_THRESHOLD = "ducking_threshold";
	private static final String ATTR_DUCKED_TRACK_VOLUME = "ducking_volume";		private static final String ATTR_DUCKED_TRACK_VOLUME = "ducking_volume";
	private static final String ATTR_GENERATED_IMAGE_CLIP = "generated_image_clip";		private static final String ATTR_GENERATED_IMAGE_CLIP = "generated_image_clip";
			private static final String ATTR_IS_IMAGE_CLIP_GENERATED = "is_image_clip_generated";
	private static final String ATTR_GENERATED_TRANSITION_CLIP = "generated_transition_clip";		private static final String ATTR_GENERATED_TRANSITION_CLIP = "generated_transition_clip";
	private static final String ATTR_IS_TRANSITION_GENERATED = "is_transition_generated";		private static final String ATTR_IS_TRANSITION_GENERATED = "is_transition_generated";
	private static final String ATTR_OVERLAY_RGB_FILENAME = "overlay_rgb_filename";		private static final String ATTR_OVERLAY_RGB_FILENAME = "overlay_rgb_filename";
	@@ -977,15 +978,28 @@ Log.i("VE_IMPL","renderPreviewFrame <--");
	currentMediaItem.addEffect(effect);		currentMediaItem.addEffect(effect);
	}		}
	if (effect instanceof EffectKenBurns) {		if (effect instanceof EffectKenBurns) {
	String filename = parser.getAttributeValue("", ATTR_GENERATED_IMAGE_CLIP);		final boolean isImageClipGenerated =
			Boolean.parseBoolean(parser.getAttributeValue("",
			ATTR_IS_IMAGE_CLIP_GENERATED));
			if(isImageClipGenerated) {
			String filename = parser.getAttributeValue("",
			ATTR_GENERATED_IMAGE_CLIP);
	if (new File(filename).exists() == true) {		if (new File(filename).exists() == true) {
	((MediaImageItem)currentMediaItem).setGeneratedImageClip(filename);		((MediaImageItem)currentMediaItem).
	((MediaImageItem)currentMediaItem).setRegenerateClip(false);		setGeneratedImageClip(filename);
			((MediaImageItem)currentMediaItem).
			setRegenerateClip(false);
			} else {
			((MediaImageItem)currentMediaItem).
			setGeneratedImageClip(null);
			((MediaImageItem)currentMediaItem).
			setRegenerateClip(true);
	}		}
	else {		} else {
	((MediaImageItem)currentMediaItem).setGeneratedImageClip(null);		((MediaImageItem)currentMediaItem).
	((MediaImageItem)currentMediaItem).setRegenerateClip(true);		setGeneratedImageClip(null);
			((MediaImageItem)currentMediaItem).
			setRegenerateClip(true);
	}		}
	}		}
	}		}
	@@ -1390,8 +1404,14 @@ Log.i("VE_IMPL","renderPreviewFrame <--");
	serializer.attribute("", ATTR_END_RECT_BOTTOM,		serializer.attribute("", ATTR_END_RECT_BOTTOM,
	Integer.toString(endRect.bottom));		Integer.toString(endRect.bottom));
	final MediaItem mItem = effect.getMediaItem();		final MediaItem mItem = effect.getMediaItem();
			if(((MediaImageItem)mItem).getGeneratedImageClip() != null) {
			serializer.attribute("", ATTR_IS_IMAGE_CLIP_GENERATED,Boolean.toString(true));
	serializer.attribute("", ATTR_GENERATED_IMAGE_CLIP,		serializer.attribute("", ATTR_GENERATED_IMAGE_CLIP,
	((MediaImageItem)mItem).getGeneratedImageClip());		((MediaImageItem)mItem).getGeneratedImageClip());
			} else {
			serializer.attribute("", ATTR_IS_IMAGE_CLIP_GENERATED,
			Boolean.toString(false));
			}
	}		}

	serializer.endTag("", TAG_EFFECT);		serializer.endTag("", TAG_EFFECT);