From 9803b8435e973d7e44360b91fa6935d0e3981a76 Mon Sep 17 00:00:00 2001 From: Dheeraj Sharma Date: Sun, 30 Jan 2011 12:50:23 -0800 Subject: [PATCH] Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI Change-Id: I6216e7e66be4bf0d7cfc74ee3bda7e22969a229a --- media/java/android/media/videoeditor/MediaImageItem.java | 12 ++++++------ media/jni/mediaeditor/VideoEditorClasses.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/media/java/android/media/videoeditor/MediaImageItem.java b/media/java/android/media/videoeditor/MediaImageItem.java index f1315c042b55..633e7eef4392 100755 --- a/media/java/android/media/videoeditor/MediaImageItem.java +++ b/media/java/android/media/videoeditor/MediaImageItem.java @@ -794,8 +794,8 @@ public class MediaImageItem extends MediaItem { return clipSettings; } - PanZoomXa = (100 * start.width()) / width; - PanZoomXb = (100 * end.width()) / width; + PanZoomXa = (1000 * start.width()) / width; + PanZoomXb = (1000 * end.width()) / width; clipSettings.clipPath = getDecodedImageFileName(); clipSettings.fileType = mMANativeHelper.getMediaItemFileType(getFileType()); @@ -805,11 +805,11 @@ public class MediaImageItem extends MediaItem { clipSettings.endCutPercent = 0; clipSettings.panZoomEnabled = true; clipSettings.panZoomPercentStart = PanZoomXa; - clipSettings.panZoomTopLeftXStart = (start.left * 100) / width; - clipSettings.panZoomTopLeftYStart = (start.top * 100) / height; + clipSettings.panZoomTopLeftXStart = (start.left * 1000) / width; + clipSettings.panZoomTopLeftYStart = (start.top * 1000) / height; clipSettings.panZoomPercentEnd = PanZoomXb; - clipSettings.panZoomTopLeftXEnd = (end.left * 100) / width; - clipSettings.panZoomTopLeftYEnd = (end.top * 100) / height; + clipSettings.panZoomTopLeftXEnd = (end.left * 1000) / width; + clipSettings.panZoomTopLeftYEnd = (end.top * 1000) / height; clipSettings.mediaRendering = mMANativeHelper.getMediaItemRenderingMode(getRenderingMode()); diff --git a/media/jni/mediaeditor/VideoEditorClasses.cpp b/media/jni/mediaeditor/VideoEditorClasses.cpp index 369faa9522dc..c3585e8d16d0 100755 --- a/media/jni/mediaeditor/VideoEditorClasses.cpp +++ b/media/jni/mediaeditor/VideoEditorClasses.cpp @@ -1548,7 +1548,7 @@ videoEditClasses_createClipSettings( // Set the panZoomPercentStart field. pEnv->SetIntField(object, fieldIds.panZoomPercentStart, - (100 - pSettings->xVSS.PanZoomXa)); + (1000 - pSettings->xVSS.PanZoomXa)); // Set the panZoomTopLeftXStart field. pEnv->SetIntField(object, fieldIds.panZoomTopLeftXStart, @@ -1560,7 +1560,7 @@ videoEditClasses_createClipSettings( // Set the panZoomPercentEnd field. pEnv->SetIntField(object, fieldIds.panZoomPercentEnd, - (100 - pSettings->xVSS.PanZoomXb)); + (1000 - pSettings->xVSS.PanZoomXb)); // Set the panZoomTopLeftXEnd field. pEnv->SetIntField(object, fieldIds.panZoomTopLeftXEnd, -- 2.11.0