summaryrefslogtreecommitdiffstats
path: root/media/tests/MediaFrameworkTest
diff options
context:
space:
mode:
authorRajneesh Chowdury <rajneeshc@google.com>2011-07-08 14:56:06 -0700
committerRajneesh Chowdury <rajneeshc@google.com>2011-07-08 14:56:06 -0700
commit559bb7951f283264e241df6845fef5bbe63b7f81 (patch)
tree0e37d84172ede068156f2962add31940695dbce0 /media/tests/MediaFrameworkTest
parent647ebb50b1b16ef03dda508ab99695aa0707246e (diff)
downloadframeworks_base-559bb7951f283264e241df6845fef5bbe63b7f81.zip
frameworks_base-559bb7951f283264e241df6845fef5bbe63b7f81.tar.gz
frameworks_base-559bb7951f283264e241df6845fef5bbe63b7f81.tar.bz2
Fix for issue 5007228 IllegalArgumentException when testing VideoEditorAPITest#testEffectKenBurn
Change-Id: Ic8b4360cdabb157fa7739552b73e3c3daab88129
Diffstat (limited to 'media/tests/MediaFrameworkTest')
-rw-r--r--media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorAPITest.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorAPITest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorAPITest.java
index 5120694..afe2001 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorAPITest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorAPITest.java
@@ -1335,16 +1335,19 @@ public class VideoEditorAPITest extends
@LargeTest
public void testEffectKenBurn() throws Exception {
// Test ken burn effect using a JPEG file.
- testEffectKenBurn(INPUT_FILE_PATH + "IMG_640x480.jpg");
+ testEffectKenBurn(INPUT_FILE_PATH + "IMG_640x480.jpg",
+ "mediaImageItem1");
// Test ken burn effect using a PNG file
- testEffectKenBurn(INPUT_FILE_PATH + "IMG_640x480.png");
+ testEffectKenBurn(INPUT_FILE_PATH + "IMG_640x480.png",
+ "mediaImageItem2");
}
- private void testEffectKenBurn(final String imageItemFileName) throws Exception {
+ private void testEffectKenBurn(final String imageItemFileName,
+ final String MediaId) throws Exception {
final int imageItemRenderingMode =MediaItem.RENDERING_MODE_BLACK_BORDER;
final MediaImageItem mediaImageItem =
- mVideoEditorHelper.createMediaItem(mVideoEditor, "mediaImageItem1",
+ mVideoEditorHelper.createMediaItem(mVideoEditor, MediaId,
imageItemFileName, 5000, imageItemRenderingMode);
mVideoEditor.addMediaItem(mediaImageItem);