diff options
| author | Gil Dobjanschi <virgild@google.com> | 2010-11-18 14:47:18 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-18 14:47:18 -0800 |
| commit | 23c430ca7534671d187049ab5fd9a69700d7cb81 (patch) | |
| tree | fe95c5a55a9560161bf4e53637a65b6285838c82 /media/java | |
| parent | dd4e4603efef2c3df0e26835935f74e1e0e7deb2 (diff) | |
| parent | b1fcb2abd3ec1847208cef048b06ff5be65add3a (diff) | |
| download | frameworks_base-23c430ca7534671d187049ab5fd9a69700d7cb81.zip frameworks_base-23c430ca7534671d187049ab5fd9a69700d7cb81.tar.gz frameworks_base-23c430ca7534671d187049ab5fd9a69700d7cb81.tar.bz2 | |
Merge "Added IOException to WaveformData constructor"
Diffstat (limited to 'media/java')
4 files changed, 11 insertions, 3 deletions
diff --git a/media/java/android/media/videoeditor/AudioTrack.java b/media/java/android/media/videoeditor/AudioTrack.java index 32ff553..cf7a25c 100755 --- a/media/java/android/media/videoeditor/AudioTrack.java +++ b/media/java/android/media/videoeditor/AudioTrack.java @@ -450,7 +450,7 @@ public class AudioTrack { /**
* @return The waveform data
*/
- public WaveformData getWaveformData() {
+ public WaveformData getWaveformData() throws IOException {
if (mWaveformData == null) {
return null;
}
diff --git a/media/java/android/media/videoeditor/MediaVideoItem.java b/media/java/android/media/videoeditor/MediaVideoItem.java index cb835b5..5fcfe3c 100755 --- a/media/java/android/media/videoeditor/MediaVideoItem.java +++ b/media/java/android/media/videoeditor/MediaVideoItem.java @@ -372,7 +372,7 @@ public class MediaVideoItem extends MediaItem { /**
* @return The waveform data
*/
- public WaveformData getWaveformData() {
+ public WaveformData getWaveformData() throws IOException {
if (mWaveformData == null) {
return null;
}
diff --git a/media/java/android/media/videoeditor/TransitionAlpha.java b/media/java/android/media/videoeditor/TransitionAlpha.java index 30e66fc..2bb16d2 100755 --- a/media/java/android/media/videoeditor/TransitionAlpha.java +++ b/media/java/android/media/videoeditor/TransitionAlpha.java @@ -16,6 +16,9 @@ package android.media.videoeditor;
+import java.io.File;
+
+
/**
* This class allows to render an "alpha blending" transition according to a
@@ -71,6 +74,7 @@ public class TransitionAlpha extends Transition { * projects folder (the parent folder for all projects).
* @param blendingPercent The blending percent applied
* @param invert true to invert the direction of the alpha blending
+ *
* @throws IllegalArgumentException if behavior is not supported, or if
* direction are not supported.
*/
@@ -79,6 +83,10 @@ public class TransitionAlpha extends Transition { int blendingPercent, boolean invert) {
super(transitionId, afterMediaItem, beforeMediaItem, durationMs, behavior);
+ if (!new File(maskFilename).exists()) {
+ throw new IllegalArgumentException("Invalid mask file name: " + maskFilename);
+ }
+
mMaskFilename = maskFilename;
mBlendingPercent = blendingPercent;
mIsInvert = invert;
diff --git a/media/java/android/media/videoeditor/WaveformData.java b/media/java/android/media/videoeditor/WaveformData.java index 5791046..1b865ca 100644 --- a/media/java/android/media/videoeditor/WaveformData.java +++ b/media/java/android/media/videoeditor/WaveformData.java @@ -46,7 +46,7 @@ public class WaveformData { * * @param audioWaveformFilename The name of the audio waveform file */ - WaveformData(String audioWaveformFilename) { + WaveformData(String audioWaveformFilename) throws IOException { // TODO: Read these values from the file mFrameDurationMs = 20; mFramesCount = 300000 / mFrameDurationMs; |